Merge branch 'Dev' of http://101.37.171.70:10101/r/~jhz/STUWMS into Dev

chenhaozhe

7 天以前 613247c5dc2cfb8dd163f0674e8909a40317ec26

 pages/gongxuOut/Cj_StationOutBillList.vue

@@ -2,6 +2,17 @@
   <view class="content">
      <view class="form">
         <view class="form-item">
               <view class="title">流转卡号:</view>
               <view class="right">
                  <input v-model="hform.HProcExchBillNo" placeholder="请输入工序流转卡号" />
               </view>
               <view>
               <uni-icons type="scan"
                  style="background-color: #3A78FF;padding: 6rpx;color: #fff;border-radius: 100%;font-weight: 500;"
                  size="20" @click="toScanCode"></uni-icons>
               </view>
            </view>
         <view class="form-item">
            <view class="title">状态:</view>
            <view class="right">
               <picker :range="arrayStatus" :value="hform.HStatus" @change="HStatusChange">
@@ -38,12 +49,7 @@
                  <input v-model="hform.HBillNo" placeholder="请输入单据号" />
               </view>
            </view>
            <view class="form-item">
               <view class="title">流转卡号:</view>
               <view class="right">
                  <input v-model="hform.HProcExchBillNo" placeholder="请输入工序流转卡号" />
               </view>
            </view>
				
            <view class="form-item">
               <view class="title">产品代码:</view>
               <view class="right">
@@ -215,16 +221,16 @@
            </view>
            
            <view class="op" v-if="operations == index">
               <button class="op1" size="mini" plain @tap.stop="check(item)">审核</button>
               <button class="op1" size="mini" plain @tap.stop="check(item)" v-if="item.审核人===''">审核</button>
               <!-- <button class="op2" size="mini" plain @tap.stop="antiCheck(item)">反审核</button> -->
               <!-- <button class="op1" size="mini" plain @tap.stop="qcCheck(item)">工序检</button> -->
               <button class="op3" size="mini" plain @tap.stop="edit(item)" v-if="true">编辑</button>
               <button class="op3" size="mini" plain @tap.stop="edit(item)" v-if="item.审核人===''" >编辑</button>
               <button class="op4" size="mini" plain @tap.stop="del(item)" v-if="false">删除</button>
               <button class="op5" size="mini" plain @tap.stop="operations = -1">取消操作</button>
            </view>
         </uni-card>
      </view>
		
      <StationOutBillPopup ref="billList"> </StationOutBillPopup>
      <view class="over" v-if="listData.length == 0">暂无数据</view>
      <view class="over" v-if="listData.length != 0 && listData.length != showList.length">加载中...</view>
      <view class="over" v-if="listData.length != 0 && listData.length == showList.length">已到底</view>
@@ -233,7 +239,9 @@

<script>
   import { getUserInfo } from "@/utils/auth.js";
   import StationOutBillPopup from "../../components/StationOutBillPopup/StationEntrustOutBillListPopup.vue"
   export default {
      components:{StationOutBillPopup},
       data() {
           return {
            userInfo:getUserInfo(),
@@ -288,6 +296,21 @@
            let eindex = parseInt(page) * 20
            let newList = list.slice(sindex,eindex)
            return newList
         },
         async toScanCode() {
            var mpaasScanModule = uni.requireNativePlugin("Mpaas-Scan-Module")
            mpaasScanModule.mpaasScan({
               'hideAlbum': true,
               'timeoutInterval':'10', //超时时间
               'timeoutText':'未识别到二维码' //超时提醒            
            },(ret) => {
               console.log(ret.resp_result)
               if (this.CommonUtils.isEmpty(ret.resp_result) === false) {
                  console.log('条码内容：' + ret.resp_result);
                  this.hform.HProcExchBillNo = ret.resp_result
                  this.search()
               }
            })
         },
         getList(){
            this.sWhere += ` and 制单人 like N'%${this.userInfo.Czymc}'`
@@ -513,15 +536,12 @@
                }
            });
         },
         // //审核
         // check(item){
         //    console.log(item)
         //    if (item.HBillStatus > 0) {
         //        uni.showToast({
         //           title:'单据不为未审核状态！'
         //        })
         //    }
         // },
         //审核
         check(item){
            console.log(item)
            this.$refs.billList.showPopup(item)	

         },
         // //反审核
         // antiCheck(item){