ZZJ %!s(int64=3) %!d(string=hai) anos
pai
achega
d978c4bdf8

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

@@ -62,7 +62,13 @@
                                     </el-input-number>
                                 </template>
                          </el-table-column>
-                        
+
+                         <el-table-column
+                          prop="fu_kuan_fang_shi_"
+                          label="是否加急"
+                          width="150px">
+                         </el-table-column>
+                         
                          <el-table-column
                           prop="yang_pin_lei_xy_"
                           label="样品类型(一)"

+ 6 - 0
src/views/system/jbdScan/goods/sampleConfirmation.vue

@@ -62,6 +62,12 @@
                                 </template>
                          </el-table-column>
 
+                         <el-table-column
+                          prop="fu_kuan_fang_shi_"
+                          label="是否加急"
+                          width="150px">
+                         </el-table-column>
+                         
                          <el-table-column
                           prop="yang_pin_lei_xy_"
                           label="样品类型(一)"

+ 1 - 1
src/views/system/jbdScan/js/manualConfirmationJS.js

@@ -25,7 +25,7 @@ export default {
       // 扫码扫到新数据,查询 并分页 回填展示
       let countSQL = `select count(*) as count from t_mjypb where jie_yang_zhuang_t = '待确认'`
       let str = (page-1)*10
-      let fysql = `select * from t_mjypb where jie_yang_zhuang_t = '待确认' limit ${str},10`
+      let fysql = `select ypb.*,sqb.fu_kuan_fang_shi_ from t_mjypb ypb  JOIN t_mjwtsqb sqb on ypb.wai_jian_ = sqb.id_ and ypb.jie_yang_zhuang_t = '待确认' limit ${str},10`
       Promise.all([repostCurd('sql', countSQL), repostCurd('sql', fysql)]).then(([res1, res]) => {
         this.listData = []
         this.pageCount = res1.variables.data[0].count

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

@@ -29,9 +29,9 @@ export default {
       // 扫码扫到新数据,查询 回填展示
       if(flag){
          // repostCurd('select','{"tableName": "t_mjypdjb","paramWhere":{"yang_pin_bian_hao":"S220909-1053"}}').then(response => {
-         repostCurd('select','{"tableName": "t_mjypb","paramWhere":{"yang_pin_bian_hao":"' + id + '","jie_yang_zhuang_t":"待确认"}}').then(response => {
+          let sql = `select ypb.*,sqb.fu_kuan_fang_shi_ from t_mjypb ypb  JOIN t_mjwtsqb sqb on ypb.wai_jian_ = sqb.id_ and ypb.jie_yang_zhuang_t = '待确认' and ypb.yang_pin_bian_hao = '${id}'`
+         repostCurd('sql',sql).then(response => {
           if (response.variables.data && response.variables.data.length > 0) {
-              // console.log(response.variables.data[0])
               response.variables.data[0].jie_yang_shu_lian = 1
               this.listData.push(response.variables.data[0])
               this.OriginalPosition.push(response.variables.data[0].shi_fou_liu_yang_ == "是" ? response.variables.data[0].liu_yang_wei_zhi_ : response.variables.data[0].shou_yang_wei_zhi)