代码提交

zjh

2 天以前 d123ca35bb3ec4982af44aeb1ffffa8a3569a21b

代码提交

 pages/QC/LLJ/List.vue

@@ -131,9 +131,15 @@

                    <view class="meta-info" v-if="item.activeTab==0">
                        <text class="meta-item"><uni-icons type="calendar" size="14" color="#95a5a6"></uni-icons>
                            {{item.createDate}}</text>
                            创建：{{item.createDate}}</text>
							
                        <text class="meta-item"><uni-icons type="person" size="14" color="#95a5a6"></uni-icons>
                            {{item.userName}}</text>
                    </view>
                    <view class="meta-info" v-if="item.activeTab==0 && item.arrivalDate!=null">
                        <text class="meta-item"><uni-icons type="calendar" size="14" color="#95a5a6"></uni-icons>
                            到达：{{item.arrivalDate}}</text>
						
                    </view>
                    <!-- 查看时显示检验完成的数据 -->
                    <view class="meta-info" v-if="item.activeTab==1">
@@ -320,6 +326,22 @@
                        url: 'Add?id=' + item.id + '&lotNo=' + item.lotNo + '&releaseNo=' + item.releaseNo +
                            '&current=A'
                    })
                    // uni.showModal({
                    //                     title: '开始检验',
                    //                     content: '开始检验将记录当前时间为开始检验时间，确定开始？',
                    //                     success: function(res) {
                    //                     if (res.confirm) {
                    //                         uni.navigateTo({
                    //                             url: 'Add?id=' + item.id + '&lotNo=' + item.lotNo + '&releaseNo=' + item.releaseNo +
                    //                                 '&current=A'
                    //                         })
                    //                     } else {
											 
                    //                     }
                    //                 }
                    //             })

					
                }

            },

 pages/QC/LLJ/ScanCode.vue

@@ -2,14 +2,14 @@
    <view class="container">
        <!-- 主内容区 -->
        <!-- <view class="scan-container"> -->
            <text class="main-title">来料扫码检验</text>
            <text class="subtitle">请对准物料条码，保持10-15cm距离</text>
            <!-- 扫描框 -->
            <view class="scan-box" @click="startScan">
                <view class="scan-line" :style="{top: linePosition + '%'}"></view>
            </view>
            <!-- 手动输入 -->
            <!-- <button class="manual-input" @click="showManualInput">手动输入条码</button> -->
        <text class="main-title">来料扫码检验</text>
        <text class="subtitle">请对准物料条码，保持10-15cm距离</text>
        <!-- 扫描框 -->
        <view class="scan-box" @click="startScan">
            <view class="scan-line" :style="{top: linePosition + '%'}"></view>
        </view>
        <!-- 手动输入 -->
        <!-- <button class="manual-input" @click="showManualInput">手动输入条码</button> -->
        <!-- </view> -->
        <!-- 手动输入弹窗 -->
        <!-- <uni-popup ref="inputPopup" type="dialog">
@@ -18,7 +18,7 @@
        </uni-popup> -->
    </view>
</template>
                                                                                                                                           

<script>
    export default {
        data() {
@@ -62,36 +62,63 @@
                    data: {
                        Barcode: code
                    }
                }).then(ress => { 
                    if (ress.data.tbBillList.length > 0) {
                }).then(ress => {
                    if (ress.status == 0) {
                        if (ress.data.tbBillList.length > 0) {

                        if (ress.data.tbBillList[0].fsubmit === 1) {
                            if (ress.data.tbBillList[0].fsubmit === 1) {

                            uni.navigateTo({
                                url: 'Add?id=' + ress.data.tbBillList[0].id + '&lotNo=' + ress.data
                                    .tbBillList[0].lotNo + '&releaseNo=' + ress.data.tbBillList[0]
                                    .releaseNo +
                                    '&current=B'
                            })
                                uni.navigateTo({
                                    url: 'Add?id=' + ress.data.tbBillList[0].id + '&lotNo=' + ress.data
                                        .tbBillList[0].lotNo + '&releaseNo=' + ress.data.tbBillList[0]
                                        .releaseNo +
                                        '&current=B'
                                })
                            } else {
                                uni.navigateTo({
                                    url: 'Add?id=' + ress.data.tbBillList[0].id + '&lotNo=' + ress.data
                                        .tbBillList[0].lotNo + '&releaseNo=' + ress.data.tbBillList[0]
                                        .releaseNo +
                                        '&current=A'
                                })


                                // uni.showModal({
                                //                     title: '开始检验',
                                //                     content: '开始检验将记录当前时间为开始检验时间，确定开始？',
                                //                     success: function(res) {
                                //                     if (res.confirm) {
                                //                         uni.navigateTo({
                                //                             url: 'Add?id=' + ress.data.tbBillList[0].id + '&lotNo=' + ress.data
                                //                                 .tbBillList[0].lotNo + '&releaseNo=' + ress.data.tbBillList[0]
                                //                                 .releaseNo +
                                //                                 '&current=A'
                                //                         })
                                //                     } else {

                                //                     }
                                //                 }
                                //             })
                            }

                        } else {

                            uni.navigateTo({
                                url: 'Add?id=' + ress.data.tbBillList[0].id + '&lotNo=' + ress.data
                                    .tbBillList[0].lotNo + '&releaseNo=' + ress.data.tbBillList[0]
                                    .releaseNo +
                                    '&current=A'
                            uni.showModal({
                                title: '扫码错误',
                                content: '未查询到条码【' + code + '】相关单据内容',
                                showCancel: false
                            })
                            //showScanError('提示：未查询到条码【' + res.result + '】相关单据内容')
                            //this.msg = '提示：未查询到条码【' + res.result + '】相关单据内容'
                        }

                    } else {
                        console.log(ress.data.message);
                        uni.showModal({
                            title: '扫码错误',
                            content: '未查询到条码【' + code + '】相关单据内容',
                            title: '提示',
                            content: ress.message,
                            showCancel: false
                        })
                        //showScanError('提示：未查询到条码【' + res.result + '】相关单据内容')
                        //this.msg = '提示：未查询到条码【' + res.result + '】相关单据内容'
                    }

                })
            },

@@ -102,7 +129,7 @@

            // 确认手动输入
            confirmManualInput(value) {
				 

                this.handleScanResult(value)
            },


 pages/QC/LLJ/yzxFrom.vue

@@ -181,14 +181,14 @@
      }
    },
    validateForm() {
      for (const item of this.components) {
        if (item.selectedSpec === -1 || item.selectedMfg === -1) {
          return {
            valid: false,
            msg: `${item.name} 未完成选择`
          }
        }
      }
      // for (const item of this.components) {
      //   if (item.selectedSpec === -1 || item.selectedMfg === -1) {
      //     return {
      //       valid: false,
      //       msg: `${item.name} 未完成选择`
      //     }
      //   }
      // }
      return { valid: true }
    },
            onLoad(options) {