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

chenhaozhe

6 天以前 7fee2d3972fc2d9a9bd251279c658aaf5d6a039e

 pages/ZLGL/QuYangHuangYang/QC_TakeSampleCheckBill/QC_TakeSampleCheckBill.vue

@@ -2,150 +2,145 @@
   <view>
      <scroll-view scroll-y id="scroll-content" class="scroll-content" :style="{height: scrollContentHeight + 'px'}">
         <view class="form-item">
            <view class="title">条形码:</view>
            <view class="title">{{ $t("QC_TakeSampleCheckBill.HBarCode") == "QC_TakeSampleCheckBill.HBarCode" ? "条形码:" : $t("QC_TakeSampleCheckBill.HBarCode") }}</view>
            <view class="right">
               <input type="text" name="HBarCode" id="HBarCode" v-model="HBarCode" @confirm="getCode(HBarCode)" />
               <input type="text" name="HBarCode" id="HBarCode" v-model="HBarCode" @confirm="getCode(HBarCode)" :placeholder="$t('QC_TakeSampleCheckBill.HBarCode_Placeholder') == 'QC_TakeSampleCheckBill.HBarCode_Placeholder' ? '请扫描条码' : $t('QC_TakeSampleCheckBill.HBarCode_Placeholder')" />
            </view>
            <view class="right-icon" @click="toScanCode">
               <uni-icons color="#fff" type="scan" size="24"></uni-icons>
            </view>
         </view>
         <view class="form-item">
            <view class="title required">工序:</view>
            <view class="title required">{{ $t("QC_TakeSampleCheckBill.HProcName") == "QC_TakeSampleCheckBill.HProcName" ? "工序:" : $t("QC_TakeSampleCheckBill.HProcName") }}</view>
            <view class="right">
               <uni-combox :candidates="HProcNameArray" name="HProcName" id="HProcName" placeholder="请选择工序号"
                  v-model="hform.HProcName" @input="onHProcNameChangeHandler"></uni-combox>
               <uni-combox :candidates="HProcNameArray" name="HProcName" id="HProcName" :placeholder="$t('QC_TakeSampleCheckBill.HProcName_Placeholder') == 'QC_TakeSampleCheckBill.HProcName_Placeholder' ? '请选择工序号' : $t('QC_TakeSampleCheckBill.HProcName_Placeholder')" v-model="hform.HProcName" @input="onHProcNameChangeHandler"></uni-combox>
            </view>
         </view>
         <view class="form-item">
            <view class="title required">取样数量:</view>
            <view class="title required">{{ $t("Gy.HQty") == "Gy.HQty" ? "取样数量:" : $t("Gy.HQty") }}</view>
            <view class="right">
               <input type="number" name="HQty" id="HQty" v-model="hform.HQty" />
               <input type="number" name="HQty" id="HQty" v-model="hform.HQty" :placeholder="$t('Gy.HQty_Placeholder') == 'Gy.HQty_Placeholder' ? '请输入数量' : $t('Gy.HQty_Placeholder')" />
            </view>
         </view>
         <view class="form-item">
            <view class="title">破坏性实验数量:</view>
            <view class="title">{{ $t("QC_TakeSampleCheckBill.HSampleDamageQty") == "QC_TakeSampleCheckBill.HSampleDamageQty" ? "破坏性实验数量:" : $t("QC_TakeSampleCheckBill.HSampleDamageQty") }}</view>
            <view class="right">
               <input type="number" name="HSampleDamageQty" id="HSampleDamageQty"
                  v-model="hform.HSampleDamageQty" />
                  v-model="hform.HSampleDamageQty" :placeholder="$t('QC_TakeSampleCheckBill.HSampleDamageQty_Placeholder') == 'QC_TakeSampleCheckBill.HSampleDamageQty_Placeholder' ? '请输入数量' : $t('QC_TakeSampleCheckBill.HSampleDamageQty_Placeholder')" />
            </view>
         </view>
         <view class="form-item">
            <view class="title required">送测类型:</view>
            <view class="title required">{{ $t("QC_TakeSampleCheckBill.TestType") == "QC_TakeSampleCheckBill.TestType" ? "送测类型:" : $t("QC_TakeSampleCheckBill.TestType") }}</view>
            <view class="right">
               <uni-combox :candidates="TestTypeArray" v-model="hform.TestType"
                  @input="TestTypeChange"></uni-combox>
            </view>
         </view>
         <view class="form-item">
            <view class="title">送测内容:</view>
            <view class="title">{{ $t("QC_TakeSampleCheckBill.HBadNote") == "QC_TakeSampleCheckBill.HBadNote" ? "送测内容:" : $t("QC_TakeSampleCheckBill.HBadNote") }}</view>
            <view class="right">
               <input type="text" name="HBadNote" id="HBadNote" v-model="hform.HBadNote" />
               <input type="text" name="HBadNote" id="HBadNote" v-model="hform.HBadNote" :placeholder="$t('QC_TakeSampleCheckBill.HBadNote_Placeholder') == 'QC_TakeSampleCheckBill.HBadNote_Placeholder' ? '请输入送测内容' : $t('QC_TakeSampleCheckBill.HBadNote_Placeholder')" />
            </view>
         </view>
         <view class="form-item">
            <view class="title">部门:</view>
            <view class="title">{{ $t("Gy.HDeptName") == "Gy.HDeptName" ? "部门:" : $t("Gy.HDeptName") }}</view>
            <view class="right">
               <uni-combox :candidates="HDeptNameArray" name="HDeptName" id="HDeptName" placeholder="请选择部门"
                  v-model="hform.HDeptName" @input="HDeptNameChangeHandler"></uni-combox>
               <uni-combox :candidates="HDeptNameArray" name="HDeptName" id="HDeptName" :placeholder="$t('Gy.HDeptName_Placeholder') == 'Gy.HDeptName_Placeholder' ? '请选择部门' : $t('Gy.HDeptName_Placeholder')" v-model="hform.HDeptName" @input="HDeptNameChangeHandler"></uni-combox>
            </view>
         </view>
         <view class="form-item">
            <view class="title required">生产班次:</view>
            <view class="title required">{{ $t("QC_TakeSampleCheckBill.HShiftsName") == "QC_TakeSampleCheckBill.HShiftsName" ? "生产班次:" : $t("QC_TakeSampleCheckBill.HShiftsName") }}</view>
            <view class="right">
               <uni-combox :candidates="HShiftsNameArray" name="HShiftsName" id="HShiftsName" placeholder="请选择生产班次"
                  v-model="hform.HShiftsName" @input="HShiftsNameChangeHandler"></uni-combox>
               <uni-combox :candidates="HShiftsNameArray" name="HShiftsName" id="HShiftsName" :placeholder="$t('QC_TakeSampleCheckBill.HShiftsName_Placeholder') == 'QC_TakeSampleCheckBill.HShiftsName_Placeholder' ? '请选择生产班次' : $t('QC_TakeSampleCheckBill.HShiftsName_Placeholder')" v-model="hform.HShiftsName" @input="HShiftsNameChangeHandler"></uni-combox>
            </view>
         </view>
         <view class="form-item">
            <view class="title required">生产班组:</view>
            <view class="title required">{{ $t("QC_TakeSampleCheckBill.HGroupName") == "QC_TakeSampleCheckBill.HGroupName" ? "生产班组:" : $t("QC_TakeSampleCheckBill.HGroupName") }}</view>
            <view class="right">
               <uni-combox :candidates="HGroupNameArray" name="HGroupName" id="HGroupName" placeholder="请选择生产班组"
                  v-model="hform.HGroupName" @input="HGroupNameChangeHandler"></uni-combox>
               <uni-combox :candidates="HGroupNameArray" name="HGroupName" id="HGroupName" :placeholder="$t('QC_TakeSampleCheckBill.HGroupName_Placeholder') == 'QC_TakeSampleCheckBill.HGroupName_Placeholder' ? '请选择生产班组' : $t('QC_TakeSampleCheckBill.HGroupName_Placeholder')" v-model="hform.HGroupName" @input="HGroupNameChangeHandler"></uni-combox>
            </view>
         </view>
         <view class="form-item">
            <view class="title">取样员:</view>
            <view class="title">{{ $t("QC_TakeSampleCheckBill.HCheckEmpName") == "QC_TakeSampleCheckBill.HCheckEmpName" ? "取样员:" : $t("QC_TakeSampleCheckBill.HCheckEmpName") }}</view>
            <view class="right">
               <uni-combox :candidates="HCheckEmpNameArray" name="HCheckEmpName" id="HCheckEmpName"
                  placeholder="请选择取样员" v-model="hform.HCheckEmpName"
                  :placeholder="$t('QC_TakeSampleCheckBill.HCheckEmpName_Placeholder') == 'QC_TakeSampleCheckBill.HCheckEmpName_Placeholder' ? '请选择取样员' : $t('QC_TakeSampleCheckBill.HCheckEmpName_Placeholder')" v-model="hform.HCheckEmpName"
                  @input="HCheckEmpNameChangeHandler"></uni-combox>
            </view>
         </view>
         <view class="form-item">
            <view class="title">生产资源:</view>
            <view class="title">{{ $t("QC_TakeSampleCheckBill.HSourceName") == "QC_TakeSampleCheckBill.HSourceName" ? "生产资源:" : $t("QC_TakeSampleCheckBill.HSourceName") }}</view>
            <view class="right">
               <uni-combox :candidates="HSourceNameArray" name="HSourceName" id="HSourceName" placeholder="请选择生产资料"
                  v-model="hform.HSourceName" @input="HSourceNameChangeHandler"></uni-combox>
               <uni-combox :candidates="HSourceNameArray" name="HSourceName" id="HSourceName" :placeholder="$t('QC_TakeSampleCheckBill.HSourceName_Placeholder') == 'QC_TakeSampleCheckBill.HSourceName_Placeholder' ? '请选择生产资料' : $t('QC_TakeSampleCheckBill.HSourceName_Placeholder')" v-model="hform.HSourceName" @input="HSourceNameChangeHandler"></uni-combox>
            </view>
         </view>
         <view class="form-item">
            <view class="title">单据日期:</view>
            <view class="title">{{ $t("Gy.HDate") == "Gy.HDate" ? "单据日期:" : $t("Gy.HDate") }}</view>
            <view class="right disabled">
               <input disabled type="text" name="HDate" id="HDate" v-model="hform.HDate" />
            </view>
         </view>
         <view class="form-item">
            <view class="title">单据号:</view>
            <view class="title">{{ $t("Gy.HBillNo") == "Gy.HBillNo" ? "单据号:" : $t("Gy.HBillNo") }}</view>
            <view class="right disabled">
               <input disabled type="text" name="HBillNo" id="HBillNo" v-model="hform.HBillNo" />
            </view>
         </view>
         <view class="form-item">
            <view class="title">生产订单:</view>
            <view class="title">{{ $t("QC_TakeSampleCheckBill.HICMOBillNo") == "QC_TakeSampleCheckBill.HICMOBillNo" ? "生产订单:" : $t("QC_TakeSampleCheckBill.HICMOBillNo") }}</view>
            <view class="right disabled">
               <input disabled type="text" v-model="hform.HICMOBillNo" name="HICMOBillNo" id="HICMOBillNo" />
            </view>
         </view>
         <view class="form-item">
            <view class="title">流转卡:</view>
            <view class="title">{{ $t("QC_TakeSampleCheckBill.HProcExchBillNo") == "QC_TakeSampleCheckBill.HProcExchBillNo" ? "流转卡:" : $t("QC_TakeSampleCheckBill.HProcExchBillNo") }}</view>
            <view class="right disabled">
               <input disabled type="text" v-model="hform.HProcExchBillNo" name="HProcExchBillNo"
                  id="HProcExchBillNo" />
            </view>
         </view>
         <view class="form-item">
            <view class="title">物料代码:</view>
            <view class="title">{{ $t("Gy.HMaterCode") == "Gy.HMaterCode" ? "物料代码:" : $t("Gy.HMaterCode") }}</view>
            <view class="right disabled">
               <input disabled type="text" v-model="hform.HMaterCode" name="HMaterCode" id="HMaterCode" />
            </view>
         </view>
         <view class="form-item">
            <view class="title">物料名称:</view>
            <view class="title">{{ $t("Gy.HMaterName") == "Gy.HMaterName" ? "物料名称:" : $t("Gy.HMaterName") }}</view>
            <view class="right disabled">
               <input disabled type="text" v-model="hform.HMaterName" name="HMaterName" id="HMaterName" />
            </view>
         </view>
         <view class="form-item">
            <view class="title">规格型号:</view>
            <view class="title">{{ $t("Gy.HMaterSpec") == "Gy.HMaterSpec" ? "规格型号:" : $t("Gy.HMaterSpec") }}</view>
            <view class="right disabled">
               <input disabled type="text" v-model="hform.HMaterSpec" name="HMaterSpec" id="HMaterSpec" />
            </view>
         </view>
         <view class="form-item">
            <view class="title">计量单位:</view>
            <view class="title">{{ $t("Gy.HUnitName") == "Gy.HUnitName" ? "计量单位:" : $t("Gy.HUnitName") }}</view>
            <view class="right disabled">
               <input disabled type="text" v-model="hform.HUnitName" name="HUnitName" id="HUnitName" />
            </view>
         </view>
         <view class="form-item">
            <view class="title">流转卡批号:</view>
            <view class="title">{{ $t("QC_TakeSampleCheckBill.HBatchNo") == "QC_TakeSampleCheckBill.HBatchNo" ? "流转卡批号:" : $t("QC_TakeSampleCheckBill.HBatchNo") }}</view>
            <view class="right disabled">
               <input disabled type="text" v-model="hform.HBatchNo" name="HBatchNo" id="HBatchNo" />
            </view>
         </view>
         <view class="form-item">
            <view class="title">流转卡数量:</view>
            <view class="title">{{ $t("QC_TakeSampleCheckBill.HProcExchQty") == "QC_TakeSampleCheckBill.HProcExchQty" ? "流转卡数量:" : $t("QC_TakeSampleCheckBill.HProcExchQty") }}</view>
            <view class="right disabled">
               <input disabled type="text" v-model="hform.HProcExchQty" name="HProcExchQty" id="HProcExchQty" />
            </view>
         </view>
      </scroll-view>
      <view class="bottom-btn" id="bottom-btn">
         <view><button class="btn-a" size="mini" @tap="submit">提交</button></view>
         <view><button class="btn-b" size="mini" @tap="onAddNewHandler">新增</button></view>
         <view><button class="btn-a" size="mini" @tap="submit">{{ $t("QC_TakeSampleCheckBill.submit") == "QC_TakeSampleCheckBill.submit" ? "提交" : $t("QC_TakeSampleCheckBill.submit") }}</button></view>
         <view><button class="btn-b" size="mini" @tap="onAddNewHandler">{{ $t("QC_TakeSampleCheckBill.addNew") == "QC_TakeSampleCheckBill.addNew" ? "新增" : $t("QC_TakeSampleCheckBill.addNew") }}</button></view>
         <view class="placeholder__view"></view>
         <view><button class="btn-c" size="mini" @tap="goBack">退出</button></view>
         <view><button class="btn-c" size="mini" @tap="goBack">{{ $t("QC_TakeSampleCheckBill.goBack") == "QC_TakeSampleCheckBill.goBack" ? "退出" : $t("QC_TakeSampleCheckBill.goBack") }}</button></view>
      </view>
   </view>
</template>
@@ -169,7 +164,6 @@
            },
            refSav: 'Add',
            showMask: true,
            TestTypeArray: ["首检", "巡检", "未检", "实验"],

            HBillType: '7521',
            HProcNameArray: [],
@@ -197,7 +191,7 @@
               HProcID: 0,
               HQty: '',
               HSampleDamageQty: 0,
               TestType: '首检',
               TestType: 'first',
               HBadNote: '',
               HDeptName: getUserInfo().HDeptName,
               HDeptID: getUserInfo().HDeptID,
@@ -247,6 +241,14 @@
            get() {
               return this.pageMeta.bottomBtnTop - this.pageMeta.scrollContentTop
            }
         },
         TestTypeArray() {
            return [
               this.$t('QC_TakeSampleCheckBill.testTypeFirst') == 'QC_TakeSampleCheckBill.testTypeFirst' ? '首检' : this.$t('QC_TakeSampleCheckBill.testTypeFirst'),
               this.$t('QC_TakeSampleCheckBill.testTypeInspection') == 'QC_TakeSampleCheckBill.testTypeInspection' ? '巡检' : this.$t('QC_TakeSampleCheckBill.testTypeInspection'),
               this.$t('QC_TakeSampleCheckBill.testTypeNot') == 'QC_TakeSampleCheckBill.testTypeNot' ? '未检' : this.$t('QC_TakeSampleCheckBill.testTypeNot'),
               this.$t('QC_TakeSampleCheckBill.testTypeExperiment') == 'QC_TakeSampleCheckBill.testTypeExperiment' ? '实验' : this.$t('QC_TakeSampleCheckBill.testTypeExperiment')
            ];
         }
      },
      onReady() {
@@ -265,6 +267,9 @@

      },
      async onLoad(e) {
         uni.setNavigationBarTitle({
                title: this.$t("QC_TakeSampleCheckBill.title") == 'QC_TakeSampleCheckBill.title' ? '取样单' : this.$t("QC_TakeSampleCheckBill.title") 
            })
         let {
            operationType
         } = e
@@ -284,7 +289,7 @@
         this.get_HWorkShift()
      },
      methods: {
         HDeptNameChangeHandler() {
         HDeptNameChangeHandler(e) {
            let index = this.HDeptNameArray.findIndex(item => item == e)

            if (index != -1) {
@@ -348,7 +353,7 @@
                  } else {
                     uni.showToast({
                        icon: 'none',
                        title: Message
                        title: msg
                     })
                  }
               }
@@ -575,7 +580,7 @@
            mpaasScanModule.mpaasScan({
               'hideAlbum': true,
               'timeoutInterval': '10', //超时时间
               'timeoutText': '未识别到二维码' //超时提醒            
               'timeoutText': this.$t('QC_TakeSampleCheckBill.scanTimeoutText') == 'QC_TakeSampleCheckBill.scanTimeoutText' ? '未识别到二维码' : this.$t('QC_TakeSampleCheckBill.scanTimeoutText') //超时提醒            
            }, (ret) => {
               console.log(ret.resp_result)
               if (this.hform.HBarCode == '*') {
@@ -592,7 +597,7 @@
            if (!HBarCode) {
               return uni.showToast({
                  icon: 'none',
                  title: '条形码不能为空'
                  title: this.$t('QC_TakeSampleCheckBill.barCodeEmpty') == 'QC_TakeSampleCheckBill.barCodeEmpty' ? '条形码不能为空' : this.$t('QC_TakeSampleCheckBill.barCodeEmpty')
               })
            }
            CommonUtils.doRequest2({
@@ -662,55 +667,55 @@
            if (this.hform.HProcID == 0) {
               return uni.showToast({
                  icon: 'none',
                  title: '工序没有选择'
                  title: this.$t('QC_TakeSampleCheckBill.noProcess') == 'QC_TakeSampleCheckBill.noProcess' ? '工序没有选择' : this.$t('QC_TakeSampleCheckBill.noProcess')
               })
            }
            if (this.hform.HQty == '') {
               return uni.showToast({
                  icon: 'none',
                  title: '取样数量不能为空'
                  title: this.$t('QC_TakeSampleCheckBill.sampleQtyEmpty') == 'QC_TakeSampleCheckBill.sampleQtyEmpty' ? '取样数量不能为空' : this.$t('QC_TakeSampleCheckBill.sampleQtyEmpty')
               })
            }
            if (this.hform.HSampleDamageQty == '') {
               return uni.showToast({
                  icon: 'none',
                  title: '破坏性实验数量不能为空'
                  title: this.$t('QC_TakeSampleCheckBill.damageQtyEmpty') == 'QC_TakeSampleCheckBill.damageQtyEmpty' ? '破坏性实验数量不能为空' : this.$t('QC_TakeSampleCheckBill.damageQtyEmpty')
               })
            }
            if (this.hform.HProcID == 0) {
               return uni.showToast({
                  icon: 'none',
                  title: '工序没有选择'
                  title: this.$t('QC_TakeSampleCheckBill.noProcess') == 'QC_TakeSampleCheckBill.noProcess' ? '工序没有选择' : this.$t('QC_TakeSampleCheckBill.noProcess')
               })
            }
            if (this.hform.HDeptID == 0) {
               return uni.showToast({
                  icon: 'none',
                  title: '部门没有选择'
                  title: this.$t('QC_TakeSampleCheckBill.noDept') == 'QC_TakeSampleCheckBill.noDept' ? '部门没有选择' : this.$t('QC_TakeSampleCheckBill.noDept')
               })
            }
            if (this.hform.HShiftsID == 0) {
               return uni.showToast({
                  icon: 'none',
                  title: '班次未选择'
                  title: this.$t('QC_TakeSampleCheckBill.noShift') == 'QC_TakeSampleCheckBill.noShift' ? '班次未选择' : this.$t('QC_TakeSampleCheckBill.noShift')
               })
            }
            if (this.hform.HGroupID == 0) {
               return uni.showToast({
                  icon: 'none',
                  title: '生产班组未选择'
                  title: this.$t('QC_TakeSampleCheckBill.noGroup') == 'QC_TakeSampleCheckBill.noGroup' ? '生产班组未选择' : this.$t('QC_TakeSampleCheckBill.noGroup')
               })
            }
            if (this.hform.HCheckEmp == 0) {
               return uni.showToast({
                  icon: 'none',
                  title: '取样员未选择'
                  title: this.$t('QC_TakeSampleCheckBill.noChecker') == 'QC_TakeSampleCheckBill.noChecker' ? '取样员未选择' : this.$t('QC_TakeSampleCheckBill.noChecker')
               })
            }
            if (this.hform.HSourceID == 0) {
               return uni.showToast({
                  icon: 'none',
                  title: '生产资源未选择'
                  title: this.$t('QC_TakeSampleCheckBill.noSource') == 'QC_TakeSampleCheckBill.noSource' ? '生产资源未选择' : this.$t('QC_TakeSampleCheckBill.noSource')
               })
            }

@@ -731,8 +736,8 @@
                  } = res.data
                  if (count == 1) {
                     uni.showModal({
                        title: '提示',
                        content: res.data.Message + '。是否继续新增？',
                        title: this.$t('QC_TakeSampleCheckBill.confirmTitle') == 'QC_TakeSampleCheckBill.confirmTitle' ? '提示' : this.$t('QC_TakeSampleCheckBill.confirmTitle'),
                        content: res.data.Message + (this.$t('QC_TakeSampleCheckBill.continueAdd') == 'QC_TakeSampleCheckBill.continueAdd' ? '。是否继续新增？' : this.$t('QC_TakeSampleCheckBill.continueAdd')),
                        success: (res) => {
                           if (res.confirm) {
                              console.log('用户点击确定');
@@ -769,6 +774,7 @@
</script>

<style lang="scss" scoped>
   /* 样式保持不变 */
   .scroll-content {
      box-sizing: border-box;
      padding: 20rpx;