Parcourir la source

Merge branch 'master' of http://119.23.210.103:3000/wy/mj_firm_former

cfort il y a 3 ans
Parent
commit
94eefae512

+ 2 - 1
src/layout/header-aside/components/components/float-ball/index.vue

@@ -90,7 +90,8 @@ import { BASE_API,BUSINESS_BASE_URL } from '@/api/baseUrl' //引用导出地址
       });
     },
     created() {
-     this.getDataTimer = setInterval(this.loadData,1000*60*10); //每10分钟获取开始任务
+     //this.getDataTimer = setInterval(this.loadData,1000*60*10); //每10分钟获取开始任务
+     this.getDataTimer = setInterval(this.loadData,10000); //获取开始任务
     },
     /* 销毁定时事件*/
     beforeDestroy() {

+ 7 - 7
src/views/demo/yangPin/yangPinShuJu/EntrustType.vue

@@ -47,18 +47,19 @@ export default {
  },
  methods:{
    //实际收到数据:登记表里面样品类型数据
-   //SELECT a.yang_pin_lei_xing,b.lei_xing_ FROM t_mjypdjb a JOIN t_yplxb  b ON a.yang_pin_lei_xing = b.id_
+   //SELECT a.yang_pin_lei_xing,b.lei_xing_ ,a.shou_yang_shu_lia FROM t_mjypdjb a JOIN t_yplxb  b ON a.yang_pin_lei_xing = b.id_
    getData(){
-     let sql = "select * from t_mjypdjb" 
+     let sql = "select yang_pin_lei_xing ,shou_yang_shu_lia FROM t_mjypdjb" 
      curdPost('sql',sql).then(response => { 
      let data = response.variables.data
-     // console.log('委托类型数据111',data)
+    //  console.log('委托类型数据111',data)
      let dataList = data.map((item)=>({
       
        value:item.shou_yang_shu_lia,
        name:item.yang_pin_lei_xing
      }));
-     // console.log('委托类型数据222',dataList)
+    //  console.log('委托类型数据222',dataList)
+
      this.entrustArray = dataList.reduce((total, cur, index) => {
        let hasValue = total.findIndex(current => {
          return current.name === cur.name;
@@ -67,7 +68,7 @@ export default {
        hasValue !== -1 && (total[hasValue].value = total[hasValue].value + cur.value);
        return total;
      }, []);
-     // console.log('委托类型数333',this.entrustArray)
+    //  console.log('委托类型数333',this.entrustArray)
      }) 
     
    },
@@ -171,14 +172,13 @@ export default {
            labelLine: {
              show: false
            },
-           // data:this.entrustArray,
+          //  data:this.entrustArray,
            data: [
              { value: 48, name: '培养基/细胞上清' },
              { value: 15, name: '培养基/细胞悬液' },
              { value: 35, name: '培养基/细胞上清/细胞悬液' },
              { value: 14, name: '间充质干细胞' },
              { value: 30, name: '细胞悬液,细胞悬液' },
-             {value:1,name:'1017075228309716992'},
              { value:18,name:'培养基/细胞上清,细胞悬液'}
            ]
          }

+ 50 - 56
src/views/platform/bpmn/bpmInstHis/listType/CMAjiancedangan.vue

@@ -9,20 +9,6 @@
         placeholder="请输入内容"
         clearable
       ></el-input>
-      <!-- <span class="t-span">检测申请单号</span
-      ><el-input
-        class="inp"
-        v-model="shenqingdanid"
-        placeholder="请输入内容"
-        clearable
-      ></el-input> -->
-      <!-- <span class="t-span">委托单位</span
-      ><el-input
-        class="inp"
-        v-model="danwei"
-        placeholder="请输入内容"
-        clearable
-      ></el-input> -->
       <span class="t-span">报告编号</span
       ><el-input
         class="inp"
@@ -41,7 +27,6 @@
       :stripe="true"
       style="width: 100%"
       height="75vh"
-      :row-class-name="tableRowClassName"
       :header-cell-style="{
         color: '#000',
         'font-size': '14px',
@@ -49,7 +34,6 @@
         background: '#a7d6f8 !important',
       }"
     >
-      <!-- <el-table-column type="selection" width="55"> </el-table-column> -->
       <el-table-column prop="chu_ju_bao_gao_sh" label="年份" width="80">
         <template slot-scope="scope">
           {{ scope.row.chu_ju_bao_gao_sh | yeare("年") }}
@@ -65,48 +49,44 @@
       <el-table-column prop="jian_ce_kai_shi_s" label="检测时间" width="100">
       </el-table-column>
       <el-table-column
-        prop="jian_ce_shen_qing"
+        prop="wei_tuo_zhan_shi_"
         label="检测委托单号"
         width="180"
       >
+        <template slot-scope="scope">
+          {{ scope.row.wei_tuo_zhan_shi_ | returnweituobianhao(wTBH) }}
+        </template>
       </el-table-column>
-      <!-- <el-table-column prop="wei_tuo_dan_wei_" label="委托单位">
-      </el-table-column> -->
       <el-table-column prop="wei_tuo_ri_qi_" label="委托日期" width="100">
       </el-table-column>
       <el-table-column prop="yang_pin_bian_hao" label="样品编号" width="150">
       </el-table-column>
       <el-table-column prop="yang_pin_ming_che" label="样品名称" width="">
       </el-table-column>
-      <!-- <el-table-column prop="lian_xi_ren_" label="联系人"> </el-table-column>
-      <el-table-column prop="lian_xi_dian_hua_" label="联系电话"></el-table-column> -->
-      <!-- <el-table-column prop="lei_bie_qu_fen_yu" label="类别">
-        <template slot-scope="scope">
-          {{ scope.row.lei_bie_qu_fen_yu.toUpperCase() }}
-        </template>
-      </el-table-column> -->
-      <!-- <el-table-column width="180"> </el-table-column> -->
       <el-table-column label="操作" align="left" width="100">
         <template slot-scope="scope">
           <el-popover placement="left" width="200" trigger="click">
             <div slot="reference" class="more">
               <i class="el-icon-caret-bottom"></i>查阅
             </div>
-            <!-- <div class="item" style="color: #85ce61">
-              <i class="el-icon-s-order"></i> 合同
-            </div> -->
-
             <div
               class="item"
               style="color: #85ce61"
-              @click="alertReport(reports.jianceshenqingdan, scope.row.id_)"
+              @click="
+                alertReport(
+                  reports.jianceshenqingdan,
+                  scope.row.jian_ce_shen_qing
+                )
+              "
             >
               <i class="el-icon-s-order"></i> 检测委托单
             </div>
             <div
               class="item"
               style="color: #85ce61"
-              @click="alertReport(reports.hetongpingshen, scope.row.id_)"
+              @click="
+                alertReport(reports.hetongpingshen, scope.row.jian_ce_shen_qing)
+              "
             >
               <i class="el-icon-s-order"></i> 合同评审
             </div>
@@ -161,13 +141,6 @@
                 </div>
               </el-popover>
             </div>
-            <!-- <div
-              class="item"
-              style="color: #85ce61"
-              @click="alertReport(reports.yubaogao, scope.row.id_)"
-            >
-              <i class="el-icon-s-order"></i> 预报告
-            </div> -->
             <div
               class="item"
               style="color: #85ce61"
@@ -226,7 +199,7 @@ export default {
       reports: {
         hetong: "",
         hetongpingshen: "42明鉴/吴/MJT-QP-7.1-01-R02合同评审表.rpx",
-        jianceshenqingdan: "42明鉴/吴/MJT-QP-7.1-01-R03 检测委托单.rpx",
+        jianceshenqingdan: "42明鉴/MJT-QP-7-01-R03 检测委托单.rpx",
         jianceyuanshijilu: "",
         baogaoshenpibiao: "42明鉴/吴/检测报告审批表.rpx",
         yubaogao: "42明鉴/吴/明鉴细胞专业技术检测预报告.rpx",
@@ -241,6 +214,7 @@ export default {
       yubaogaoitem: [],
       hetong: [],
       triggerType: "click",
+      wTBH:[],
     };
   },
   filters: {
@@ -250,10 +224,22 @@ export default {
           return arr[i].he_tong_bian_hao_;
         }
       }
+    },
+       returnweituobianhao(value, arr) {
+      for (var i = 0; i < arr.length; i++) {
+        if (arr[i] != null && arr[i] != undefined) {
+          console.log(arr[i].shen_qing_id_==value)
+          if (arr[i].shen_qing_id_ == value) {
+            console.log(arr,arr[i].wei_tuo_bian_hao_ );
+            return arr[i].wei_tuo_bian_hao_;
+          }
+        }
+        
+      }
     },
     yeare(value, dedal) {
       if (value == undefined || value == null || value == "") {
-        return ""
+        return "";
       }
       if (dedal == "年") {
         return value.split("-")[0];
@@ -267,11 +253,7 @@ export default {
   created() {
     let sql =
       "select * from t_mjjcbg WHERE shi_fou_yu_bao_ga='否' and lei_bie_qu_fen_yu ='cnas/CMA' and zhuang_tai_ = '报告待发放' or  zhuang_tai_ = '已完成'  ORDER BY create_time_ DESC limit 0,20";
-      console.log(sql)
     this.loadData(sql);
-    // curdPost("sql", sql).then((response) => {
-    //   this.tableData = response.variables.data;
-    // });
     let sumsql =
       "select COUNT(*) AS sum  FROM t_mjjcbg WHERE shi_fou_yu_bao_ga='否' and lei_bie_qu_fen_yu ='cnas/CMA' and zhuang_tai_ ='报告待发放' or  zhuang_tai_ = '已完成'";
     curdPost("sql", sumsql).then((response) => {
@@ -279,11 +261,11 @@ export default {
     });
   },
   methods: {
-    // 请求表格数据函数
-    loadData(sql) {
+   async loadData(sql) {
+      // 请求表格数据函数
       let this_ = this;
       this.listData = [];
-      curdPost("sql", sql).then((res) => {
+     await curdPost("sql", sql).then((res) => {
         this_.tableData = res.variables.data;
         if (this_.tableData.length > 0) {
           this.hetongidFn(this_.tableData);
@@ -291,6 +273,16 @@ export default {
           this_.tableData = [];
         }
       });
+            for (let i = 0; i < this.tableData.length; i++) {
+        let sql =
+          "select wei_tuo_bian_hao_,shen_qing_id_ FROM t_mjwtzsb WHERE shen_qing_id_ ='" +
+          this.tableData[i].wei_tuo_zhan_shi_ +
+          "'";
+        await curdPost("sql", sql).then((res) => {
+          let data = res.variables.data;
+          this_.wTBH.push(data[0]);
+        });
+      }
     },
     hetongidFn(bianhaoArr) {
       var sqlStr = "";
@@ -355,6 +347,8 @@ export default {
       });
     },
     yuReports(url, id) {
+      debugger;
+      console.log(id, "检测委托单id");
       this.alertReport(url, id);
     },
     formEvent(itemName) {
@@ -467,8 +461,8 @@ export default {
         );
       }
     },
-    // pin凑sql
     selectSplit() {
+      // pin凑sql
       var q1, q2, q3;
       if (this.nianfen) {
         q1 = "chu_ju_bao_gao_sh like'" + "%" + this.nianfen + "%" + "' ";
@@ -533,12 +527,12 @@ export default {
   width: 100%;
   font-size: 18px;
 }
-// .tableRowClassName {
-//   backface-visibility: #d9eefd;
-// }
-// .el-table .warning-row {
-//   background: #d9eefd;
-// }
+.tableRowClassName {
+  backface-visibility: #d9eefd;
+}
+.el-table .warning-row {
+  background: #d9eefd;
+}
 .el-table--striped .el-table__body tr.el-table__row--striped td.el-table__cell {
   background: #d9eefd;
 }

+ 64 - 81
src/views/platform/bpmn/bpmInstHis/listType/CNASjiancedangan.vue

@@ -9,20 +9,6 @@
         placeholder="请输入内容"
         clearable
       ></el-input>
-      <!-- <span class="t-span">检测申请单号</span
-      ><el-input
-        class="inp"
-        v-model="shenqingdanid"
-        placeholder="请输入内容"
-        clearable
-      ></el-input> -->
-      <!-- <span class="t-span">委托单位</span
-      ><el-input
-        class="inp"
-        v-model="danwei"
-        placeholder="请输入内容"
-        clearable
-      ></el-input> -->
       <span class="t-span">报告编号</span
       ><el-input
         class="inp"
@@ -40,8 +26,6 @@
       border
       :stripe="true"
       style="width: 100%"
-      height="75vh"
-      :row-class-name="tableRowClassName"
       :header-cell-style="{
         color: '#000',
         'font-size': '14px',
@@ -49,7 +33,6 @@
         background: '#a7d6f8 !important',
       }"
     >
-      <!-- <el-table-column type="selection" width="55"> </el-table-column> -->
       <el-table-column prop="chu_ju_bao_gao_sh" label="年份" width="80">
         <template slot-scope="scope">
           {{ scope.row.chu_ju_bao_gao_sh | yeare("年") }}
@@ -65,50 +48,44 @@
       <el-table-column prop="jian_ce_kai_shi_s" label="检测时间" width="100">
       </el-table-column>
       <el-table-column
-        prop="jian_ce_shen_qing"
+        prop="wei_tuo_zhan_shi_"
         label="检测委托单号"
         width="180"
       >
+        <template slot-scope="scope">
+          {{ scope.row.wei_tuo_zhan_shi_ | returnweituobianhao(wTBH) }}
+        </template>
       </el-table-column>
-      <!-- <el-table-column prop="wei_tuo_dan_wei_" label="委托单位">
-      </el-table-column> -->
       <el-table-column prop="wei_tuo_ri_qi_" label="委托日期" width="100">
       </el-table-column>
       <el-table-column prop="yang_pin_bian_hao" label="样品编号" width="150">
       </el-table-column>
       <el-table-column prop="yang_pin_ming_che" label="样品名称" width="">
       </el-table-column>
-
-      <!-- <el-table-column prop="lian_xi_ren_" label="联系人">
-      </el-table-column>
-      <el-table-column prop="lian_xi_dian_hua_" label="联系电话">
-      </el-table-column> -->
-      <!-- <el-table-column prop="lei_bie_qu_fen_yu" label="类别">
-         <template slot-scope="scope">
-           {{scope.row.lei_bie_qu_fen_yu.toUpperCase()}}
-         </template>
-      </el-table-column> -->
-      <el-table-column label="操作" align="left" width="100"  >
+      <el-table-column label="操作" align="left" width="100">
         <template slot-scope="scope">
           <el-popover placement="left" width="150" trigger="click">
             <div slot="reference" class="more">
               <i class="el-icon-caret-bottom"></i>查阅
             </div>
-            <!-- <div class="item" style="color: #85ce61">
-              <i class="el-icon-s-order"></i> 合同
-            </div> -->
-
             <div
               class="item"
               style="color: #85ce61"
-              @click="alertReport(reports.jianceshenqingdan, scope.row.id_)"
+              @click="
+                alertReport(
+                  reports.jianceshenqingdan,
+                  scope.row.jian_ce_shen_qing
+                )
+              "
             >
               <i class="el-icon-s-order"></i> 检测委托单
             </div>
             <div
               class="item"
               style="color: #85ce61"
-              @click="reports.hetongpingshen, scope.row"
+              @click="
+                alertReport(reports.hetongpingshen, scope.row.jian_ce_shen_qing)
+              "
             >
               <i class="el-icon-s-order"></i> 合同评审
             </div>
@@ -156,20 +133,13 @@
                     style="color: #85ce61; cursor: pointer"
                     v-for="it in yubaogaoitem"
                     :key="it.id_"
-                    @click="yuReports(reports.yubaogao,it.id)"
+                    @click="yuReports(reports.yubaogao, it.id)"
                   >
-                  {{ it.jian_ce_xiang_mu_ }}预报告记录
+                    {{ it.jian_ce_xiang_mu_ }}预报告记录
                   </div>
                 </div>
               </el-popover>
             </div>
-            <!-- <div
-              class="item"
-              style="color: #85ce61"
-              @click="juTiItem(scope.row)"
-            >
-              <i class="el-icon-s-order"></i> 预报告
-            </div> -->
             <div
               class="item"
               style="color: #85ce61"
@@ -228,14 +198,14 @@ export default {
       reports: {
         hetong: "",
         hetongpingshen: "42明鉴/吴/MJT-QP-7.1-01-R02合同评审表.rpx",
-        jianceshenqingdan: "42明鉴/吴/MJT-QP-7.1-01-R03 检测委托单.rpx",
+        jianceshenqingdan: "42明鉴/MJT-QP-7-01-R03 检测委托单.rpx",
         jianceyuanshijilu: "",
         baogaoshenpibiao: "42明鉴/吴/检测报告审批表.rpx",
         yubaogao: "42明鉴/吴/明鉴细胞专业技术检测预报告.rpx",
         jiancebaogao: "42明鉴/吴/明鉴细胞专业技术检测报告.rpx",
       },
       shenqingdanid: "",
-      nianfen:'',
+      nianfen: "",
       danwei: "",
       bianhao: "",
       tableData: [],
@@ -243,6 +213,7 @@ export default {
       yubaogaoitm: [],
       hetong: [],
       triggerType: "click",
+      wTBH: [],
     };
   },
   filters: {
@@ -253,26 +224,36 @@ export default {
         }
       }
     },
-    yeare(value,dedal){
-      if(value ==undefined || value ==null || undefined ==""){
-        return ""
+   returnweituobianhao(value, arr) {
+      for (var i = 0; i < arr.length; i++) {
+        if (arr[i] != null && arr[i] != undefined) {
+          console.log(arr[i].shen_qing_id_==value)
+          if (arr[i].shen_qing_id_ == value) {
+            console.log(arr,arr[i].wei_tuo_bian_hao_ );
+            return arr[i].wei_tuo_bian_hao_;
+          }
+        }
+        
+      }
+    },
+    yeare(value, dedal) {
+      if (value == undefined || value == null || undefined == "") {
+        return "";
       }
-      if(dedal=="年"){
-        return value.split("-")[0]
-      }else if(dedal=="月"){
-        return value.split("-")[0] + value.split("-")[1]
-      }else{
-        value
+      if (dedal == "年") {
+        return value.split("-")[0];
+      } else if (dedal == "月") {
+        return value.split("-")[0] + value.split("-")[1];
+      } else {
+        value;
       }
-    }
+    },
   },
   created() {
     let sql =
       "select * from t_mjjcbg WHERE shi_fou_yu_bao_ga='否' and lei_bie_qu_fen_yu ='cnas' and zhuang_tai_ ='报告待发放' or  zhuang_tai_ = '已完成' ORDER BY create_time_ DESC limit 0,20";
     this.loadData(sql);
-    // curdPost("sql", sql).then((response) => {
-    //   this.tableData = response.variables.data;
-    // });
+
     let sumsql =
       "select COUNT(*) AS sum  FROM t_mjjcbg WHERE shi_fou_yu_bao_ga='否' and lei_bie_qu_fen_yu ='cnas' and zhuang_tai_ ='报告待发放' or  zhuang_tai_ = '已完成'";
     curdPost("sql", sumsql).then((response) => {
@@ -281,10 +262,10 @@ export default {
   },
   methods: {
     // 请求表格数据函数
-    loadData(sql) {
+    async loadData(sql) {
       let this_ = this;
       this.listData = [];
-      curdPost("sql", sql).then((res) => {
+      await curdPost("sql", sql).then((res) => {
         this_.tableData = res.variables.data;
         if (this_.tableData.length > 0) {
           this.hetongidFn(this_.tableData);
@@ -292,6 +273,16 @@ export default {
           this_.tableData = [];
         }
       });
+      for (let i = 0; i < this.tableData.length; i++) {
+        let sql =
+          "select wei_tuo_bian_hao_,shen_qing_id_ FROM t_mjwtzsb WHERE shen_qing_id_ ='" +
+          this.tableData[i].wei_tuo_zhan_shi_ +
+          "'";
+        await curdPost("sql", sql).then((res) => {
+          let data = res.variables.data;
+          this_.wTBH.push(data[0]);
+        });
+      }
     },
     hetongidFn(bianhaoArr) {
       var sqlStr = "";
@@ -343,7 +334,7 @@ export default {
         curdPost("sql", itemSql).then((res) => {
           this_.itemInfo = res.variables.data;
           for (var i = 0; i++; i < this_itemInfo) {
-            if (this_itemInfo[i].shi_fou_yu_bao_ga=="是") {
+            if (this_itemInfo[i].shi_fou_yu_bao_ga == "是") {
               this_.yubaogaoitem.push(it);
             }
           }
@@ -355,11 +346,9 @@ export default {
         });
       });
     },
-    yuReports(url,id){
-      this.alertReport(
-         url,
-         id
-    );
+    yuReports(url, id) {
+      console.log(url, id);
+      this.alertReport(url, id);
     },
     formEvent(itemName) {
       if (itemName.includes("pH检测")) {
@@ -471,14 +460,12 @@ export default {
         );
       }
     },
-    isYubaogao(value, row) {
-      
-    },
+    isYubaogao(value, row) {},
     // pin凑sql
     selectSplit() {
       var q1, q2, q3;
       if (this.nianfen) {
-        q1 = "chu_ju_bao_gao_sh like'" +"%" + this.nianfen + "%" + "' ";
+        q1 = "chu_ju_bao_gao_sh like'" + "%" + this.nianfen + "%" + "' ";
       }
       if (this.danwei) {
         q2 = "wei_tuo_dan_wei_  = '" + this.danwei + "' ";
@@ -515,13 +502,15 @@ export default {
     handleSizeChange(value) {
       this.currentPage4 = 1;
       let sql =
-        "select * from t_mjjcbg WHERE shi_fou_yu_bao_ga='否' and lei_bie_qu_fen_yu ='cnas' and zhuang_tai_ ='报告待发放' or  zhuang_tai_ = '已完成' ORDER BY create_time_ DESC limit 0,"+value;
+        "select * from t_mjjcbg WHERE shi_fou_yu_bao_ga='否' and lei_bie_qu_fen_yu ='cnas' and zhuang_tai_ ='报告待发放' or  zhuang_tai_ = '已完成' ORDER BY create_time_ DESC limit 0," +
+        value;
       this.loadData(sql);
     },
     handleCurrentChange(value) {
       let sql =
         "select * from t_mjjcbg WHERE shi_fou_yu_bao_ga='否' and lei_bie_qu_fen_yu ='cnas' and zhuang_tai_ ='报告待发放' or  zhuang_tai_ = '已完成' ORDER BY create_time_ DESC limit " +
-        value +", 20";
+        value +
+        ", 20";
       this.loadData(sql);
     },
   },
@@ -538,12 +527,6 @@ export default {
   width: 100%;
   font-size: 18px;
 }
-// .tableRowClassName {
-//   backface-visibility: #d9eefd;
-// }
-// .el-table .warning-row {
-//   background: #d9eefd;
-// }
 .el-table--striped .el-table__body tr.el-table__row--striped td.el-table__cell {
   background: #d9eefd;
 }

+ 38 - 40
src/views/platform/bpmn/bpmInstHis/listType/feijiancedangan.vue

@@ -10,21 +10,6 @@
         clearable
       >
       </el-input>
-      <!-- <span class="t-span">检测委托单号</span
-      ><el-input
-        class="inp"
-        v-model="shenqingdanid"
-        placeholder="请输入内容"
-        clearable
-      >
-      </el-input> -->
-      <!-- <span class="t-span">委托单位</span
-      ><el-input
-        class="inp"
-        v-model="danwei"
-        placeholder="请输入内容"
-        clearable
-      ></el-input> -->
       <span class="t-span">报告编号</span
       ><el-input
         class="inp"
@@ -51,7 +36,6 @@
         background: '#a7d6f8 !important',
       }"
     >
-      <!-- <el-table-column type="selection" width="55"> </el-table-column> -->
       <el-table-column prop="chu_ju_bao_gao_sh" label="年份" width="80">
         <template slot-scope="scope">
           {{ scope.row.chu_ju_bao_gao_sh | yeare("年") }}
@@ -67,49 +51,44 @@
       <el-table-column prop="jian_ce_kai_shi_s" label="检测时间" width="120">
       </el-table-column>
       <el-table-column
-        prop="jian_ce_shen_qing"
+        prop="wei_tuo_zhan_shi_"
         label="检测委托单号"
         width="180"
       >
+        <template slot-scope="scope">
+          {{ scope.row.wei_tuo_zhan_shi_ | returnweituobianhao(wTBH) }}
+        </template>
       </el-table-column>
-      <!-- <el-table-column prop="wei_tuo_dan_wei_" label="委托单位">
-      </el-table-column> -->
       <el-table-column prop="wei_tuo_ri_qi_" label="委托日期" width="120">
       </el-table-column>
       <el-table-column prop="yang_pin_bian_hao" label="样品编号" width="150">
       </el-table-column>
       <el-table-column prop="yang_pin_ming_che" label="样品名称" width="">
       </el-table-column>
-      <!-- <el-table-column prop="lian_xi_ren_" label="联系人">
-      </el-table-column>
-      <el-table-column prop="lian_xi_dian_hua_" label="联系电话">
-      </el-table-column> -->
-      <!-- <el-table-column prop="lei_bie_qu_fen_yu" label="类别">
-         <template slot-scope="scope">
-           {{scope.row.lei_bie_qu_fen_yu}}CNAS/CMA
-         </template>
-      </el-table-column> -->
       <el-table-column label="操作" align="left" width="100">
         <template slot-scope="scope">
           <el-popover placement="left" width="200" trigger="click">
             <div slot="reference" class="more">
               <i class="el-icon-caret-bottom"></i>查阅
             </div>
-            <!-- <div class="item" style="color: #85ce61">
-              <i class="el-icon-s-order"></i> 合同
-            </div> -->
-
             <div
               class="item"
               style="color: #85ce61"
-              @click="alertReport(reports.jianceshenqingdan, scope.row.id_)"
+              @click="
+                alertReport(
+                  reports.jianceshenqingdan,
+                  scope.row.jian_ce_shen_qing
+                )
+              "
             >
               <i class="el-icon-s-order"></i> 检测委托单
             </div>
             <div
               class="item"
               style="color: #85ce61"
-              @click="alertReport(reports.hetongpingshen, scope.row.id_)"
+              @click="
+                alertReport(reports.hetongpingshen, scope.row.jian_ce_shen_qing)
+              "
             >
               <i class="el-icon-s-order"></i> 合同评审
             </div>
@@ -164,9 +143,6 @@
                 </div>
               </el-popover>
             </div>
-            <!-- <div class="item" style="color: #85ce61" @click="alertReport(reports.yubaogao, scope.row.id_)">
-              <i class="el-icon-s-order"></i> 预报告
-            </div> -->
             <div
               class="item"
               style="color: #85ce61"
@@ -224,7 +200,7 @@ export default {
       reports: {
         hetong: "",
         hetongpingshen: "42明鉴/吴/MJT-QP-7.1-01-R02合同评审表.rpx",
-        jianceshenqingdan: "42明鉴/吴/MJT-QP-7.1-01-R03 检测委托单.rpx",
+        jianceshenqingdan: "42明鉴/MJT-QP-7-01-R03 检测委托单.rpx",
         jianceyuanshijilu: "",
         baogaoshenpibiao: "42明鉴/吴/检测报告审批表.rpx",
         yubaogao: "42明鉴/吴/明鉴细胞专业技术检测预报告.rpx",
@@ -239,6 +215,7 @@ export default {
       yubaogaoitem: [],
       hetong: [],
       triggerType: "click",
+      wTBH: [],
     };
   },
   mixins: [GetReport],
@@ -250,6 +227,17 @@ export default {
         }
       }
     },
+    returnweituobianhao(value, arr) {
+      for (var i = 0; i < arr.length; i++) {
+        if (arr[i] != null && arr[i] != undefined) {
+          console.log(arr[i].shen_qing_id_ == value);
+          if (arr[i].shen_qing_id_ == value) {
+            console.log(arr, arr[i].wei_tuo_bian_hao_);
+            return arr[i].wei_tuo_bian_hao_;
+          }
+        }
+      }
+    },
     yeare(value, dedal) {
       if (value == undefined || value == null || value == "") {
         return "";
@@ -279,10 +267,10 @@ export default {
   },
   methods: {
     // 请求表格数据函数
-    loadData(sql) {
+    async loadData(sql) {
       let this_ = this;
       this.listData = [];
-      curdPost("sql", sql).then((res) => {
+      await curdPost("sql", sql).then((res) => {
         this_.tableData = res.variables.data;
         if (this_.tableData.length > 0) {
           this.hetongidFn(this_.tableData);
@@ -290,6 +278,16 @@ export default {
           this_.tableData = [];
         }
       });
+      for (let i = 0; i < this.tableData.length; i++) {
+        let sql =
+          "select wei_tuo_bian_hao_,shen_qing_id_ FROM t_mjwtzsb WHERE shen_qing_id_ ='" +
+          this.tableData[i].wei_tuo_zhan_shi_ +
+          "'";
+        await curdPost("sql", sql).then((res) => {
+          let data = res.variables.data;
+          this_.wTBH.push(data[0]);
+        });
+      }
     },
     hetongidFn(bianhaoArr) {
       var sqlStr = "";

+ 310 - 0
src/views/sample/goodsSelect.vue

@@ -0,0 +1,310 @@
+<template>
+  <div>
+    <div class="heads">供应商供货查询</div>
+    <div class="top-box">
+      <span class="t-span">供应商:</span>
+      <el-select v-model="quyu" placeholder="请选择" filterable clearable style="width:300px;">
+        <el-option
+          v-for="item in options"
+          :key="item.id_"
+          :label="item.gong_ying_shang_m"
+          :value="item.id_"
+        >
+        </el-option>
+      </el-select>
+      <el-button class="btn" type="primary" @click="query">
+        <i class="ibps-icon-search"></i>查询
+      </el-button>
+    </div>
+    <el-table
+      :data="tableData"
+      :stripe="true"
+      style="width: 100%"
+      height="70vh"
+      v-loading="loading"
+      :header-cell-style="{
+        color: '#000',
+        'font-size': '14px',
+        padding: '6px 6px',
+        background: '#a7d6f8 !important',
+      }"
+    >
+      <el-table-column
+        prop="wu_liao_ming_chen"
+        label="物料名称"
+        width="200"
+      ></el-table-column>
+      <el-table-column prop="wu_liao_bian_ma_" label="物料编码" width="100">
+        <template slot-scope="scope">
+          {{ scope.row.wu_liao_bian_ma_ }}
+        </template>
+      </el-table-column>
+      <el-table-column prop="wu_liao_bian_ma_" label="供应商" width="200">
+        <template slot-scope="scope">
+          {{ scope.row.wu_liao_bian_ma_ | gysfilter(gysList) }}
+        </template>
+      </el-table-column>
+      <el-table-column prop="pi_hao_" label="批号" width="120">
+        <template slot-scope="scope">
+          {{ scope.row.pi_hao_ }}
+        </template>
+      </el-table-column>
+      <el-table-column prop="huo_hao_" label="货号" width="120">
+        <template slot-scope="scope">
+          {{ scope.row.huo_hao_ }}
+        </template>
+      </el-table-column>
+      <el-table-column prop="gui_ge_xing_hao_" label="规格型号" width="120">
+        <template slot-scope="scope">
+          {{ scope.row.gui_ge_xing_hao_ }}
+        </template>
+      </el-table-column>
+      <el-table-column prop="shu_liang_" label="数量" width="80">
+        <template slot-scope="scope">
+          {{ scope.row.shu_liang_ }}
+        </template>
+      </el-table-column>
+      <el-table-column prop="shu_liang_" label="入库时间" width="">
+        <template slot-scope="scope">
+          {{ scope.row.wu_liao_bian_ma_|dhsjFilter(inkuList,scope.row.ru_ku_shi_jian_A_)}}
+        </template>
+      </el-table-column>
+      <!-- <el-table-column prop="t2" label="t2" width="65">
+        <template slot-scope="scope">
+          {{ scope.row.huo_hao_ }}
+        </template>
+      </el-table-column> -->
+    </el-table>
+    <div class="block">
+      <el-pagination
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+        :current-page="currentPage4"
+        :page-sizes="[10, 15, 25, 50]"
+        :page-size="10"
+        layout="total, sizes, prev, pager, next, jumper"
+        :total="numtotal"
+      >
+      </el-pagination>
+    </div>
+  </div>
+</template>
+
+<script>
+import curdPost from "@/business/platform/form/utils/custom/joinCURD.js";
+let jsSql = `select id_ as wai_jian_, wu_liao_ming_chen,wu_liao_dai_ma_ AS wu_liao_bian_ma_,gong_ying_shang_ as gong_ying_shang_A,dao_ku_ri_qi_ as ru_ku_shi_jian_A_,pi_hao_,huo_hao_,gui_ge_ AS gui_ge_xing_hao_,dao_huo_shu_liang AS shu_liang_,create_time_ FROM t_wljsysjlb ORDER BY create_time_ DESC LIMIT `;
+let cgSql = `select wai_jian_, wu_liao_ming_chen,wu_liao_bian_ma_,gong_ying_shang_A,ru_ku_shi_jian_A_,pi_hao_,huo_hao_,gui_ge_xing_hao_,shu_liang_,create_time_ FROM t_cgysjlb UNION ALL `;
+export default {
+  data() {
+    return {
+      tableData: [],
+      quyu: "",
+      riqi: "",
+      currentPage4: 0,
+      currentPage: 1,
+      limit: "10",
+      numtotal: "",
+      currentSql: "",
+      countSql: "",
+      options: [],
+      gysList: [],
+      loading: true,
+      inkuList: [],
+    };
+  },
+  //yszb
+  created() {
+    let this_ = this;
+    let sql = cgSql + jsSql + this.limit;
+    this.currentSql = sql;
+    this.loadData(sql);
+    this.allLength();
+    let gysSql =
+      "select id_,gong_ying_shang_m FROM t_gysml where gong_ying_shang_l ='设备、物料供应商'";
+    curdPost("sql", gysSql).then((res) => {
+      let data = res.variables.data;
+      this_.options = data;
+    });
+  },
+  filters: {
+    gysfilter: function (value, arr) {
+      for (let i = 0; i < arr.length; i++) {
+        if (arr[i].wu_liao_bian_ma_ == value) {
+          return arr[i].gong_ying_shang_m;
+        }
+      }
+    },
+    dhsjFilter: function (value, arr,shijian) {
+      if(shijian){
+        return shijian;
+      }
+      for (let i = 0; i < arr.length; i++) {
+        if (arr[i].wu_liao_bian_ma_ == value) {
+          return arr[i].ru_ku_shi_jian_A_;
+        }
+      }
+    },
+    fmtDate: function (obj) {
+      var date = new Date(obj);
+      var y = 1900 + date.getYear();
+      var m = "0" + (date.getMonth() + 1);
+      var d = "0" + date.getDate();
+      var h = date.getHours();
+      var min = date.getMinutes();
+      var s = date.getMinutes();
+      return (
+        y +
+        "-" +
+        m.substring(m.length - 2, m.length) +
+        "-" +
+        d.substring(d.length - 2, d.length) +
+        "  " +
+        h +
+        ":" +
+        min +
+        ":" +
+        s
+      );
+    },
+  },
+  methods: {
+    allLength() {
+      let this_ = this;
+      let sql1 =
+        "select COUNT(*) AS COUNT FROM t_cgysjlb UNION ALL SELECT COUNT(*) AS COUNT FROM t_wljsysjlb ";
+      curdPost("sql", sql1).then((res) => {
+        let data = res.variables.data;
+        this_.numtotal = data[0].COUNT + data[1].COUNT;
+      });
+    },
+    async loadData(sql) {
+      // 请求表格数据函数
+      let this_ = this;
+      let data = [];
+      let obj = {};
+      let obj1={};
+      this.listData = [];
+      this_.gysLis = [];
+      await curdPost("sql", sql).then((res) => {
+        this_.tableData = res.variables.data;
+        data = this_.tableData;
+      });
+      for (let i = 0; i < data.length; i++) {
+        obj = {};
+        obj1={};
+        if (data[i].gong_ying_shang_m) {
+          // this_.jsgys(data[i].gong_ying_shang_m);
+          let sql1 = `select  gong_ying_shang_m FROM t_gysml where id_= '${data[i].gong_ying_shang_m}'`;
+          await curdPost("sql", sql1).then((res) => {
+            let data1 = res.variables.data;
+            if (data1.length > 0) {
+              obj.wu_liao_bian_ma_ = data[i].wu_liao_bian_ma_;
+              obj.gong_ying_shang_m = data1[0].gong_ying_shang_m || 0;
+              this_.gysList.push(obj);
+            }
+          });
+        } else {
+          // this_.cggys(data[i].wai_jian_);
+          let sql = `select gong_ying_shang_m FROM t_gysml where id_=(SELECT gong_ying_shang_ FROM t_yszb WHERE id_ = '${data[i].wai_jian_}')`;
+          await curdPost("sql", sql).then((res) => {
+            let data2 = res.variables.data;
+            if (data2.length > 0) {
+              obj.wu_liao_bian_ma_ = data[i].wu_liao_bian_ma_;
+              obj.gong_ying_shang_m = data2[0].gong_ying_shang_m || 0;
+              this_.gysList.push(obj);
+            }
+          });
+          let sql3 = `select dao_huo_ri_qi_ FROM t_yszb where id_='${data[i].wai_jian_}'`;
+          await curdPost("sql", sql3).then((res) => {
+            let data3 = res.variables.data;
+            if (data3.length > 0) {
+              obj1.wu_liao_bian_ma_ = data[i].wu_liao_bian_ma_;
+              obj1.ru_ku_shi_jian_A_ = data3[0].dao_huo_ri_qi_ || 0;
+              this_.inkuList.push(obj1);
+            }
+          });
+        }
+      }
+      setTimeout(() => {
+        this_.loading = false;
+      }, 200);
+    },
+    countLength(sql) {
+      let this_ = this;
+      curdPost("sql", sql).then((res) => {
+        let data = res.variables.data;
+        this_.numtotal = data[0].COUNT;
+      });
+    },
+    filter() {
+      let quyu = this.quyu;
+      let sql = "";
+      let this_ = this;
+      let sql1 = `select wu_liao_ming_chen,wu_liao_bian_ma_,gong_ying_shang_A,pi_hao_,huo_hao_,gui_ge_xing_hao_,shu_liang_,wai_jian_,create_time_ FROM t_cgysjlb WHERE wai_jian_ IN ((select id_ FROM t_yszb WHERE (ding_dan_lei_xing !='换货单/常规' OR ding_dan_lei_xing !='换货单/技术') AND shi_fou_guo_shen_='1' AND gong_ying_shang_ ='${quyu}')) UNION ALL select wu_liao_ming_chen,wu_liao_dai_ma_ AS wu_liao_bian_ma_,gong_ying_shang_ asgong_ying_shang_A,pi_hao_,huo_hao_,gui_ge_ AS gui_ge_xing_hao_,dao_huo_shu_liang AS shu_liang_,id_ AS wai_jian_,create_time_ FROM t_wljsysjlb WHERE gong_ying_shang_ ='${quyu}' ORDER BY create_time_ DESC`;
+      let sql2 = `select COUNT(*) AS COUNT FROM t_cgysjlb WHERE wai_jian_ IN ((select id_ FROM t_yszb WHERE (ding_dan_lei_xing !='换货单/常规' OR ding_dan_lei_xing !='换货单/技术') AND shi_fou_guo_shen_='1' AND gong_ying_shang_ ='${quyu}')) UNION ALL select COUNT(*) AS COUNT FROM t_wljsysjlb WHERE gong_ying_shang_ ='${quyu}'`;
+      if (quyu) {
+        sql = sql1;
+        curdPost("sql", sql2).then((res) => {
+          let data = res.variables.data;
+          this_.numtotal = data[0].COUNT + data[1].COUNT;
+        });
+      } else {
+        this_.allLength();
+        sql = cgSql + jsSql + this.limit;
+      }
+      return sql;
+    },
+    query() {
+      let sql = this.filter();
+      //   this.currentSql = sql;
+      this.loadData(sql);
+    },
+    handleSizeChange(val) {
+      this.limit = val;
+      let splitone = this.currentSql.split("LIMIT");
+      console.log(this.currentPage,val)
+      let sql = cgSql + jsSql + this.currentPage + "," + val;
+      this.currentSql = splitone[0] + "LIMIT " + val;
+      this.loadData(sql);
+    },
+    handleCurrentChange(val) {
+      this.currentPage = parseInt(val);
+      let splitone = this.currentSql.split("LIMIT");
+      console.log(splitone[1],val)
+      let sql = cgSql + jsSql + ((val-1)*splitone[1]) + "," + splitone[1];
+      this.loadData(sql);
+    },
+  },
+};
+</script>
+<style lang="scss">
+.tableRowClassName {
+  backface-visibility: #d9eefd;
+}
+.heads {
+  margin-top: 5px;
+  width: 100%;
+  text-align: center;
+  font-weight: 700;
+  background-color: #f9ffff;
+  width: 100%;
+  font-size: 18px;
+}
+.el-table--striped .el-table__body tr.el-table__row--striped td.el-table__cell {
+  background: #d9eefd;
+}
+.more,
+.item {
+  cursor: pointer;
+}
+.more {
+  color: #409eff;
+}
+.el-dropdown-link {
+  cursor: pointer;
+  color: #409eff;
+}
+.el-icon-arrow-down {
+  font-size: 12px;
+}
+</style>

+ 7 - 6
src/views/system/jbdScan/goods/neishenzhuangtai.vue

@@ -37,7 +37,7 @@
                   "
                 >
                   <span class="step-num" >
-                    <!-- <i class="el-icon-arrow-right icon"></i> -->
+                    <i class="el-icon-caret-right icon" v-if="index!=0"></i>
                     <p cla>{{ i.title }}</p>
                     <!-- <span class="num">{{ i.stepIndex }}</span> -->
                   </span>
@@ -220,7 +220,7 @@ export default {
       stepList: [
         {
           stepIndex: 5,
-          title: "内审开始",
+          title: "内审实施计划编制",
         },
         {
           stepIndex: 15,
@@ -232,7 +232,7 @@ export default {
         },
         {
           stepIndex: 45,
-          title: "内部检查",
+          title: "内部审核",
         },
         {
           stepIndex: 60,
@@ -348,8 +348,9 @@ export default {
               valueAnimation: true,
               formatter: "{value} %",
               color: "auto",
+              top:'100%'
             },
-            data: [{ value: 100 }],
+            data: [{ value: 100 ,top:'100%'}],
           },
         ],
       };
@@ -754,7 +755,7 @@ export default {
       position: absolute;
       top: 24px;
       left: 5%;
-      background: #3377db;
+      background: #8ab4f3;
       width: 95%;
       height: 2px;
       overflow: hidden;
@@ -797,7 +798,7 @@ export default {
           .icon {
             position: absolute;
             left: -11px;
-            color: #2d7df5;
+            color: #8ab4f3;
             font-size: 16px;
             font-weight: bold;
           }