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

components/page/storeTree.vue

@@ -19,13 +19,19 @@
     </div>
     <div class="fg">
       <div class="tree">
-        <Tree :data="data" :render="renderContent" ref="tree" @on-select-change="change"></Tree>
+        <Tree
+          :data="data"
+          :render="renderContent"
+          ref="tree"
+          @on-select-change="change"
+        ></Tree>
       </div>
     </div>
   </div>
 </template>
 
 <script>
+import { forEach } from "lodash";
 export default {
   name: "",
   data() {
@@ -64,7 +70,24 @@ export default {
             },
             "upId"
           );
-          this.list = this.$u.clone(data);
+          let creatorUserId = this.$store.state.userInfo.userId;
+          console.log(creatorUserId);
+          let list = this.$u.clone(data);
+          let newlist = [];
+          list.filter((e, index) => {
+            let userIds = [];
+            let obj = {};
+            if (e.upId == 0) {
+              userIds = e.userIds.split(",");
+              userIds.forEach((v) => {
+                if (creatorUserId == v) {
+                  newlist.push(e);
+                }
+              });
+            }
+          });
+          // console.log(newlist);
+          this.list = newlist;
         });
     },
     toggle() {
@@ -124,6 +147,7 @@ export default {
       let items = this.$u.clone(this.list);
       let expand = this.expand;
       let result = [];
+
       search(this.keys, items);
       function search(keys, data) {
         data.map((u) => {

components/page/userSelect.vue

@@ -124,7 +124,7 @@ export default {
                 // pageIndex: 1,
                 departmentId: id,
                 type: this.type,
-                roleTitle: this.roleTitle,
+                roleTitle: this.roleTitle,  //检验
                 // pageSize: 0
             };
             if (this.type == 99) { //开发组

i18n/locale/zh-CN.js

@@ -946,6 +946,7 @@ export default {
         taskCode: '甲方任务号',
         putintDocmentCode: '甲方投产输入文件（编号）',
         technologyDocmentCode: '甲方技术输入文件（编号）',
+        productionType:'生产类型'
     },
     mes_part_task_plan_simulate: {
         id: '',

pages/aps/aps/components/edit.vue

@@ -13,7 +13,7 @@
         </FormItem>
         </Col>
         <Col :span="12">
-        <FormItem label="首选资源" prop="resourceType">
+        <FormItem label="首选资源" prop="resource">
             <ResourceSelectCode v-model="entity.resource" @on-change="resourceChange"></ResourceSelectCode>
         </FormItem>
         </Col>
@@ -51,10 +51,11 @@ export default {
                     message: "必填",
                     trigger: "blur"
                 }],
-                resourceType: [{
+                resource: [{
                     required: true,
                     message: "请选择首选资源",
                     trigger: "change",
+                    type: 'array'
                 }, ],
             },
             single: false
@@ -69,10 +70,10 @@ export default {
         }
     },
     methods: {
-        load(v) {
-            this.entity = v;
+        // load(v) {
+        //     this.entity = v;
 
-        },
+        // },
         handleSubmit() {
             this.$refs.form.validate(v => {
                 if (v) {
@@ -135,9 +136,9 @@ export default {
             this.entity.resourceCode = v[1];
             this.entity.resourceId = items[1].id;
             if (v != null && v.length > 0) {
-                this.rules.resourceType[0].required = false;
+                this.rules.resource[0].required = false;
             } else {
-                this.rules.resourceType[0].required = true;
+                this.rules.resource[0].required = true;
             }
         },
         l(key) {
@@ -160,7 +161,6 @@ export default {
                         this.entity.resourceCode = v.first_equip;
                         let code = v.first_equip;
                         this.entity.resource = []
-                        //let code = 'PCZYBZBH_20200804_1'
                         if (code && code != '') {
                             this.resources.forEach(e => {
                                 if (e.code == code) {

pages/aps/aps/components/excute.vue

@@ -211,8 +211,7 @@ export default {
                     title: this.l("equip_type"),
                     align: "left",
                     easy: true,
-                    high: true,
-                    hide: true
+                    high: true
                 },
                 {
                     key: "first_equip",
@@ -470,8 +469,8 @@ export default {
 
         //编辑工序start----
         edit(row) {
-            this.editModal = true;
             this.rowData = row;
+            this.editModal = true;
         },
         //编辑工序end----
 

pages/aps/results/table-expand.vue

 <template>
-  <div class="result-aps">
+<div class="result-aps">
     <Row class="expand-row">
-      <Col span="4">
+        <Col span="4">
         <span class="expand-key">工序序号</span>
-      </Col>
-      <Col span="3">
+        </Col>
+        <Col span="3">
         <span class="expand-key">工序名称</span>
-      </Col>
-      <Col span="3">
+        </Col>
+        <Col span="3">
         <span class="expand-key">投入数量</span>
-      </Col>
-      <Col span="3">
+        </Col>
+        <Col span="3">
         <span class="expand-key">派工数量</span>
-      </Col>
-      <Col span="4">
+        </Col>
+        <Col span="4">
         <span class="expand-key">计划开始时间</span>
-      </Col>
-      <Col span="4">
+        </Col>
+        <Col span="4">
         <span class="expand-key">计划结束时间</span>
-      </Col>
-      <Col span="3">
-        <span class="expand-key">设备编号</span>
-      </Col>
+        </Col>
+        <Col span="3">
+        <span class="expand-key">首选资源</span>
+        </Col>
     </Row>
     <Row v-for="(item,index) in dataList" :key="item.index">
-      <Col span="4" class="expand-value">
+        <Col span="4" class="expand-value">
         <span>{{ item.task_seq }}</span>
-      </Col>
-      <Col span="3" class="expand-value">
+        </Col>
+        <Col span="3" class="expand-value">
         <span>{{ item.task_name }}</span>
-      </Col>
-      <Col span="3" class="expand-value">
+        </Col>
+        <Col span="3" class="expand-value">
         <span>{{ item.put_into_qty }}</span>
-      </Col>
-      <Col span="3" class="expand-value">
+        </Col>
+        <Col span="3" class="expand-value">
         <span>{{ item.dispatch_qty }}</span>
-      </Col>
-      <Col span="4" class="expand-value">
+        </Col>
+        <Col span="4" class="expand-value">
         <span>{{ item.plan_start }}</span>
-      </Col>
-      <Col span="4" class="expand-value">
+        </Col>
+        <Col span="4" class="expand-value">
         <span>{{ item.plan_finish }}</span>
-      </Col>
-      <Col span="3" class="expand-value">
+        </Col>
+        <Col span="3" class="expand-value">
         <span>{{ item.equip_id }}</span>
-      </Col>
+        </Col>
     </Row>
-  </div>
+</div>
 </template>
+
 <script>
 import Api from "./api";
 export default {
-  props: {
-    row: Object
-  },
-  data() {
-    return {
-      dataList: []
-    };
-  },
-  mounted() {
-    this.getList(this.row);
-  },
-  methods: {
-    getList(row) {
-      Api.getdetail({
-        part_task_pk: row.id,
-        scheduleId: row.schedule_id
-      }).then(r => {
-        if (r.success) {
-          this.dataList = r.result;
+    props: {
+        row: Object
+    },
+    data() {
+        return {
+            dataList: []
+        };
+    },
+    mounted() {
+        this.getList(this.row);
+    },
+    methods: {
+        getList(row) {
+            Api.getdetail({
+                part_task_pk: row.id,
+                scheduleId: row.schedule_id
+            }).then(r => {
+                if (r.success) {
+                    this.dataList = r.result;
+                }
+            });
         }
-      });
     }
-  }
 };
 </script>
-<style lang='less'>
+
+<style lang="less">
 .result-aps {
-  .expand-row {
-    text-align: center;
-    margin: 5px 0;
-    font-weight: bold;
-  }
-  .expand-value {
-    text-align: center;
-    margin: 3px 0;
-  }
+    .expand-row {
+        text-align: center;
+        margin: 5px 0;
+        font-weight: bold;
+    }
+
+    .expand-value {
+        text-align: center;
+        margin: 3px 0;
+    }
 }
+
 td.ivu-table-expanded-cell {
-  padding: 0 !important;
+    padding: 0 !important;
 }
-</style>
\ No newline at end of file
+</style>

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/material/detail.vue

@@ -69,36 +69,36 @@ export default {
         {
           key: "code",
           title: this.l("code"),
-          align: "left",
+          align: "center",
           easy: true,
           high: true,
         },
-        { key: "total", title: this.l("total"), high: true },
+        { key: "total", title: this.l("total"), high: true, align: "center" },
         {
           key: "nowTotal",
           title: this.l("nowTotal"),
-
-          high: true,
-        },
-        { key: "batch", title: this.l("batch"), align: "left", high: true },
-        {
-          key: "certificateOfApproval",
-          title: this.l("certificateOfApproval"),
-          align: "left",
+          align: "center",
           high: true,
         },
-        {
-          key: "unitPrice",
-          title: this.l("unitPrice"),
+        // { key: "batch", title: this.l("batch"), align: "left", high: true },
+        // {
+        //   key: "certificateOfApproval",
+        //   title: this.l("certificateOfApproval"),
+        //   align: "left",
+        //   high: true,
+        // },
+        // {
+        //   key: "unitPrice",
+        //   title: this.l("unitPrice"),
 
-          high: true,
-        },
-        {
-          key: "originalManufacturer",
-          title: this.l("originalManufacturer"),
-          align: "left",
-          high: true,
-        },
+        //   high: true,
+        // },
+        // {
+        //   key: "originalManufacturer",
+        //   title: this.l("originalManufacturer"),
+        //   align: "left",
+        //   high: true,
+        // },
         {
           key: "creationTime",
           title: this.l("creationTime"),
@@ -108,7 +108,7 @@ export default {
         {
           key: "creator",
           title: this.l("creatorUserId"),
-          align: "left",
+          align: "center",
           high: true,
         },
         {

pages/materiel/masterData/add.vue

 <template>
   <div>
-    <Form ref="form" :model="entity" :rules="rules" :label-width="90">
+    <Form ref="form" :model="entity"  :label-width="90">
       <Row>
         <Col :span="12">
-          <FormItem label="名称" prop="name">
+          <FormItem label="名称" prop="name" :rules="{required: true, message: '必填', trigger: 'blur'}">
             <Input v-model="entity.name" placeholder="请输入"></Input>
           </FormItem>
         </Col>
@@ -37,7 +37,9 @@
       </div>
       <Row>
         <Col v-for="li in fileds" :key="li.field" :span="li.span">
-          <FormItem :label="li.title" :prop="li.name">
+        <!-- type: li.dataType==1?'number':li.dataType==4?'date':'string' -->
+        <!-- :rules="li.required?{required: true, message: '必填', trigger: 'blur', }:''" -->
+          <FormItem :label="li.title" :prop="li.field" >
             <Input v-if="li.dataType==0" v-model="entity[li.field]"></Input>
             <InputNumber
               v-if="li.dataType==1||li.dataType==2"

pages/mesPlan/add.vue

@@ -58,7 +58,12 @@
             </Col>
         </Row>
         <Row>
-            <Col span="24">
+            <Col span="8">
+            <FormItem label="生产类型" style="width:100%" prop="productionType">
+                <dictionary style="width:240px" code="plan.order.productionType" v-model="orderSearchForm.productionType"></dictionary>
+            </FormItem>
+            </Col>
+            <Col span="16">
             <FormItem label="任务要求" style="width:100%">
                 <Input v-model="orderSearchForm.taskRequire" placeholder />
             </FormItem>

pages/mesPlan/detail.vue

@@ -67,6 +67,12 @@
         </Col>
     </Row>
     <Row>
+        <Col span="8">
+        <span class="fwBold">{{l('productionType')}}</span>
+        <p>
+            <state code="plan.order.productionType" :value="entity.productionType" type="text"></state>
+        </p>
+        </Col>
         <Col span="8">
         <span class="fwBold">{{l('productingPreparationPeople')}}</span>
         <p>
@@ -79,10 +85,6 @@
             <User v-model="entity.quotationPeople" v-if="entity.quotationPeople>0"></User>
         </p>
         </Col>
-        <Col span="8">
-        <span class="fwBold">&nbsp;</span>
-        <p>&nbsp;</p>
-        </Col>
     </Row>
     <Row class="lastRow">
         <Col span="24">

pages/mesPlan/edit.vue

@@ -61,6 +61,11 @@
             <dictionary style="width:240px" code="plan.order.urgencyLevel" v-model="orderSearchForm.urgencyLevel"></dictionary>
         </FormItem>
         </Col>
+        <Col span="8">
+        <FormItem :label="l('productionType')" style="width:100%" prop="productionType">
+            <dictionary style="width:240px" code="plan.order.productionType" v-model="orderSearchForm.productionType"></dictionary>
+        </FormItem>
+        </Col>
         <Col span="24">
         <FormItem :label="l('taskRequire')" style="width:100%">
             <Input v-model="orderSearchForm.taskRequire" placeholder />

pages/mesPlan/index.vue

@@ -179,6 +179,14 @@ export default {
                     code: "plan.order.taskType",
                     width: 100
                 },
+                {
+                    key: "productionType",
+                    title: this.l("productionType"),
+                    align: "center",
+                    high: true,
+                    code: "plan.order.productionType",
+                    width: 100
+                },
                 {
                     key: "quantity",
                     title: this.l("quantity"),

pages/order/monitoring/record.vue

@@ -105,7 +105,7 @@ export default {
           type: "user",
         },
         {
-          key: "laster",
+          key: "lastModifierUserId",
           title: this.l("laster"),
           easy: true,
           high: true,
@@ -192,10 +192,6 @@ export default {
     eid: Number,
   },
   mounted() {
-    // this.$refs.grid.reload(this.easySearch);
-    // if (this.eid) {
-    //   this.loadList();
-    // }
     window.onresize = () => {
       ///浏览器窗口大小变化
       return (() => {
@@ -214,9 +210,8 @@ export default {
     //格式化原始数据
     formatFun(data) {
       data.map((e) => {
-        if (e.laster) {
+        if (e.laster || e.creator) {
           e.laster = parseInt(e.laster);
-        } else if (e.creator) {
           e.creator = parseInt(e.creator);
         }
       });

pages/produce/api.js

 import Api from '@/plugins/request'
 export default {
-  index: `${PlanUrl}/orderexecutenew/paged_img`,
+  index: `${PlanUrl}/orderexecutenew/Paged_Img_RoutingDetail`,
   paged(params) {
-    return Api.post(`${PlanUrl}/orderexecutenew/paged_img`, params);
+    return Api.post(`${PlanUrl}/orderexecutenew/Paged_Img_RoutingDetail`, params);
   },
   getCardList(params) {
     return Api.post(`${PlanUrl}/orderexecutenew/list`, params);

pages/produce/execute/ProcessCase/add.vue

@@ -2,7 +2,7 @@
   <Form ref="form" :model="entity" :rules="rules" :label-width="90">
     <Row>
       <Col :span="12">
-        <FormItem :label="l('title')" prop="title" style="width:95%">
+        <FormItem :label="l('title')" prop="title" style="width: 95%">
           <Input v-model="entity.title"></Input>
         </FormItem>
       </Col>
@@ -22,7 +22,13 @@
       </Col>
       <Col span="24">
         <FormItem :label="l('content')" prop="content	">
-          <Input v-model="entity.content" type="textarea" :rows="5"></Input>
+          <i-quill
+            v-model="entity.content"
+            :height="300"
+            border
+            v-paste="handleImg"
+          />
+          <!-- <Input v-model="entity.content" type="textarea" :rows="5"></Input> -->
         </FormItem>
       </Col>
     </Row>
@@ -34,8 +40,12 @@
 </template>
     <script>
 import Api from "./api";
+import iQuill from "@/components/quill";
 export default {
   name: "Add",
+  components: {
+    iQuill,
+  },
   data() {
     return {
       entity: {
@@ -76,6 +86,27 @@ export default {
     }
   },
   methods: {
+    handleImg(e) {
+      console.warn(e);
+      let file = null;
+      if (
+        e.clipboardData &&
+        e.clipboardData.items[0] &&
+        e.clipboardData.items[0].type &&
+        e.clipboardData.items[0].type.indexOf("image") > -1
+      ) {
+        //这里就是判断是否有粘贴进来的文件且文件为图片格式
+        file = e.clipboardData.items[0].getAsFile();
+        let reader = new FileReader();
+        reader.readAsDataURL(file);
+        setTimeout(() => {
+          var img = '<img src="' + reader.result + '" alt=""/>';
+          this.entity.content += img;
+        }, 1000);
+
+        // new R
+      }
+    },
     handleSubmit() {
       this.$refs.form.validate((v) => {
         if (v) {

pages/produce/execute/ProcessCase/edit.vue

@@ -2,7 +2,7 @@
   <Form ref="form" :model="entity" :rules="rules" :label-width="90">
     <Row>
       <Col :span="12">
-        <FormItem :label="l('title')" prop="title" style="width:95%">
+        <FormItem :label="l('title')" prop="title" style="width: 95%">
           <Input v-model="entity.title"></Input>
         </FormItem>
       </Col>
@@ -22,7 +22,13 @@
       </Col>
       <Col span="24">
         <FormItem :label="l('content')" prop="content	">
-          <Input v-model="entity.content" type="textarea" :rows="5"></Input>
+          <i-quill
+            v-model="entity.content"
+            :height="300"
+            border
+            v-paste="handleImg"
+          />
+          <!-- <Input v-model="entity.content" type="textarea" :rows="5"></Input> -->
         </FormItem>
       </Col>
     </Row>
@@ -34,8 +40,12 @@
 </template>
 <script>
 import Api from "./api";
+import iQuill from "@/components/quill";
 export default {
   name: "Edit",
+  components: {
+    iQuill,
+  },
   data() {
     return {
       entity: {},
@@ -90,6 +100,27 @@ export default {
         }
       });
     },
+    handleImg(e) {
+      console.warn(e);
+      let file = null;
+      if (
+        e.clipboardData &&
+        e.clipboardData.items[0] &&
+        e.clipboardData.items[0].type &&
+        e.clipboardData.items[0].type.indexOf("image") > -1
+      ) {
+        //这里就是判断是否有粘贴进来的文件且文件为图片格式
+        file = e.clipboardData.items[0].getAsFile();
+        let reader = new FileReader();
+        reader.readAsDataURL(file);
+        setTimeout(() => {
+          var img = '<img src="' + reader.result + '" alt=""/>';
+          this.entity.content += img;
+        }, 1000);
+
+        // new R
+      }
+    },
     handleClose() {
       this.$emit("on-close");
     },

pages/produce/execute/ProcessCheck/guidance/index.vue

@@ -13,7 +13,10 @@
       <template slot="easySearch">
         <Form ref="formInline" :model="easySearch" inline>
           <FormItem prop="keys">
-            <Input placeholder="请输入关键字名称" v-model="easySearch.keys.value" />
+            <Input
+              placeholder="请输入关键字名称"
+              v-model="easySearch.keys.value"
+            />
           </FormItem>
           <FormItem>
             <Button type="primary" @click="search">查询</Button>
@@ -23,20 +26,20 @@
       <!-- <template slot="buttons">
         <Button type="primary" @click="add">新增</Button>
       </template>-->
-      <template slot="card" slot-scope="{row}">
+      <template slot="card" slot-scope="{ row }">
         <div class="card_body">
           <Row class="title_i">
-            <Col :span="21">工艺名称：{{row.title}}</Col>
+            <Col :span="21">工艺名称：{{ row.title }}</Col>
             <Col :span="3" class="btn_click">
               <!-- <a @click="edit(row.id)">
                   <Icon type="ios-create" @click="edit(row.id)" />
               </a>-->
-              <!-- <a @click="view(row.id)">
-                  <Icon type="ios-paper" />
-                </a>
-                <a @click="remove(row.id)">
+              <a @click="view(row.id)">
+                <Icon type="ios-paper" />
+              </a>
+              <!-- <a @click="remove(row.id)">
                   <Icon type="ios-trash" />
-              </a>-->
+              </a> -->
             </Col>
           </Row>
           <div class="down_text">
@@ -48,12 +51,16 @@
                 </div>
               </Col>
               <Col span="18">
-                <p>创建时间：{{row.creationTime}}</p>
-                <p>创建人：{{row.creator}}</p>
-                <p>内容：{{row.content}}</p>
+                <p>创建时间：{{ row.creationTime }}</p>
+                <p>创建人：{{ row.creator }}</p>
+                <p>内容：{{ row.content }}</p>
                 <p>
                   状态：
-                  <state code="processCase.status" :value="row.status+''" type="text" />
+                  <state
+                    code="processCase.status"
+                    :value="row.status + ''"
+                    type="text"
+                  />
                 </p>
               </Col>
             </Row>
@@ -78,12 +85,12 @@
         </div>-->
       </template>
     </DataGrid>
-    <!-- <Modal v-model="modal" :title="title" width="800" footer-hide :mask-closable="false">
+    <Modal v-model="modal" :title="title" width="800" footer-hide :mask-closable="false">
       <component :is="detail" :eid="curId" @on-close="cancel" @on-ok="ok" />
     </Modal>
-    <Modal v-model="deletelModal" title="删除" @on-ok="removeOk" @on-cancel="cancel" :mask-closable="false">
+    <!-- <Modal v-model="deletelModal" title="删除" @on-ok="removeOk" @on-cancel="cancel" :mask-closable="false">
       <p>确定删除？</p>
-    </Modal>-->
+    </Modal> -->
   </div>
 </template>
 <script>

pages/produce/execute/execute.less

@@ -89,11 +89,12 @@
         }
         .img_box {
             text-align: center;
+            margin: auto;
             line-height: 350px;
             font-size: 32px;
             width: 750px;
             height: 350px;
-            background: #ddd;
+            // background: #ddd;
             margin: 10px 0 0 170px;
         }
     }

pages/project/groupUser/list.vue

@@ -540,7 +540,7 @@ export default {
     },
     //新增保存或修改保存
     save() {
-      this.cur.groupId = this.eid;
+      this.cur.projectId = this.eid;
       if (this.cur.userId === undefined) {
         this.$Message.error("请选择人员");
         return;

pages/project/task/index.vue

@@ -8,7 +8,7 @@
             <Icon type="ios-arrow-forward" size="24" />
         </a>
     </div>
-    <Content class="content" :class="!showMenu?'con_bord':''" >
+    <Content class="content" :class="!showMenu?'con_bord':''">
         <DataGrid :columns="columns" ref="grid" :action="action" :conditions="easySearch" :lazy="true">
             <template slot="easySearch">
                 <Form ref="formInline" inline>
@@ -175,6 +175,8 @@ export default {
                         return h('DateRange', {
                             props: {
                                 value: params.row,
+                                start: 'plansToStartDate',
+                                end: 'plansToEndTime',
                             }
                         })
                     }

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>
@@ -154,7 +154,7 @@
         </Col>
         <Col :span="6">
           <FormItem :label="l('examUser')" prop="examUser">
-            <UserSelect ref="examUser" v-model="entity.examUser" />
+            <UserSelect ref="examUser" v-model="entity.examUser" :roleTitle='roleTitle'/>
           </FormItem>
         </Col>
         <!-- <Col :span="6">
@@ -196,6 +196,7 @@ export default {
   data() {
     return {
       isId: "",
+      roleTitle:"检验",
       examineModal: false,
       submit: true,
       isDisabled: false,
@@ -213,6 +214,7 @@ export default {
         id: 0,
         status: 0,
         items: [],
+        userUnit:''
       },
       rules: {
         // userUnit: [{ required: true, message: "必填", trigger: "change" }],

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",

pages/qc/check/api.js

 
 import Api from '@/plugins/request'
 export default { 
-    index:`${resourceUrl}/materialpowder/itempaged`,
+    index:`${material}/material/paged`,
     paged(params){
-    return Api.post(`${resourceUrl}/materialpowder/itempaged`,params);
+    return Api.post(`${material}/material/paged`,params);
     },
     get(params){
-    return Api.get(`${resourceUrl}/materialpowder/get`,params);
+    return Api.get(`${material}/materialpowder/get`,params);
     },
     create(params){
-    return Api.post(`${resourceUrl}/materialpowder/create`,params);
+    return Api.post(`${material}/materialpowder/create`,params);
     },
     update(params){
-    return Api.post(`${resourceUrl}/materialpowder/update`,params);
+    return Api.post(`${material}/materialpowder/update`,params);
     },
     //删除：
     delete(params) {
-    return Api.delete(`${resourceUrl}/materialpowder/delete`,{params:params});
+    return Api.delete(`${material}/materialpowder/delete`,{params:params});
     },
 }
\ No newline at end of file