修改扫码2

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

@@ -359,7 +359,7 @@
                         </el-table-column>
 
 
-                       <el-table-column
+                       <!-- <el-table-column
                           label="报告编制员"
                           width="130px">
                            <template slot-scope="scope">
@@ -371,8 +371,7 @@
                               />
                            </template>
                         </el-table-column>
-                        <!-- 
-                              :multiple="true" -->
+
                         <el-table-column
                           label="报告复核员"
                           width="130px">
@@ -384,7 +383,7 @@
                               store="id"
                             />
                             </template>
-                        </el-table-column>
+                        </el-table-column> -->
 
 
                         <el-table-column

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

@@ -359,7 +359,7 @@
                           </el-table-column>
                          
                          
-                         <el-table-column
+                         <!-- <el-table-column
                             label="报告编制员"
                             width="130px">
                              <template slot-scope="scope">
@@ -383,7 +383,7 @@
                                 store="id"
                               />
                               </template>
-                          </el-table-column>
+                          </el-table-column> -->
                          
                          
                           <el-table-column

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

@@ -139,14 +139,14 @@ export default {
               return;
             }
 
-           if (ypInfoList[yp].bao_gao_bian_zhi_ == undefined || ypInfoList[yp].bao_gao_bian_zhi_ == '') {
-              this_.$message.error('操作失败，[' + ypInfoList[yp].yang_pin_ming_che + '] 报告编制员不能为空!')
-              return;
-            }
-            if (ypInfoList[yp].bao_gao_shen_he_y == undefined || ypInfoList[yp].bao_gao_shen_he_y == '') {
-              this_.$message.error('操作失败，[' + ypInfoList[yp].yang_pin_ming_che + '] 报告审核员不能为空!')
-              return;
-            }
+          //  if (ypInfoList[yp].bao_gao_bian_zhi_ == undefined || ypInfoList[yp].bao_gao_bian_zhi_ == '') {
+          //     this_.$message.error('操作失败，[' + ypInfoList[yp].yang_pin_ming_che + '] 报告编制员不能为空!')
+          //     return;
+          //   }
+          //   if (ypInfoList[yp].bao_gao_shen_he_y == undefined || ypInfoList[yp].bao_gao_shen_he_y == '') {
+          //     this_.$message.error('操作失败，[' + ypInfoList[yp].yang_pin_ming_che + '] 报告审核员不能为空!')
+          //     return;
+          //   }
 
             if (ypInfoList[yp].shi_fou_liu_yang_ == "是") {
               if (ypInfoList[yp].liu_yang_wei_zhi_ == null || ypInfoList[yp].liu_yang_wei_zhi_ == '') {
@@ -321,11 +321,17 @@ export default {
                 如果没有，则记录下委托单ID，以及同索引下的样品表的编制人和审核员
               */
               // let finalWtdIdList = []
+
+/**
+ * 1.11胡老师说不要
+ 
               for(var index = 0; index < ypInfoList.length; index++){
                 if(res[index].bao_gao_bian_zhi_  == '' || res[index].bao_gao_fu_he_yua  == ''){
                  repostCurd('update','{"tableName":"t_lhwtsqb","paramWhere":' + '{"id_":"' + res[index].wtID + '"}' + ',"paramCond":' + '{"bao_gao_bian_zhi_":"'+ypInfoList[index].bao_gao_bian_zhi_+'","bao_gao_fu_he_yua":"' +  ypInfoList[index].bao_gao_shen_he_y + '"}}')
               }
             }
+*/
+
               /*
               let wtdSQL = "select id_,bao_gao_bian_zhi_,bao_gao_fu_he_yua from t_lhwtsqb where id_ in('" + value + "')"
 
@@ -393,8 +399,8 @@ export default {
                          rw["he_tong_id_"] = wtdAndYpb[i].he_tong_id_ //  合同id
                          rw["zhuang_tai_"] = '待任务分配'       //  状态
                          rw["wan_cheng_shi_jia"] = wtdAndYpb[i].song_jian_shi_jia   // 送检日期
-                         rw["bao_gao_bian_zhi_"] = ypInfoList[i].bao_gao_bian_zhi_  // 报告编制人
-                         rw["bao_gao_shen_he_y"] = ypInfoList[i].bao_gao_shen_he_y  // 报告审核人
+                        //  rw["bao_gao_bian_zhi_"] = ypInfoList[i].bao_gao_bian_zhi_  // 报告编制人
+                        //  rw["bao_gao_shen_he_y"] = ypInfoList[i].bao_gao_shen_he_y  // 报告审核人
                          rw["bao_gao_lei_xing_"] = wtdAndYpb[i].bao_gao_lei_xing_   // 报告类型
                          rw["xin_xiang_mu_ming"] = wtdAndYpb[i].xiang_mu_ming_che   // 项目名称
                          rw["zhan_shi_biao_id_"] = wtdAndYpb[i].zhan_shi_biao_id_   // 展示表id

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

@@ -124,14 +124,14 @@ export default {
                 return;
               }
 
-              if (ypInfoList[yp].bao_gao_bian_zhi_ == undefined || ypInfoList[yp].bao_gao_bian_zhi_ == '') {
-                this_.$message.error('操作失败，[' + ypInfoList[yp].yang_pin_ming_che + '] 报告编制员不能为空!')
-                return;
-              }
-              if (ypInfoList[yp].bao_gao_shen_he_y == undefined || ypInfoList[yp].bao_gao_shen_he_y == '') {
-                this_.$message.error('操作失败，[' + ypInfoList[yp].yang_pin_ming_che + '] 报告审核员不能为空!')
-                return;
-              }
+              // if (ypInfoList[yp].bao_gao_bian_zhi_ == undefined || ypInfoList[yp].bao_gao_bian_zhi_ == '') {
+              //   this_.$message.error('操作失败，[' + ypInfoList[yp].yang_pin_ming_che + '] 报告编制员不能为空!')
+              //   return;
+              // }
+              // if (ypInfoList[yp].bao_gao_shen_he_y == undefined || ypInfoList[yp].bao_gao_shen_he_y == '') {
+              //   this_.$message.error('操作失败，[' + ypInfoList[yp].yang_pin_ming_che + '] 报告审核员不能为空!')
+              //   return;
+              // }
 
               if (ypInfoList[yp].shi_fou_liu_yang_ == "是") {
                 if (ypInfoList[yp].liu_yang_wei_zhi_ == null || ypInfoList[yp].liu_yang_wei_zhi_ == '') {
@@ -299,11 +299,13 @@ export default {
                 如果没有，则记录下委托单ID，以及同索引下的样品表的编制人和审核员
               */
               // let finalWtdIdList = []
+
+              /*
               for(var index = 0; index < ypInfoList.length; index++){
                 if(res[index].bao_gao_bian_zhi_  == '' || res[index].bao_gao_fu_he_yua  == ''){
                  repostCurd('update','{"tableName":"t_lhwtsqb","paramWhere":' + '{"id_":"' + res[index].wtID + '"}' + ',"paramCond":' + '{"bao_gao_bian_zhi_":"'+ypInfoList[index].bao_gao_bian_zhi_+'","bao_gao_fu_he_yua":"' +  ypInfoList[index].bao_gao_shen_he_y + '"}}')
               }
-            }
+            }*/
               /*
               let wtdSQL = "select id_,bao_gao_bian_zhi_,bao_gao_fu_he_yua from t_lhwtsqb where id_ in('" + value + "')"
 
@@ -368,8 +370,8 @@ export default {
                          rw["he_tong_id_"] = wtdAndYpb[i].he_tong_id_ //合同id
                          rw["zhuang_tai_"] = '待任务分配'//状态
                          rw["wan_cheng_shi_jia"] = wtdAndYpb[i].song_jian_shi_jia  //送检日期
-                         rw["bao_gao_bian_zhi_"] = ypInfoList[i].bao_gao_bian_zhi_  //报告编制人
-                         rw["bao_gao_shen_he_y"] = ypInfoList[i].bao_gao_shen_he_y  //报告审核人
+                        //  rw["bao_gao_bian_zhi_"] = ypInfoList[i].bao_gao_bian_zhi_  //报告编制人
+                        //  rw["bao_gao_shen_he_y"] = ypInfoList[i].bao_gao_shen_he_y  //报告审核人
                          rw["bao_gao_lei_xing_"] = wtdAndYpb[i].bao_gao_lei_xing_  //报告类型
                          rw["xin_xiang_mu_ming"] = wtdAndYpb[i].xiang_mu_ming_che   //项目名称
                          rw["zhan_shi_biao_id_"] = wtdAndYpb[i].zhan_shi_biao_id_  //展示表id