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

src/views/system/forget/stateDetails.vue

@@ -0,0 +1,168 @@
+<template>
+  <div class="sample-scan">
+   <el-input
+      v-model="facilityId"
+      ref="redarInput"
+      style="z-index: -999;">
+    </el-input> 
+    <div class="popContainer" v-if="redar" @click="remRedar">
+      <dv-decoration-12 style="width:150px;height:150px;margin:0 auto;top: 35%;">
+        <span style=" color: #66D9EF;"></span>
+      </dv-decoration-12>
+    </div>
+    <el-dialog
+      @click="getData"
+      title='内审阶段'
+      ref="dialog_ref"
+      :visible.sync="scanVisible"
+      :before-close="handleClose">
+      <div class="stepsContent">
+        <el-steps :active="active" finish-status="success" process-status="wait"  space="18%">
+          <el-step title="开始" ></el-step>
+          <el-step title="实施计划" process-status="finish"></el-step>
+          <el-step title="首次会议" process-status="wait"></el-step>
+          <el-step title="内审核查"></el-step>
+          <el-step title="末次会议"></el-step>
+          <el-step title="内审不符合项整改"></el-step>
+          <el-step title="内审报告"></el-step>
+          <el-step title="结束"></el-step>
+        </el-steps>
+        <!-- <el-button style="margin-top: 12px;" @click="next">下一步</el-button> -->
+      </div>
+      <!-- <div slot="footer" class="dialog-footer">
+        <el-button @click="centerDialogVisible = false">取消</el-button>
+        <el-button type="primary" @click="centerDialogVisible = false">确 定</el-button>
+      </div> -->
+    </el-dialog>
+
+  </div>
+</template>
+
+<script>
+import repostCurd from '@/business/platform/form/utils/custom/joinCURD.js'
+export default {
+  props: {
+    obj: {
+      default: [],
+      type: Array
+    },
+    scanVisible:{
+      type:Boolean,
+      default: false
+    },
+  },
+  data () {
+    return {
+      facilityId:'',
+      updateNum:1,
+      visible:false,
+      redar:false,
+      listData:[],
+      dialogVisible: false,
+      //默认第几个节点完成
+      active:2,
+      status:''
+    }
+  },
+  watch:{
+    listData: {
+      handler(val, oldName) {
+        if(val.length>0){
+          this.visible = true
+          this.redar = false    // 扫描后就让扫描组件隐藏
+        }
+      },
+      deep: true,
+      immediate: true
+    },
+   scanVisible:{
+     handler(val, oldName) {
+        if(val){
+          this.redar = false       // 扫码的组件  一开始先展示
+          this.visible = true    // 结果列表   一开始没扫描就不展示
+
+          this.$nextTick(() => {
+              this.$refs.redarInput.focus(); //聚焦input
+            })
+          this.listData = [] //清空列表
+        }else{
+          this.remRedar()
+        }
+     },
+     deep: true,
+     immediate: true
+   }
+  },
+  created() {
+    
+    
+  },
+  mounted(){
+    this.getData()
+    this.open()
+  },
+  methods:{
+    // open(){
+    //   console.log('123',this.$refs.dialog_ref)
+    // },
+    // 确认关闭弹框
+    handleClose(done) {
+      this.$confirm('确认关闭？')
+        .then(_ => {
+          done();
+        })
+        .catch(_ => {});
+    },
+    getData(){
+      let id = '',name='',host='',status='';
+      console.log('脚本对象',this.obj,this.obj[0],this.obj[1].shi_fou_guo_shen_,this.obj[1].nei_shen_zu_zu_ch)
+      // id = this.obj[0],
+      //获取当前id，查内审阶段数据表  内审名称="" && 内审状态="已完成" 
+    },
+    // 
+    //步骤i条
+    next() {
+      if (this.active++ > 7) {
+        // 节点超过7之后回到初始状态
+        this.active = 2;
+      }
+    },
+      //改变步骤条状态
+    stepStatus(step){
+      switch(step){
+      case 0:
+        this.status ='';
+        break;
+      case 1:
+        this.status = '内审核查'
+        break;
+      }
+    },
+  }
+
+  }
+
+</script>
+
+<style lang="less" scoped>
+.stateDetails{
+  position: fixed;
+      width: 1000px;
+      height: 600px;
+      top: 0;
+      left: 0;
+      right: 0;
+      bottom: 0;
+      z-index: 100;
+      background-color: white;
+      border: 2px solid rebeccapurple;
+      .stepsContent{
+        width: 100%;
+        height: calc(100% - 20px);
+        margin: 10px 0px;
+
+      }
+
+}
+
+</style>

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

@@ -69,7 +69,7 @@
                         <th style="font-weight: normal">物料名称</th>
                         <th>货号</th>
                         <th>批号</th>
-                        <th>规格/特征量值</th>
+                        <th>规格/特征</th>
                         <th>生产商/品牌</th>
                         <th>数量</th>
                         <th>单位</th>
@@ -130,11 +130,15 @@
                   </table>
                 </div>
                 <div class="bottom">
-                  <div>仓管员/日期 :{{ item1.name2 }} /{{ item1.time2 }}</div>
+                  <div>仓管员:{{ item1.name2 }} 
+                    <!-- /{{ item1.time2 }} -->
+
+                  </div>
                   <div>
-                    审核人（部门负责人）/日期 :{{ item1.name3 }} /{{
+                    审核人:{{ item1.name3 }}
+                     <!-- /{{
                       item1.time3
-                    }}
+                    }} -->
                   </div>
                 </div>
               </div>

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

@@ -68,7 +68,7 @@
                         <th style="font-weight: normal">物料名称</th>
                         <th>货号</th>
                         <th>批号</th>
-                        <th>规格/特征量值</th>
+                        <th>规格/特征</th>
                         <th>生产商/品牌</th>
                         <th>数量</th>
                         <th>单位</th>
@@ -125,11 +125,14 @@
                   </table>
                 </div>
                 <div class="bottom">
-                  <div>仓管员/日期 :{{ item1.name2 }} /{{ item1.time2 }}</div>
+                  <div>仓管员:{{ item1.name2 }}
+                     <!-- /{{ item1.time2 }} -->
+                     </div>
                   <div>
-                    审核人（部门负责人）/日期 :{{ item1.name3 }} /{{
+                    审核人:{{ item1.name3 }} 
+                    <!-- /{{
                       item1.time3
-                    }}
+                    }} -->
                   </div>
                 </div>
               </div>

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

@@ -8,7 +8,7 @@
       :visible.sync="scanVisible"
     >
       <!-- 表单是否显示 -->
-      <div style="height: 500px; width: 95%; margin: 0 auto" >
+      <div style="height: 500px; width: 95%; margin: 0 auto">
         <div ref="qrcode" id="box">
           <vue-easy-print tableShow ref="easyPrint" :onePageRow="onePageRow">
             <div
@@ -57,12 +57,12 @@
                   <table border="1">
                     <thead>
                       <tr>
-                        <th style="width: 40px;line-height:22px;">序号</th>
+                        <th style="width: 40px; line-height: 22px">序号</th>
                         <th style="font-weight: normal">物料编码</th>
                         <th style="font-weight: normal">物料名称</th>
-                        <th>货号</th>
+                        <!-- <th>货号</th> -->
                         <th>批号</th>
-                        <th>规格/特征量值</th>
+                        <th>规格/特征</th>
                         <th>数量</th>
                         <th>单位</th>
                         <th>单价</th>
@@ -80,7 +80,7 @@
                         <td style="width: 120px">
                           {{ item.wu_liao_ming_chen }}
                         </td>
-                        <td style="width: 60px">{{ item.huo_hao_ }}</td>
+                        <!-- <td style="width: 60px">{{ item.huo_hao_ }}</td>  -->
                         <td style="width: 60px">{{ item.pi_hao_ }}</td>
                         <td style="width: 120px">
                           {{ item.gui_ge_xing_hao_ }}
@@ -108,16 +108,17 @@
                 </div>
                 <div class="bottom">
                   <div></div>
-                  <div style="float:left">
-                    领用人/日期：{{ item1.name1 }}/{{ item1.ling_liao_ri_qi_ }}
-                  </div>
-                  <div style="margin: 0 auto;">
-                    审核人（部门负责人）/日期 :{{ item1.name2 }} /{{
-                      item1.time2
-                    }}
+                  <div style="float: left">
+                    领用人/日期：
+                    {{ item1.name1 }}/{{ item1.ling_liao_ri_qi_ }}
+                  </div> 
+                  <div style="margin: 0 auto">
+                    审核人/日期 :
+                    {{ item1.name2 }} /{{item1.time2}}
                   </div>
                   <div>
-                    发放人（仓库员）/日期 :{{ item1.name3 }}/{{ item1.time3 }}
+                    发放人/日期 :
+                    {{ item1.name3 }}/{{ item1.time3 }}
                   </div>
                 </div>
               </div>
@@ -137,7 +138,7 @@
 import VueBarcode from "vue-barcode";
 import vueEasyPrint from "vue-easy-print";
 import repostCurd from "@/business/platform/form/utils/custom/joinCURD.js";
-import { Loading } from 'element-ui';
+import { Loading } from "element-ui";
 import { toFixed } from "@/views/platform/form/formPrint/utils";
 
 export default {
@@ -187,7 +188,7 @@ export default {
       });
     },
   },
-    watch: {
+  watch: {
     obj() {
       this.getInit();
     },
@@ -238,7 +239,7 @@ export default {
     },
     getLook(id) {
       let this_ = this;
-      this.list=[];
+      this.list = [];
       let sql = `select * FROM t_crkjlb WHERE FIND_IN_SET(id_,'${id}')`;
       let zhubiao = [];
       let name1, name2, name3;
@@ -257,7 +258,7 @@ export default {
                 data["name1"] = name1;
               });
             }
-            let s2 = `select a.NAME_,DATE_FORMAT(b.CREATE_TIME_,'%Y-%m-%d') AS CREATE_TIME_ FROM ibps_party_employee  as a join ibps_bpm_oper_log as b on a.ID_ = b.CREATE_BY_ where b.PROC_INST_ID_ = ( SELECT  PROC_INST_ID_  FROM ibps_bpm_bus_rel WHERE BUSINESSKEY_ = '${item.id_}') AND b.NODE_ID_ = 'Activity_0t9dfi3' ORDER BY b.CREATE_TIME_ DESC LIMIT 1`
+            let s2 = `select a.NAME_,DATE_FORMAT(b.CREATE_TIME_,'%Y-%m-%d') AS CREATE_TIME_ FROM ibps_party_employee  as a join ibps_bpm_oper_log as b on a.ID_ = b.CREATE_BY_ where b.PROC_INST_ID_ = ( SELECT  PROC_INST_ID_  FROM ibps_bpm_bus_rel WHERE BUSINESSKEY_ = '${item.id_}') AND b.NODE_ID_ = 'Activity_0t9dfi3' ORDER BY b.CREATE_TIME_ DESC LIMIT 1`;
             repostCurd("sql", s2).then((res) => {
               name2 = res.variables.data[0].NAME_;
               time2 = res.variables.data[0].CREATE_TIME_;
@@ -270,7 +271,7 @@ export default {
                 data["name3"] = name3;
                 data["time3"] = time3;
                 data["ling_liao_chu_ku_"] = item.ling_liao_chu_ku_;
-                 data["id_"] = item.id_;
+                data["id_"] = item.id_;
                 data["ling_liao_bu_men_"] = item.ling_liao_bu_men_;
                 data["ling_liao_ri_qi_"] = item.ling_liao_ri_qi_;
                 data["gong_ying_shang_"] = item.gong_ying_shang_ || 0;
@@ -278,8 +279,8 @@ export default {
                   data["heji"] = this.addNumber(chushi, it.jin_e_);
                   chushi = data["heji"];
                 });
-                
-                 data["heji"] =this_.toDecimal2(data["heji"]);
+
+                data["heji"] = this_.toDecimal2(data["heji"]);
                 this_.list.push(data);
                 chushi = 0;
               });

src/views/system/jbdScan/scan.vue

@@ -22,10 +22,13 @@ import caigourukudan from './goods/caigourukudan'
 import chnangguirukudan from './goods/chnangguirukudan'
 import lingliaodan from './goods/lingliaodan'
 import fenzhuangtag from './goods/fenzhuangtag'
+import stateDetails from '../forget/stateDetails'
 import sampleTag from './goods/sampleTag'
 
+
 export default {
-  components: { facility,material,sample,sampleConfirmation,manualConfirmation,tag,jishutag,caigourukudan,chnangguirukudan,lingliaodan,fenzhuangtag,sampleTag},
+  components: { facility,material,sample,sampleConfirmation,manualConfirmation,tag,jishutag,caigourukudan,chnangguirukudan,lingliaodan,fenzhuangtag,sampleTag,stateDetails},
+
   props:{
     currentScan:String,
     scanVisible:Boolean,