修改扫码留样数量

src/views/system/jbdScan/goods/manualConfirmation.vue

@@ -228,12 +228,15 @@
                           <el-col :span="6">
                             <el-form-item label="留样数量">
                              <template slot-scope="scope">
-                                <el-input-number
+                              <el-input 
+                                v-model="item.liu_yang_shu_lian">
+                              </el-input>
+                                <!-- <el-input-number
                                  v-model="item.liu_yang_shu_lian"
                                   controls-position="right"
                                   @change="handleChange"
                                   :min="1" :max="9999">
-                                 </el-input-number>
+                                 </el-input-number> -->
                              </template>
                             </el-form-item>
                           </el-col>

src/views/system/jbdScan/goods/sampleConfirmation.vue

@@ -227,12 +227,15 @@
                           <el-col :span="6">
                             <el-form-item label="留样数量">
                              <template slot-scope="scope">
-                                <el-input-number
+                              <el-input 
+                                v-model="item.liu_yang_shu_lian">
+                              </el-input>
+                                <!-- <el-input-number
                                  v-model="item.liu_yang_shu_lian"
                                   controls-position="right"
                                   @change="handleChange"
                                   :min="1" :max="9999">
-                                 </el-input-number>
+                                 </el-input-number> -->
                              </template>
                             </el-form-item>
                           </el-col>

src/views/system/jbdScan/js/manualConfirmationJS.js

@@ -29,6 +29,7 @@ export default {
             temp[i].biao_zhi_uuid_ = this.uuid()
             temp[i].shi_fou_liu_yang_ = '是'
             temp[i].yan_shou_jie_guo_ = '完好'
+            temp[i].liu_yang_shu_lian = ' ml/支×1支'
             temp[i].liu_yang_ri_qi_ = this.dateFormat()
             temp[i].liu_yang_qi_xian = dayjs(temp[i].song_jian_shi_jia).add(3,'month').format("YYYY-MM-DD")
             temp[i].xiao_hui_ri_qi_ = dayjs(temp[i].liu_yang_qi_xian).endOf('month').format("YYYY-MM-DD")
@@ -55,6 +56,7 @@ export default {
             res.variables.data[i].biao_zhi_uuid_ = this.uuid()
             res.variables.data[i].shi_fou_liu_yang_ = '是'
             res.variables.data[i].yan_shou_jie_guo_ = '完好'
+            res.variables.data[i].liu_yang_shu_lian = ' ml/支×1支'
             res.variables.data[i].liu_yang_ri_qi_ = this.dateFormat()
             res.variables.data[i].liu_yang_qi_xian = dayjs(res.variables.data[i].song_jian_shi_jia).add(3,'month').format("YYYY-MM-DD")
             res.variables.data[i].xiao_hui_ri_qi_ = dayjs(res.variables.data[i].liu_yang_qi_xian).endOf('month').format("YYYY-MM-DD")
@@ -196,10 +198,10 @@ export default {
                 this_.$message.error("留样时必须填写留样数量!")
                 return;
               }
-              if (ypInfoList[yp].liu_yang_shu_lian > ypInfoList[yp].yang_pin_zong_shu) {
-                this_.$message.error('操作失败，[' + ypInfoList[yp].yang_pin_ming_che + '] 留样数量不得大于收样数量。')
-                return;
-              }
+              // if (ypInfoList[yp].liu_yang_shu_lian > ypInfoList[yp].yang_pin_zong_shu) {
+              //   this_.$message.error('操作失败，[' + ypInfoList[yp].yang_pin_ming_che + '] 留样数量不得大于收样数量。')
+              //   return;
+              // }
               if (ypInfoList[yp].liu_yang_qi_xian == null || ypInfoList[yp].liu_yang_qi_xian == '') {
                 this_.$message.error("留样时必须填写留样期限!")
                 return;

src/views/system/jbdScan/js/sampleConfirmationJS.js

@@ -33,16 +33,12 @@ export default {
          repostCurd('sql',sql).then(res => {
           if (res.variables.data && res.variables.data.length > 0) {
             for (let i in res.variables.data) {
-              // res.variables.data[i].jie_yang_shu_lian = 1
-              // res.variables.data[i].jie_yang_zhuang_t = '未确认'
-              // res.variables.data[i].biao_zhi_uuid_ = this.uuid()
-              // this.listData.push(res.variables.data[i])
-              // this.OriginalPosition.push(res.variables.data[i].shi_fou_liu_yang_ == "是" ? res.variables.data[i].liu_yang_wei_zhi_ : res.variables.data[i].shou_yang_wei_zhi)
               res.variables.data[i].jie_yang_shu_lian = res.variables.data[i].yang_pin_zong_shu
               res.variables.data[i].jie_yang_zhuang_t = '已确认'
               res.variables.data[i].biao_zhi_uuid_ = this.uuid()
               res.variables.data[i].shi_fou_liu_yang_ = '是'
               res.variables.data[i].yan_shou_jie_guo_ = '完好'
+              res.variables.data[i].liu_yang_shu_lian = ' ml/支×1支'
               res.variables.data[i].liu_yang_ri_qi_ = this.dateFormat()
               res.variables.data[i].liu_yang_qi_xian = dayjs(res.variables.data[i].song_jian_shi_jia).add(3,'month').format("YYYY-MM-DD")
               res.variables.data[i].xiao_hui_ri_qi_ = dayjs(res.variables.data[i].liu_yang_qi_xian).endOf('month').format("YYYY-MM-DD")
@@ -158,10 +154,10 @@ export default {
                   this_.$message.error("留样时必须填写留样数量!")
                   return;
                 }
-                if (ypInfoList[yp].liu_yang_shu_lian > ypInfoList[yp].yang_pin_zong_shu) {
-                  this_.$message.error('操作失败，[' + ypInfoList[yp].yang_pin_ming_che + '] 留样数量不得大于收样数量。')
-                  return;
-                }
+                // if (ypInfoList[yp].liu_yang_shu_lian > ypInfoList[yp].yang_pin_zong_shu) {
+                //   this_.$message.error('操作失败，[' + ypInfoList[yp].yang_pin_ming_che + '] 留样数量不得大于收样数量。')
+                //   return;
+                // }
                 if (ypInfoList[yp].liu_yang_qi_xian == null || ypInfoList[yp].liu_yang_qi_xian == '') {
                   this_.$message.error("留样时必须填写留样期限!")
                   return;
@@ -467,9 +463,7 @@ export default {
                           repostCurd('add', '{"tableName":"t_ypcfwz","paramWhere":' + JSON.stringify(cfNewList) + '}').then(res => {
                             let selectsql = "select id_ from t_ypcfwz where biao_zhi_uuid_='" + uuid + "'";
                             repostCurd('sql', selectsql).then(res => {
-                              // let dataid = res.variables.data[0].id_;
                               let data = res.variables.data;
-                              // console.log('data:',data)
                               let suchAs = '{"biao_zhi_uuid_":"' + uuid + '"}'
                               // console.log(data.length,changeWeiZhi,changesyWeiZhi,firstIfEmpty,secondIfEmpty)
                               if(data.length == 1 && changeWeiZhi && firstIfEmpty){