ZZJ 2 жил өмнө
parent
commit
cbdfe59b2d

+ 1 - 1
src/views/system/jbdScan/goods/manualConfirmation.vue

@@ -570,7 +570,7 @@
                                 <el-col :span="8">
                                     <el-form-item label="备注">
                                         <template slot-scope="scope">
-                                            <el-input v-model="item.bei_zhu_" placeholder="请输入" type="text"
+                                            <el-input v-model="item.bei_zhu_1_" placeholder="请输入" type="text"
                                                  clearable />
                                         </template>
                                     </el-form-item>

+ 1 - 1
src/views/system/jbdScan/goods/sampleConfirmation.vue

@@ -570,7 +570,7 @@
                                 <el-col :span="8">
                                     <el-form-item label="备注">
                                         <template slot-scope="scope">
-                                            <el-input v-model="item.bei_zhu_" placeholder="请输入" type="text"
+                                            <el-input v-model="item.bei_zhu_1_" placeholder="请输入" type="text"
                                                  clearable />
                                         </template>
                                     </el-form-item>

+ 4 - 2
src/views/system/jbdScan/js/manualConfirmationJS.js

@@ -94,6 +94,7 @@ export default {
                         item.dan_wei_er = item.yang_pin_gui_ge_e ? this.handleSpecificationsToUnit(item.yang_pin_gui_ge_e) : ''
                         item.dan_wei_san = item.yang_pin_gui_ge_s ? this.handleSpecificationsToUnit(item.yang_pin_gui_ge_s) : ''
                         item.dan_wei_si = item.yang_pin_gui_si_ ? this.handleSpecificationsToUnit(item.yang_pin_gui_si_) : ''
+
                     })
                     this.listData = temp
                 } else {
@@ -428,7 +429,8 @@ export default {
                                 yang_pin_gui_si_: ypInfoList[yp].yang_pin_gui_si_,
 
                                 jie_yang_zhuang_t:"已接收",
-                                yang_pin_zong_shu:ypInfoList[yp].yang_pin_zong_shu
+                                yang_pin_zong_shu:ypInfoList[yp].yang_pin_zong_shu,
+                                bei_zhu_1_:ypInfoList[yp].bei_zhu_1_
                             }
                         }
                         sampleList.push(o)
@@ -611,7 +613,7 @@ export default {
                                                 nian_ling_: ypInfoList[index].nian_ling_=== undefined?'':ypInfoList[index].nian_ling_,
                                                 yang_ben_zhuang_t: item.yang_pin_zhuang_t,
                                                 shou_yang_ri_qi_: currentTime,
-                                                bei_zhu_: ypInfoList[index].bei_zhu_ === undefined?'':ypInfoList[index].bei_zhu_,
+                                                bei_zhu_: ypInfoList[index].bei_zhu_1_ === undefined?'':ypInfoList[index].bei_zhu_1_,
                                                 yang_ben_lei_xing: yblx,
                                                 yun_shu_tiao_jian: ystj,
                                                 yang_pin_shu_lian: ypsl,

+ 3 - 2
src/views/system/jbdScan/js/sampleConfirmationJS.js

@@ -349,7 +349,8 @@ export default {
                                 yang_pin_gui_si_: ypInfoList[yp].yang_pin_gui_si_,
 
                                 jie_yang_zhuang_t:"已接收",
-                                yang_pin_zong_shu:ypInfoList[yp].yang_pin_zong_shu
+                                yang_pin_zong_shu:ypInfoList[yp].yang_pin_zong_shu,
+                                bei_zhu_1_:ypInfoList[yp].bei_zhu_1_
                             }
                         }
                         sampleList.push(o)
@@ -532,7 +533,7 @@ export default {
                                                 nian_ling_: ypInfoList[index].nian_ling_=== undefined?'':ypInfoList[index].nian_ling_,
                                                 yang_ben_zhuang_t: item.yang_pin_zhuang_t,
                                                 shou_yang_ri_qi_: currentTime,
-                                                bei_zhu_: ypInfoList[index].bei_zhu_ === undefined?'':ypInfoList[index].bei_zhu_,
+                                                bei_zhu_: ypInfoList[index].bei_zhu_1_ === undefined?'':ypInfoList[index].bei_zhu_1_,
                                                 yang_ben_lei_xing: yblx,
                                                 yun_shu_tiao_jian: ystj,
                                                 yang_pin_shu_lian: ypsl,