Merge branch 'product' of git.mes123.com:zhouyx/mes-ui into product-rjt

pages/handle/examine9/detail.vue

 <template>
   <div class="pdf-detail table-detail">
     <div class="cerioficate-pdf-detail">
-      <div class="bian-hao">产品合格证编号：{{results.serialNumber}}</div>
+      <div class="bian-hao">产品合格证编号：{{ results.serialNumber }}</div>
       <div class="body-d">
         <Row class="row-border right-border">
           <Col :span="4" class="col-border">用户单位</Col>
-          <Col :span="20" class="col-border">{{results.userUnit}}</Col>
+          <Col :span="20" class="col-border">{{ results.userUnit }}</Col>
         </Row>
         <Row class="row-border right-border">
           <Col :span="4" class="col-border">任务依据</Col>
-          <Col :span="20" class="col-border">{{results.taskBased}}</Col>
+          <Col :span="20" class="col-border">{{ results.taskBased }}</Col>
         </Row>
         <Row class="row-border right-border">
           <Col :span="4" class="col-border">产品名称</Col>
-          <Col :span="8" class="col-border">{{results.productName}}</Col>
-          <Col :span="4" class="col-border">产品状态</Col>
-          <Col :span="8" class="col-border">{{results.productStatus}}</Col>
+          <Col :span="8" class="col-border">{{ results.productName }}</Col>
+          <!-- <Col :span="4" class="col-border">产品状态</Col>
+          <Col :span="8" class="col-border">{{results.productStatus}}</Col> -->
         </Row>
         <Row class="row-border right-border">
           <Col :span="4" class="col-border">产品编号</Col>
-          <Col :span="8" class="col-border">{{results.productSerialNumber}}</Col>
+          <Col :span="8" class="col-border">{{
+            results.productSerialNumber
+          }}</Col>
           <Col :span="4" class="col-border">原材料批号</Col>
-          <Col :span="8" class="col-border">{{results.materialSerialNumber}}</Col>
+          <Col :span="8" class="col-border">{{
+            results.materialSerialNumber
+          }}</Col>
         </Row>
         <Row class="row-border right-border">
           <Col :span="4" class="col-border">原材料编号</Col>
-          <Col :span="8" class="col-border">{{results.materialCode}}</Col>
+          <Col :span="8" class="col-border">{{ results.materialCode }}</Col>
           <Col :span="4" class="col-border">产品代号（图号）</Col>
-          <Col :span="8" class="col-border">{{results.productCode}}</Col>
+          <Col :span="8" class="col-border">{{ results.productCode }}</Col>
         </Row>
         <Row class="row-border right-border">
           <Col :span="4" class="col-border">原材料合格证编号</Col>
-          <Col :span="8" class="col-border">{{results.materialCertificationNumber}}</Col>
+          <Col :span="8" class="col-border">{{
+            results.materialCertificationNumber
+          }}</Col>
           <Col :span="4" class="col-border">数量</Col>
-          <Col :span="8" class="col-border">{{results.productQuantity}}</Col>
+          <Col :span="8" class="col-border">{{ results.productQuantity }}</Col>
         </Row>
         <!-- <Row class="row-border right-border">
           <Col :span="4" class="col-border">增材制造批次号</Col>
@@ -50,73 +56,84 @@
           <Col :span="5" class="col-border">结论</Col>
           <Col :span="5" class="col-border">备注</Col>
         </Row>
-        <Row class="row-border right-border" v-for="(item,index) in results.items" :key="index">
-          <Col :span="1" class="col-border">{{index+1}}</Col>
-          <Col :span="5" class="col-border">{{item.name}}</Col>
-          <Col :span="5" class="col-border">{{item.require}}</Col>
-          <Col :span="3" class="col-border">{{item.result}}</Col>
-          <Col :span="5" class="col-border">{{item.conclusion}}</Col>
-          <Col :span="5" class="col-border">{{item.remark}}</Col>
+        <Row
+          class="row-border right-border"
+          v-for="(item, index) in results.items"
+          :key="index"
+        >
+          <Col :span="1" class="col-border">{{ index + 1 }}</Col>
+          <Col :span="5" class="col-border">{{ item.name }}</Col>
+          <Col :span="5" class="col-border">{{ item.require }}</Col>
+          <Col :span="3" class="col-border">{{ item.result }}</Col>
+          <Col :span="5" class="col-border">{{ item.conclusion }}</Col>
+          <Col :span="5" class="col-border">{{ item.remark }}</Col>
         </Row>
         <Row class="row-border right-border">
           <Col :span="4" class="col-border">结论</Col>
-          <Col :span="20" class="col-border">{{results.conclusion}}</Col>
+          <Col :span="20" class="col-border">{{ results.conclusion }}</Col>
         </Row>
-         <Row class="row-border right-border bottom-border">
+        <Row class="row-border right-border bottom-border">
           <Col :span="4" class="col-border">检验员 / 时间</Col>
-          <Col :span="8" class="col-border">{{results.examUser}} {{results.examDate}}</Col>
+          <Col :span="8" class="col-border">
+            <User :value="parseInt(results.examUser)" />&nbsp;{{
+              results.examDate
+            }}</Col
+          >
           <Col :span="4" class="col-border">批准人 / 时间</Col>
-          <Col :span="8" class="col-border">{{results.approveUser}} {{results.approveDate}}</Col>
+          <Col :span="8" class="col-border">
+            <User :value="parseInt(results.approveUser)" />&nbsp;
+            {{ results.approveDate }}</Col
+          >
         </Row>
       </div>
     </div>
   </div>
 </template>
 <script>
-import Api from '../api'
+import Api from "../api";
 
 export default {
-  name: 'detail',
+  name: "detail",
   components: {},
   props: {
     idVal: {
       type: String,
-      default: ''
-    }
+      default: "",
+    },
   },
   async fetch({ store, params }) {
-    await store.dispatch('loadDictionary') // 加载数据字典
+    await store.dispatch("loadDictionary"); // 加载数据字典
   },
   data() {
     return {
       results: {
-        state: ''
-      }
-    }
+        state: "",
+      },
+    };
   },
   created() {
-    this.dataImmut = []
-    this.dataMut = []
+    this.dataImmut = [];
+    this.dataMut = [];
 
     Api.get({ Id: this.idVal }).then((r) => {
       if (r.success) {
-        this.results = JSON.parse(r.result.formData)
+        this.results = JSON.parse(r.result.formData);
         // let formStr = r.result.formData.replace(/\"/g, '"')
         // this.results = JSON.parse(formStr)[0]
       } else {
-        this.$Message.error('加载失败')
+        this.$Message.error("加载失败");
       }
-    })
+    });
   },
   methods: {
     load(v) {},
     l(key) {
-      key = 'waitOpened' + '.' + key
-      return this.$t(key)
-    }
+      key = "waitOpened" + "." + key;
+      return this.$t(key);
+    },
   },
-  watch: {}
-}
+  watch: {},
+};
 </script>
 <style lang="less" scoped>
 .pdf-detail {

pages/qc/certificate/endIssued/pdfDetail.vue

 <template>
   <div class="pdf-detail">
     <div class="pdf-out">
-      <Button type="primary" @click="$u.outPdf('.cerioficate-pdf-detail','合格证')">导出</Button>
+      <Button
+        type="primary"
+        @click="$u.outPdf('.cerioficate-pdf-detail', '合格证')"
+        >导出</Button
+      >
     </div>
     <div class="cerioficate-pdf-detail">
       <!-- <div class="pdf-img">
         <img src="@/assets/images/log_pdf.png" alt="图片未加载" />
       </div> -->
       <div class="pdf-title">产品合格证</div>
-      <div class="bian-hao">产品合格证编号：{{results.serialNumber}}</div>
+      <div class="bian-hao">产品合格证编号：{{ results.serialNumber }}</div>
       <div class="body-d body-table">
         <Row class="row-border right-border">
           <Col :span="4" class="col-border">用户单位</Col>
-          <Col :span="20" class="col-border">{{results.userUnit}}</Col>
+          <Col :span="20" class="col-border">{{ results.userUnit }}</Col>
         </Row>
         <Row class="row-border right-border">
           <Col :span="4" class="col-border">任务依据</Col>
-          <Col :span="20" class="col-border">{{results.taskBased}}</Col>
+          <Col :span="20" class="col-border">{{ results.taskBased }}</Col>
         </Row>
         <Row class="row-border right-border">
           <Col :span="4" class="col-border">产品名称</Col>
-          <Col :span="8" class="col-border">{{results.productName}}</Col>
-          <Col :span="4" class="col-border">产品状态</Col>
-          <Col :span="8" class="col-border">{{results.productStatus}}</Col>
+          <Col :span="8" class="col-border">{{ results.productName }}</Col>
+          <!-- <Col :span="4" class="col-border">产品状态</Col>
+          <Col :span="8" class="col-border">
+            <state code="plan.order.status" :value="results.productStatus"
+          /></Col> -->
         </Row>
         <Row class="row-border right-border">
           <Col :span="4" class="col-border">产品编号</Col>
-          <Col :span="8" class="col-border">{{results.productSerialNumber}}</Col>
+          <Col :span="8" class="col-border">{{
+            results.productSerialNumber
+          }}</Col>
           <Col :span="4" class="col-border">原材料批号</Col>
-          <Col :span="8" class="col-border">{{results.materialSerialNumber}}</Col>
+          <Col :span="8" class="col-border">{{
+            results.materialSerialNumber
+          }}</Col>
         </Row>
         <Row class="row-border right-border">
           <Col :span="4" class="col-border">原材料编号</Col>
-          <Col :span="8" class="col-border">{{results.materialCode}}</Col>
+          <Col :span="8" class="col-border">{{ results.materialCode }}</Col>
           <Col :span="4" class="col-border">产品代号（图号）</Col>
-          <Col :span="8" class="col-border">{{results.productCode}}</Col>
+          <Col :span="8" class="col-border">{{ results.productCode }}</Col>
         </Row>
         <Row class="row-border right-border">
           <Col :span="4" class="col-border">原材料合格证编号</Col>
-          <Col :span="8" class="col-border">{{results.materialCertificationNumber}}</Col>
+          <Col :span="8" class="col-border">{{
+            results.materialCertificationNumber
+          }}</Col>
           <Col :span="4" class="col-border">数量</Col>
-          <Col :span="8" class="col-border">{{results.productQuantity}}</Col>
+          <Col :span="8" class="col-border">{{ results.productQuantity }}</Col>
         </Row>
         <!-- <Row class="row-border right-border">
           <Col :span="4" class="col-border">增材制造批次号</Col>
@@ -57,66 +69,82 @@
           <Col :span="5" class="col-border">结论</Col>
           <Col :span="5" class="col-border">备注</Col>
         </Row>
-        <Row class="row-border right-border" v-for="(item,index) in results.items" :key="index">
-          <Col :span="1" class="col-border">{{index+1}}</Col>
-          <Col :span="5" class="col-border">{{item.name}}</Col>
-          <Col :span="5" class="col-border">{{item.require}}</Col>
-          <Col :span="3" class="col-border">{{item.result}}</Col>
-          <Col :span="5" class="col-border">{{item.conclusion}}</Col>
-          <Col :span="5" class="col-border">{{item.remark}}</Col>
+        <Row
+          class="row-border right-border"
+          v-for="(item, index) in results.items"
+          :key="index"
+        >
+          <Col :span="1" class="col-border">{{ index + 1 }}</Col>
+          <Col :span="5" class="col-border">{{ item.name }}</Col>
+          <Col :span="5" class="col-border">{{ item.require }}</Col>
+          <Col :span="3" class="col-border">{{ item.result }}</Col>
+          <Col :span="5" class="col-border">{{ item.conclusion }}</Col>
+          <Col :span="5" class="col-border">{{ item.remark }}</Col>
         </Row>
         <Row class="row-border right-border">
           <Col :span="4" class="col-border">结论</Col>
-          <Col :span="20" class="col-border">{{results.conclusion}}</Col>
+          <Col :span="20" class="col-border">{{ results.conclusion }}</Col>
         </Row>
         <Row class="row-border right-border bottom-border">
           <Col :span="4" class="col-border">检验员 / 时间</Col>
-          <Col :span="8" class="col-border">{{results.examUser}} {{results.examDate}}</Col>
+          <Col :span="8" class="col-border">
+            <User :value="parseInt(results.examUser)" />&nbsp;
+            {{ results.examDate }}</Col
+          >
           <Col :span="4" class="col-border">批准人 / 时间</Col>
-          <Col :span="8" class="col-border">{{results.approveUser}} {{results.approveDate}}</Col>
+          <Col :span="8" class="col-border"
+            ><User :value="parseInt(results.approveUser)" />&nbsp;
+            {{ results.approveDate }}</Col
+          >
         </Row>
       </div>
-      <div style="margin-top:20px;">本合格证无检验专用章无效 (版本：MB.FFGGHJKLL)</div>
-      <Row style="margin-top:5px;">
+      <div style="margin-top: 20px">
+        本合格证无检验专用章无效 (版本：MB.FFGGHJKLL)
+      </div>
+      <Row style="margin-top: 5px">
         <Col :span="10">地址：</Col>
-        <Col :span="8" >电话：</Col>
-        <Col :span="6" >邮编：</Col>
+        <Col :span="8">电话：</Col>
+        <Col :span="6">邮编：</Col>
       </Row>
     </div>
   </div>
 </template>
 
 <script>
-import Api from '../../certificate/api'
+import Api from "../../certificate/api";
 export default {
-  name: '',
+  name: "",
   props: {
-    eid: Number
+    eid: Number,
   },
   data() {
     return {
-      results: []
-    }
+      results: [],
+    };
+  },
+  async fetch({ store, params }) {
+    await store.dispatch("loadDictionary"); // 加载数据字典
   },
+
   created() {
     // this.loadss()
   },
   methods: {
     load(v) {
       Api.getCertificate({ id: v }).then((r) => {
-        this.results = r.result
-        console.log(r.result)
-      })
-    }
+        this.results = r.result;
+        console.log(r.result);
+      });
+    },
   },
   watch: {
     eid(v) {
       if (v != null) {
-        this.load(v)
+        this.load(v);
       }
-    }
-  }
-}
+    },
+  },
+};
 </script>
 
 <style lang="less" scoped>

pages/qc/certificate/endIssued/qcInfos.vue

@@ -14,8 +14,10 @@
         <Row class="row-border right-border">
           <Col :span="4" class="col-border">产品名称</Col>
           <Col :span="8" class="col-border">{{ results.productName }}</Col>
-          <Col :span="4" class="col-border">产品状态</Col>
-          <Col :span="8" class="col-border">{{ results.productStatus }}</Col>
+          <!-- <Col :span="4" class="col-border">产品状态</Col>
+          <Col :span="8" class="col-border">
+            <state code="plan.order.status" :value="results.productStatus"
+          /></Col> -->
         </Row>
         <Row class="row-border right-border">
           <Col :span="4" class="col-border">产品编号</Col>
@@ -75,11 +77,13 @@
         <Row class="row-border right-border bottom-border">
           <Col :span="4" class="col-border">检验员 / 时间</Col>
           <Col :span="8" class="col-border"
-            >{{ results.examUser }} {{ results.examDate }}</Col
+            ><User :value="parseInt(results.examUser)" />&nbsp;
+            {{ results.examDate }}</Col
           >
           <Col :span="4" class="col-border">批准人 / 时间</Col>
           <Col :span="8" class="col-border"
-            >{{ results.approveUser }} {{ results.approveDate }}</Col
+            ><User :value="parseInt(results.approveUser)" />&nbsp;
+            {{ results.approveDate }}</Col
           >
         </Row>
       </div>
@@ -105,6 +109,10 @@ export default {
   data() {
     return {};
   },
+  async fetch({ store, params }) {
+    await store.dispatch("loadDictionary"); // 加载数据字典
+  },
+
   methods: {
     l(key) {
       key = "waitOpened" + "." + key;

pages/qc/certificate/waitOpened/add.vue

@@ -35,7 +35,7 @@
             />
           </FormItem>
         </Col>
-        <Col :span="6">
+        <!-- <Col :span="6">
           <FormItem :label="l('productStatus')" prop="productStatus">
             <Dictionary
               disabled
@@ -46,7 +46,7 @@
               :key="entity.productStatus"
             ></Dictionary>
           </FormItem>
-        </Col>
+        </Col> -->
         <Col :span="6">
           <FormItem :label="l('materialCode')" prop="materialCode">
             <Input v-model="entity.materialCode"></Input>

pages/qc/certificate/waitOpened/index.vue

@@ -94,14 +94,14 @@ export default {
                     easy: true,
                     high: true
                 },
-                {
-                    key: "status",
-                    title: this.l("status"),
-                    align: "left",
-                    easy: true,
-                    high: true,
-                    code: "plan.order.status"
-                },
+                // {
+                //     key: "status",
+                //     title: this.l("status"),
+                //     align: "left",
+                //     easy: true,
+                //     high: true,
+                //     code: "plan.order.status"
+                // },
                 {
                     title: "操作",
                     key: "action",