ZZJ 3 лет назад
Родитель
Сommit
ab65c0fca0

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

@@ -468,11 +468,13 @@ import sampleConfirmationJS from '../js/sampleConfirmationJS.js'
 import IbpsLinkData from '@/business/platform/data/templaterender/link-data'
 import IbpsLinkData from '@/business/platform/data/templaterender/link-data'
 import weizhiData from "./weizhiData.vue"
 import weizhiData from "./weizhiData.vue"
 import liuyangData from "./liuyangData.vue"
 import liuyangData from "./liuyangData.vue"
+import IbpsUserSelector from '@/business/platform/org/selector'
  export default {
  export default {
    components:{
    components:{
      IbpsLinkData,
      IbpsLinkData,
      weizhiData,
      weizhiData,
-     liuyangData
+     liuyangData,
+     IbpsUserSelector
    },
    },
    mixins:[sampleConfirmationJS],
    mixins:[sampleConfirmationJS],
    props:{scanVisible:Boolean},
    props:{scanVisible:Boolean},
@@ -520,6 +522,30 @@ import liuyangData from "./liuyangData.vue"
              }],
              }],
       OriginalPosition:[],
       OriginalPosition:[],
       mjwtsqbAllResult:[],
       mjwtsqbAllResult:[],
+      checkOptions:[{
+            value:'完好',
+            label:'完好'
+          },{
+            value:'残缺',
+            label:'残缺'
+          }],
+      ifLY:[{
+          value:'是',
+          label:'是'
+        },{
+          value:'否',
+          label:'否'
+        }],
+        sex:[{
+          value:'男',
+          label:'男'
+        },{
+          value:'女',
+          label:'女'
+        }],
+      // OriginalPosition:[],
+      pageCount:'',
+      item:''
       // currentPage:1,
       // currentPage:1,
       // pageCount:''
       // pageCount:''
 
 

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

@@ -28,8 +28,8 @@ export default {
 
 
       // 扫码扫到新数据,查询 回填展示
       // 扫码扫到新数据,查询 回填展示
       if(flag){
       if(flag){
-         repostCurd('select','{"tableName": "t_lhypb","paramWhere":{"yang_pin_bian_hao":"' + id + '"}}').then(response => {
-          if (response.variables.data && response.variables.data.length > 0) {
+         repostCurd('select','{"tableName": "t_lhypb","paramWhere":{"yang_pin_bian_hao":"' + id + '"}}').then(res => {
+          if (res.variables.data && res.variables.data.length > 0) {
             for (let i in res.variables.data) {
             for (let i in res.variables.data) {
               res.variables.data[i].jie_yang_shu_lian = 1
               res.variables.data[i].jie_yang_shu_lian = 1
               res.variables.data[i].jie_yang_zhuang_t = '未确认'
               res.variables.data[i].jie_yang_zhuang_t = '未确认'
@@ -62,8 +62,8 @@ export default {
       // this指针
       // this指针
       let this_ = this;
       let this_ = this;
       // 回传关闭事件。隐藏当前组件。
       // 回传关闭事件。隐藏当前组件。
-      let changeWeizhi;
-      let changesyWeizhi;
+      let changeWeiZhi;     // 此处俩字段作用在下面 选择货位时出现重复位置 而重新更新样品登记表 收样位置|留样位置
+      let changesyWeiZhi;
       let judge = true;
       let judge = true;
         this.$confirm('请再次确认 [样品接收信息]').then(_ => {
         this.$confirm('请再次确认 [样品接收信息]').then(_ => {
 
 
@@ -89,6 +89,7 @@ export default {
             let lhwtbID = []
             let lhwtbID = []
             // 罗湖委托表展示表ID
             // 罗湖委托表展示表ID
             let lhwtzsbID = []
             let lhwtzsbID = []
+            let lhwtbOnlyId = []
             // 罗湖样品id列表
             // 罗湖样品id列表
             let lhypIdList = []
             let lhypIdList = []
             // 罗湖样品id格式列表
             // 罗湖样品id格式列表