ZZJ %!s(int64=2) %!d(string=hai) anos
pai
achega
094439c603

+ 2 - 2
src/views/system/jbdScan/goods/liuyangData.vue

@@ -197,9 +197,9 @@ export default {
   methods: {
     
     clearPosition(){
-        console.log('start')
+        // console.log('start')
         this.placeValue = null
-        console.log('end...'+this.placeValue)
+        // console.log('end...'+this.placeValue)
     },
     positionBtn() {
       this.loadQueryData();

+ 23 - 25
src/views/system/jbdScan/goods/manualConfirmation.vue

@@ -37,17 +37,17 @@
                             <el-row>
                                 <el-col :span="6">
                                     <el-form-item label="样品编号">
-                                        <el-input v-model="item.yang_pin_bian_hao" readonly="true"></el-input>
+                                        <el-input v-model="item.yang_pin_bian_hao"  readonly></el-input>
                                     </el-form-item>
                                 </el-col>
                                 <el-col :span="6">
                                     <el-form-item label="样品名称">
-                                        <el-input v-model="item.yang_pin_ming_che" readonly="true"></el-input>
+                                        <el-input v-model="item.yang_pin_ming_che"  readonly></el-input>
                                     </el-form-item>
                                 </el-col>
                                 <el-col :span="6">
                                     <el-form-item label="样品总数">
-                                        <el-input v-model="item.yang_pin_zong_shu" readonly="true"></el-input>
+                                        <el-input v-model="item.yang_pin_zong_shu"  readonly></el-input>
                                     </el-form-item>
                                 </el-col>
                                 <el-col :span="6">
@@ -83,7 +83,6 @@
 
                                     <el-col :span="8">
                                         <el-form-item label="样品运输条件(一)">
-                                            <!-- <el-input v-model="item.yang_ben_yun_shu_" ></el-input> -->
                                             <template slot-scope="scope">
                                                 <el-select v-model="item.yang_ben_yun_shu_" placeholder="请选择" filterable
                                                     allow-create>
@@ -157,9 +156,9 @@
                                     <el-col :span="8">
                                         <el-form-item label="留样存放位置(一)" required>
                                             <template slot-scope="scope">
-                                                <!-- <liuyangData v-model="item.liu_yang_wei_zhi_yi" ref="LyPositionOne"  /> -->
                                                 <liuyangData v-model="item.liu_yang_wei_zhi_yi" ref="LyPositionOne"  v-if="item.liu_yang_shu_lian_yi" />
-                                                <el-input v-model="item.liu_yang_shu_lian_yi" v-if="!item.liu_yang_shu_lian_yi" :disabled="true"></el-input>
+                                                <el-input v-if="!item.liu_yang_shu_lian_yi" :disabled="true">
+                                                </el-input>
                                             </template>
                                         </el-form-item>
                                     </el-col>
@@ -258,9 +257,8 @@
                                     <el-col :span="8">
                                         <el-form-item label="留样存放位置(二)" required>
                                             <template slot-scope="scope">
-                                                <!-- <liuyangData v-model="item.liu_yang_wei_zhi_er" ref="LyPositionTwo" /> -->
-                                                <liuyangData v-model="item.liu_yang_wei_zhi_yi" ref="LyPositionOne"  v-if="item.liu_yang_shu_lian_er" />
-                                                <el-input v-model="item.liu_yang_shu_lian_yi" v-if="!item.liu_yang_shu_lian_er" :disabled="true"></el-input>
+                                                <liuyangData v-model="item.liu_yang_wei_zhi_er" ref="LyPositionTwo"  v-if="item.liu_yang_shu_lian_er" />
+                                                <el-input  v-if="!item.liu_yang_shu_lian_er" :disabled="true"></el-input>
                                             </template>
                                         </el-form-item>
                                     </el-col>
@@ -360,9 +358,9 @@
                                     <el-col :span="8">
                                         <el-form-item label="留样存放位置(三)" required>
                                             <template slot-scope="scope">
-                                                <!-- <liuyangData v-model="item.liu_yang_wei_zhi_san" ref="LyPositionThree" /> -->
-                                                <liuyangData v-model="item.liu_yang_wei_zhi_yi" ref="LyPositionOne"  v-if="item.liu_yang_shu_lian_san" />
-                                                <el-input v-model="item.liu_yang_shu_lian_yi" v-if="!item.liu_yang_shu_lian_san" :disabled="true"></el-input>
+                                                <liuyangData v-model="item.liu_yang_wei_zhi_san" ref="LyPositionThree" 
+                                                 v-if="item.liu_yang_shu_lian_san" />
+                                                <el-input  v-if="!item.liu_yang_shu_lian_san" :disabled="true"></el-input>
                                             </template>
                                         </el-form-item>
                                     </el-col>
@@ -462,9 +460,9 @@
                                     <el-col :span="8">
                                         <el-form-item label="留样存放位置(四)" required>
                                             <template slot-scope="scope">
-                                                <!-- <liuyangData v-model="item.liu_yang_wei_zhi_si" ref="LyPositionFour" /> -->
-                                                <liuyangData v-model="item.liu_yang_wei_zhi_yi" ref="LyPositionOne"  v-if="item.liu_yang_shu_lian_si" />
-                                                <el-input v-model="item.liu_yang_shu_lian_yi" v-if="!item.liu_yang_shu_lian_si" :disabled="true"></el-input>
+                                                <liuyangData v-model="item.liu_yang_wei_zhi_si" ref="LyPositionFour"
+                                                  v-if="item.liu_yang_shu_lian_si" />
+                                                <el-input v-if="!item.liu_yang_shu_lian_si" :disabled="true"></el-input>
                                             </template>
                                         </el-form-item>
                                     </el-col>
@@ -484,7 +482,7 @@
                                         <template slot-scope="scope">
                                             <el-date-picker v-model="item.liu_yang_ri_qi_" type="date"
                                                 value-format="yyyy-MM-dd" format="yyyy-MM-dd" placeholder="请选择"
-                                                :readonly="false" :clearable="true" @change="liuyanRiQiChange(item, index)" />
+                                                :clearable="true" @change="liuyanRiQiChange(item, index)" />
                                         </template>
                                     </el-form-item>
                                 </el-col>
@@ -493,7 +491,7 @@
                                         <template slot-scope="scope">
                                             <el-date-picker v-model="item.liu_yang_qi_xian" type="date"
                                                 value-format="yyyy-MM-dd" format="yyyy-MM-dd" placeholder="请选择"
-                                                :readonly="false" :clearable="true" />
+                                                :clearable="true" />
                                         </template>
                                     </el-form-item>
                                 </el-col>
@@ -516,7 +514,7 @@
                                         <template slot-scope="scope">
                                             <el-date-picker v-model="item.fan_yang_ri_qi_" type="date"
                                                 value-format="yyyy-MM-dd" format="yyyy-MM-dd" placeholder="请选择"
-                                                :readonly="false" :clearable="true" />
+                                                :clearable="true" />
                                         </template>
                                     </el-form-item>
                                 </el-col>
@@ -524,14 +522,14 @@
                                     <el-form-item label="返样接样人">
                                         <template slot-scope="scope">
                                             <el-input v-model="item.fan_yang_jyr" placeholder="请输入" type="text"
-                                                :readonly="false" clearable />
+                                            clearable />
                                         </template>
                                     </el-form-item>
                                 </el-col>
 
                                 <el-col :span="8">
                                     <el-form-item label="是否加急">
-                                        <el-input v-model="item.chu_ju_bao_gao_ya" readonly="true" ></el-input>
+                                        <el-input v-model="item.chu_ju_bao_gao_ya"  readonly ></el-input>
                                     </el-form-item>
                                 </el-col>
                                
@@ -542,7 +540,7 @@
                                     <el-form-item label="姓名">
                                         <template slot-scope="scope">
                                             <el-input v-model="item.xing_ming_" placeholder="请输入" type="text"
-                                                :readonly="false" clearable />
+                                                clearable />
                                         </template>
                                     </el-form-item>
                                 </el-col>
@@ -561,7 +559,7 @@
                                     <el-form-item label="年龄">
                                         <template slot-scope="scope">
                                             <el-input v-model="item.nian_ling_" placeholder="请输入" type="text"
-                                                :readonly="false" clearable />
+                                                clearable />
                                         </template>
                                     </el-form-item>
                                 </el-col>
@@ -573,7 +571,7 @@
                                     <el-form-item label="备注">
                                         <template slot-scope="scope">
                                             <el-input v-model="item.bei_zhu_" placeholder="请输入" type="text"
-                                                :readonly="false" clearable />
+                                                 clearable />
                                         </template>
                                     </el-form-item>
                                 </el-col>
@@ -581,7 +579,7 @@
                                     <el-form-item label="送样要求">
                                         <template slot-scope="scope">
                                             <el-input v-model="item.song_yang_yao_qiu" placeholder="请输入" type="text"
-                                                :readonly="false" clearable />
+                                                 clearable />
                                         </template>
                                     </el-form-item>
                                 </el-col>
@@ -772,7 +770,7 @@ export default {
             let item = this.listData[index]
             let ifLYArgs = ['shi_fou_liu_yang_yi','shi_fou_liu_yang_er','shi_fou_liu_yang_san','shi_fou_liu_yang_si']
             let LYShuLiangArgs = ['liu_yang_shu_lian_yi','liu_yang_shu_lian_er','liu_yang_shu_lian_san','liu_yang_shu_lian_si']
-            let positionArgs = ['LyPositionOne','LyPositionTwo','LyPositionThree','LyPositionThree']
+            let positionArgs = ['LyPositionOne','LyPositionTwo','LyPositionThree','LyPositionFour']
             if (item[ifLYArgs[LYIndex]] == '否') {
                 item[LYShuLiangArgs[LYIndex]] = null
                 this.$refs[positionArgs[LYIndex]][0].clearPosition()

+ 28 - 22
src/views/system/jbdScan/goods/sampleConfirmation.vue

@@ -37,17 +37,17 @@
                             <el-row>
                                 <el-col :span="6">
                                     <el-form-item label="样品编号">
-                                        <el-input v-model="item.yang_pin_bian_hao" readonly="true"></el-input>
+                                        <el-input v-model="item.yang_pin_bian_hao"  readonly></el-input>
                                     </el-form-item>
                                 </el-col>
                                 <el-col :span="6">
                                     <el-form-item label="样品名称">
-                                        <el-input v-model="item.yang_pin_ming_che" readonly="true"></el-input>
+                                        <el-input v-model="item.yang_pin_ming_che"  readonly></el-input>
                                     </el-form-item>
                                 </el-col>
                                 <el-col :span="6">
                                     <el-form-item label="样品总数">
-                                        <el-input v-model="item.yang_pin_zong_shu" readonly="true"></el-input>
+                                        <el-input v-model="item.yang_pin_zong_shu"  readonly></el-input>
                                     </el-form-item>
                                 </el-col>
                                 <el-col :span="6">
@@ -83,7 +83,6 @@
 
                                     <el-col :span="8">
                                         <el-form-item label="样品运输条件(一)">
-                                            <!-- <el-input v-model="item.yang_ben_yun_shu_" ></el-input> -->
                                             <template slot-scope="scope">
                                                 <el-select v-model="item.yang_ben_yun_shu_" placeholder="请选择" filterable
                                                     allow-create>
@@ -150,14 +149,16 @@
                                     <el-col :span="8">
                                         <el-form-item label="留样数量(一)" required class="zzj">
                                             <template slot-scope="scope">
-                                                <el-input v-model="item.liu_yang_shu_lian_yi"></el-input>
+                                                <el-input v-model="item.liu_yang_shu_lian_yi" :disabled=!item.liu_yang_shu_lian_yi ></el-input>
                                             </template>
                                         </el-form-item>
                                     </el-col>
                                     <el-col :span="8">
                                         <el-form-item label="留样存放位置(一)" required>
                                             <template slot-scope="scope">
-                                                <liuyangData v-model="item.liu_yang_wei_zhi_yi" ref="LyPositionOne" />
+                                                <liuyangData v-model="item.liu_yang_wei_zhi_yi" ref="LyPositionOne"  v-if="item.liu_yang_shu_lian_yi" />
+                                                <el-input v-if="!item.liu_yang_shu_lian_yi" :disabled="true">
+                                                </el-input>
                                             </template>
                                         </el-form-item>
                                     </el-col>
@@ -249,14 +250,15 @@
                                     <el-col :span="8">
                                         <el-form-item label="留样数量(二)" required class="zzj">
                                             <template slot-scope="scope">
-                                                <el-input v-model="item.liu_yang_shu_lian_er"></el-input>
+                                                <el-input v-model="item.liu_yang_shu_lian_er" :disabled=!item.liu_yang_shu_lian_er></el-input>
                                             </template>
                                         </el-form-item>
                                     </el-col>
                                     <el-col :span="8">
                                         <el-form-item label="留样存放位置(二)" required>
                                             <template slot-scope="scope">
-                                                <liuyangData v-model="item.liu_yang_wei_zhi_er" ref="LyPositionTwo" />
+                                                <liuyangData v-model="item.liu_yang_wei_zhi_er" ref="LyPositionTwo"  v-if="item.liu_yang_shu_lian_er" />
+                                                <el-input  v-if="!item.liu_yang_shu_lian_er" :disabled="true"></el-input>
                                             </template>
                                         </el-form-item>
                                     </el-col>
@@ -349,14 +351,16 @@
                                     <el-col :span="8">
                                         <el-form-item label="留样数量(三)" required class="zzj">
                                             <template slot-scope="scope">
-                                                <el-input v-model="item.liu_yang_shu_lian_san"></el-input>
+                                                <el-input v-model="item.liu_yang_shu_lian_san" :disabled=!item.liu_yang_shu_lian_san></el-input>
                                             </template>
                                         </el-form-item>
                                     </el-col>
                                     <el-col :span="8">
                                         <el-form-item label="留样存放位置(三)" required>
                                             <template slot-scope="scope">
-                                                <liuyangData v-model="item.liu_yang_wei_zhi_san" ref="LyPositionThree" />
+                                                <liuyangData v-model="item.liu_yang_wei_zhi_san" ref="LyPositionThree" 
+                                                 v-if="item.liu_yang_shu_lian_san" />
+                                                <el-input  v-if="!item.liu_yang_shu_lian_san" :disabled="true"></el-input>
                                             </template>
                                         </el-form-item>
                                     </el-col>
@@ -449,14 +453,16 @@
                                     <el-col :span="8">
                                         <el-form-item label="留样数量(四)" required class="zzj">
                                             <template slot-scope="scope">
-                                                <el-input v-model="item.liu_yang_shu_lian_si"></el-input>
+                                                <el-input v-model="item.liu_yang_shu_lian_si" :disabled=!item.liu_yang_shu_lian_si></el-input>
                                             </template>
                                         </el-form-item>
                                     </el-col>
                                     <el-col :span="8">
                                         <el-form-item label="留样存放位置(四)" required>
                                             <template slot-scope="scope">
-                                                <liuyangData v-model="item.liu_yang_wei_zhi_si" ref="LyPositionFour" />
+                                                <liuyangData v-model="item.liu_yang_wei_zhi_si" ref="LyPositionFour"
+                                                  v-if="item.liu_yang_shu_lian_si" />
+                                                <el-input v-if="!item.liu_yang_shu_lian_si" :disabled="true"></el-input>
                                             </template>
                                         </el-form-item>
                                     </el-col>
@@ -476,7 +482,7 @@
                                         <template slot-scope="scope">
                                             <el-date-picker v-model="item.liu_yang_ri_qi_" type="date"
                                                 value-format="yyyy-MM-dd" format="yyyy-MM-dd" placeholder="请选择"
-                                                :readonly="false" :clearable="true" @change="liuyanRiQiChange(item, index)" />
+                                                 :clearable="true" @change="liuyanRiQiChange(item, index)" />
                                         </template>
                                     </el-form-item>
                                 </el-col>
@@ -485,7 +491,7 @@
                                         <template slot-scope="scope">
                                             <el-date-picker v-model="item.liu_yang_qi_xian" type="date"
                                                 value-format="yyyy-MM-dd" format="yyyy-MM-dd" placeholder="请选择"
-                                                :readonly="false" :clearable="true" />
+                                                 :clearable="true" />
                                         </template>
                                     </el-form-item>
                                 </el-col>
@@ -508,7 +514,7 @@
                                         <template slot-scope="scope">
                                             <el-date-picker v-model="item.fan_yang_ri_qi_" type="date"
                                                 value-format="yyyy-MM-dd" format="yyyy-MM-dd" placeholder="请选择"
-                                                :readonly="false" :clearable="true" />
+                                                 :clearable="true" />
                                         </template>
                                     </el-form-item>
                                 </el-col>
@@ -516,14 +522,14 @@
                                     <el-form-item label="返样接样人">
                                         <template slot-scope="scope">
                                             <el-input v-model="item.fan_yang_jyr" placeholder="请输入" type="text"
-                                                :readonly="false" clearable />
+                                                 clearable />
                                         </template>
                                     </el-form-item>
                                 </el-col>
 
                                 <el-col :span="8">
                                     <el-form-item label="是否加急">
-                                        <el-input v-model="item.chu_ju_bao_gao_ya" readonly="true" ></el-input>
+                                        <el-input v-model="item.chu_ju_bao_gao_ya"  readonly ></el-input>
                                     </el-form-item>
                                 </el-col>
                                
@@ -534,7 +540,7 @@
                                     <el-form-item label="姓名">
                                         <template slot-scope="scope">
                                             <el-input v-model="item.xing_ming_" placeholder="请输入" type="text"
-                                                :readonly="false" clearable />
+                                                 clearable />
                                         </template>
                                     </el-form-item>
                                 </el-col>
@@ -553,7 +559,7 @@
                                     <el-form-item label="年龄">
                                         <template slot-scope="scope">
                                             <el-input v-model="item.nian_ling_" placeholder="请输入" type="text"
-                                                :readonly="false" clearable />
+                                                 clearable />
                                         </template>
                                     </el-form-item>
                                 </el-col>
@@ -565,7 +571,7 @@
                                     <el-form-item label="备注">
                                         <template slot-scope="scope">
                                             <el-input v-model="item.bei_zhu_" placeholder="请输入" type="text"
-                                                :readonly="false" clearable />
+                                                 clearable />
                                         </template>
                                     </el-form-item>
                                 </el-col>
@@ -573,7 +579,7 @@
                                     <el-form-item label="送样要求">
                                         <template slot-scope="scope">
                                             <el-input v-model="item.song_yang_yao_qiu" placeholder="请输入" type="text"
-                                                :readonly="false" clearable />
+                                                 clearable />
                                         </template>
                                     </el-form-item>
                                 </el-col>
@@ -754,7 +760,7 @@ export default {
             let item = this.listData[index]
             let ifLYArgs = ['shi_fou_liu_yang_yi','shi_fou_liu_yang_er','shi_fou_liu_yang_san','shi_fou_liu_yang_si']
             let LYShuLiangArgs = ['liu_yang_shu_lian_yi','liu_yang_shu_lian_er','liu_yang_shu_lian_san','liu_yang_shu_lian_si']
-            let positionArgs = ['LyPositionOne','LyPositionTwo','LyPositionThree','LyPositionThree']
+            let positionArgs = ['LyPositionOne','LyPositionTwo','LyPositionThree','LyPositionFour']
             if (item[ifLYArgs[LYIndex]] == '否') {
                 item[LYShuLiangArgs[LYIndex]] = null
                 this.$refs[positionArgs[LYIndex]][0].clearPosition()

+ 10 - 0
src/views/system/jbdScan/js/manualConfirmationJS.js

@@ -89,6 +89,11 @@ export default {
                         item.yang_pin_lei_si_ ? this.$set(item, 'flag4', true) : this.$set(item, 'flag4', false)
                         item.liu_yang_qi_xian = dayjs(item.song_jian_shi_jia).add(rq, 'month').format("YYYY-MM-DD")
                         // temp[i].xiao_hui_ri_qi_ = dayjs(temp[i].liu_yang_qi_xian).endOf('month').format("YYYY-MM-DD")
+                        
+                        item.dan_wei_yi = item.yang_pin_gui_ge_ ? this.handleSpecificationsToUnit(item.yang_pin_gui_ge_) : ''
+                        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 {
@@ -139,6 +144,11 @@ export default {
                         item.yang_pin_lei_san_ ? this.$set(item, 'flag3', true) : this.$set(item, 'flag3', false)
                         item.yang_pin_lei_si_ ? this.$set(item, 'flag4', true) : this.$set(item, 'flag4', false)
                         item.liu_yang_qi_xian = dayjs(item.song_jian_shi_jia).add(rq, 'month').format("YYYY-MM-DD")
+
+                        item.dan_wei_yi = item.yang_pin_gui_ge_ ? this.handleSpecificationsToUnit(item.yang_pin_gui_ge_) : ''
+                        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 {

+ 4 - 0
src/views/system/jbdScan/js/sampleConfirmationJS.js

@@ -102,6 +102,10 @@ export default {
                             item.yang_pin_lei_san_ ? this.$set(item, 'flag3', true) : this.$set(item, 'flag3', false)
                             item.yang_pin_lei_si_ ? this.$set(item, 'flag4', true) : this.$set(item, 'flag4', false)
                             item.liu_yang_qi_xian = dayjs(item.song_jian_shi_jia).add(rq, 'month').format("YYYY-MM-DD")
+                            item.dan_wei_yi = item.yang_pin_gui_ge_ ? this.handleSpecificationsToUnit(item.yang_pin_gui_ge_) : ''
+                            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.push(temp[0])
                         // console.log(this.listData)