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

components/page/dataGrid.vue

@@ -550,6 +550,7 @@ export default {
   position: relative;
   height: 100%;
   .table-tools {
+    padding-top: 5px;
     height: 50px;
     overflow: hidden;
     .table-search {

pages/mesPlan/index.vue

@@ -287,6 +287,37 @@ export default {
           hide: true,
           type: "date"
         },
+        {
+          key: "creatorUserId",
+          title: this.$t("creatorUserId"),
+          align: "left",
+          high: true,
+          type: "user"
+        },
+        {
+          key: "creationTime",
+          title: this.$t("creationTime"),
+          align: "center",
+          high: true,
+          width: 180
+        },
+        {
+          key: "lastModifierUserId",
+          title: this.$t("lastModifierUserId"),
+          hide: true,
+          align: "left",
+          high: true,
+          type: "user"
+        },
+        {
+          key: "lastModificationTime",
+          title: this.$t("lastModificationTime"),
+          hide: true,
+          align: "center",
+          high: true,
+          width: 180
+        },
+
         {
           title: "操作",
           key: "action",
@@ -297,7 +328,7 @@ export default {
               h(
                 "op",
                 {
-                  attrs: { oprate: "detail",  },
+                  attrs: { oprate: "detail" },
                   on: { click: () => this.detail(params.row) }
                 },
                 "查看"
@@ -305,7 +336,7 @@ export default {
               h(
                 "op",
                 {
-                  attrs: { oprate: "edit", },
+                  attrs: { oprate: "edit" },
                   on: { click: () => this.edit(params.row) },
                   style:
                     (params.row.status == 1 &&
@@ -321,7 +352,7 @@ export default {
               h(
                 "op",
                 {
-                  attrs: { oprate: "remove", },
+                  attrs: { oprate: "remove" },
                   on: { click: () => this.remove(params.row) },
                   style:
                     (params.row.status == 1 &&
@@ -336,7 +367,7 @@ export default {
               h(
                 "op",
                 {
-                  attrs: { oprate: "detail",  },
+                  attrs: { oprate: "detail" },
                   on: { click: () => this.split(params.row) },
                   style:
                     (params.row.divideMark != 0 &&

pages/mesPlan/send.vue

@@ -19,7 +19,7 @@
       >
         <Row>
           <Col span="6">
-            <FormItem label="生产准备" style="width:100%" prop="ProductingPreparationPeople">
+            <FormItem label="生产车间" style="width:100%" prop="ProductingPreparationPeople">
               <WorkShopSelect ref="userSelected" v-model="orderForm.ProductingPreparationPeople" />
             </FormItem>
           </Col>
@@ -74,36 +74,35 @@ export default {
       },
       columns1: [
         {
-          title: "订单编码",
+          title: this.l("mesCode"),
           key: "mesCode",
           width: 180,
           tooltip: true
         },
         {
-          title: "任务类型",
-          key: "taskType",
-          align: "center",
-          width: 100,
+          title: this.l("productName"),
+          key: "productName",
           tooltip: true
         },
         {
-          title: "产品名称",
-          key: "productName",
-          tooltip: true
+          key: "drawnNumber",
+          title: this.l("drawnNumber"),
+          align: "center",
+          width: 140
         },
         {
-          title: "阶段",
-          key: "stage",
-          width: 80
+          title: this.l("projectNumber"),
+          key: "projectNumber",
+          width: 140
         },
         {
-          title: "材料",
-          key: "materialId",
-          width: 100,
+          title: this.l("batchNumber"),
+          key: "batchNumber",
+          width: 120,
           tooltip: true
         },
         {
-          title: "数量",
+          title: this.l("quantity"),
           key: "quantity",
           align: "right",
           width: 70
@@ -169,23 +168,30 @@ export default {
       return objStr;
     },
     getTimeProductPFD(value) {
-      this.orderForm.ProductingPreparationFinishDate = this.getFormatDateEnd(value);
+      this.orderForm.ProductingPreparationFinishDate = this.getFormatDateEnd(
+        value
+      );
     },
     getTimeQuotationFD(value) {
       this.orderForm.QuotationFinishDate = this.getFormatDateEnd(value);
     },
-     getFormatDateEnd(dates) {
+    getFormatDateEnd(dates) {
       const d = new Date(dates);
       const resDate =
         d.getFullYear() +
         "-" +
         this.p(d.getMonth() + 1) +
         "-" +
-        this.p(d.getDate())+ " 23:59:59";
+        this.p(d.getDate()) +
+        " 23:59:59";
       return resDate;
     },
     p(s) {
       return s < 10 ? "0" + s : s;
+    },
+    l(key) {
+      let vkey = "mes_plan" + "." + key;
+      return this.$t(vkey) || key;
     }
   },
   created() {

pages/technology/add.vue

@@ -46,7 +46,8 @@
         <FormItem :label="l('departmentId')" prop="departmentId">
           <departmentSelect v-model="entity.departmentId"></departmentSelect>
         </FormItem>
-      </Col>      <Col :span="5">
+      </Col>
+      <Col :span="5">
         <FormItem :label="l('isMain')" prop="isMain">
           <Dictionary code="Process.state" v-model="entity.isMain" type="radio"></Dictionary>
         </FormItem>
@@ -61,7 +62,7 @@
           <Dictionary code="Process.Status" v-model="entity.isEffect" type="radio"></Dictionary>
         </FormItem>
       </Col>
-            <!--     
+      <!--     
       <Col :span="12">
         <FormItem :label="l('upId')" prop="upId">
           <InputNumber v-model="entity.upId"></InputNumber>
@@ -121,23 +122,16 @@
         </FormItem>
       </Col>-->
       <Col :span="24">
-       <FormItem :label="l('remark')" prop="remark">
-            <i-quill
-            v-model="entity.remark"
-            :height="300"
-            border
-            v-paste="handleImg"
-          />
+        <FormItem :label="l('remark')" prop="remark">
+          <i-quill v-model="entity.remark" :height="300" border v-paste="handleImg" />
         </FormItem>
       </Col>
-    
-     <Col :span="24">
-       <FormItem label="多媒体附件" prop="files">
-         
-           <files />
+
+      <Col :span="24">
+        <FormItem label="多媒体附件" prop="files">
+          <files ref="refFile" :parms="parms" files />
         </FormItem>
       </Col>
-     
     </Row>
     <FormItem>
       <Button type="primary" @click="handleSubmit" :disabled="disabled">保存</Button>
@@ -147,10 +141,10 @@
 </template>
     <script>
 import Api from "./api";
-import iQuill from '@/components/quill'
+import iQuill from "@/components/quill";
 export default {
   name: "Add",
-   components: {
+  components: {
     iQuill
     // VueUeditorWrap
   },
@@ -186,6 +180,12 @@ export default {
       rules: {
         name: [{ required: true, message: "必填", trigger: "blur" }],
         code: [{ required: true, message: "必填", trigger: "blur" }]
+      },
+      parms: {
+        app: "technology",
+        eid: null,
+        name: "",
+        field: ""
       }
     };
   },
@@ -194,15 +194,27 @@ export default {
     eid: Number
   },
   mounted() {
-    if (this.eid > 0) {
-      this.load(this.eid);
-    }
+    this.parms.eid = this.$u.guid();
+    this.$refs.refFile.intFiles();
   },
   methods: {
     handleSubmit() {
       this.$refs.form.validate(v => {
         if (v) {
           this.disabled = true;
+          //  this.entity.qualityTemplateName = ''
+          // this.entity.qualityTemplate=''
+          // if (this.$refs.refFile.nameList.length > 0) {
+          //   let nameList=this.$refs.refFile.nameList
+          //   let names=[]
+          //   let url=[]
+          //   nameList.forEach(e => {
+          //     names.push(e.fileName)
+          //     url.push(e.filePath)
+          //   });
+          //   this.entity.qualityTemplateName = JSON.stringify(names).replace('[','').replace(']','').replace(/\"/g,'')//附件本地库暂存文件名称
+          //   this.entity.qualityTemplate=JSON.stringify(url).replace('[','').replace(']','').replace(/\"/g,'')
+          // }
           Api.create(this.entity)
             .then(r => {
               this.disabled = false;
@@ -224,23 +236,23 @@ export default {
     handleClose() {
       this.$emit("on-close");
     },
-     handleImg(e) {
-      console.warn(e)
-      let file = null
+    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
+        e.clipboardData.items[0].type.indexOf("image") > -1
       ) {
         //这里就是判断是否有粘贴进来的文件且文件为图片格式
-        file = e.clipboardData.items[0].getAsFile()
-        let reader = new FileReader()
-        reader.readAsDataURL(file)
+        file = e.clipboardData.items[0].getAsFile();
+        let reader = new FileReader();
+        reader.readAsDataURL(file);
         setTimeout(() => {
-          var img = '<img src="' + reader.result + '" alt=""/>'
-          this.entity.remark += img
-        }, 1000)
+          var img = '<img src="' + reader.result + '" alt=""/>';
+          this.entity.remark += img;
+        }, 1000);
 
         // new R
       }

pages/technology/details/routingqccard/edit.vue

@@ -81,8 +81,7 @@
       </Col>
       <Col :span="24">
         <FormItem :label="l('qualityTemplateName')" prop="qualityTemplateName">
-          <Input v-model="entity.qualityTemplateName"></Input>
-          <files ref="refFile" :parms="parms" files singleFile/>
+          <files ref="refFile" :parms="parms" files singleFile />
         </FormItem>
       </Col>
       <Col :span="12">
@@ -162,22 +161,25 @@ export default {
   data() {
     return {
       disabled: false,
-      entity: {},
+      entity: {
+        qualityTemplateName: "",
+        qualityTemplate: ""
+      },
       rules: {
         name: [{ required: true, message: "必填", trigger: "blur" }]
       },
       routingDetailList: [],
       parms: {
-        app: 'qccard',
-        eid: null,
-        name: '',
-        field: ''
+        app: "qccard",
+        eid: this.eid,
+        name: "",
+        field: ""
       }
     };
   },
   props: {
     headid: Number,
-    eName:String,
+    eName: String,
     eid: Number
   },
   mounted() {
@@ -189,7 +191,7 @@ export default {
   methods: {
     load(v) {
       Api.get({ id: v }).then(r => {
-        this.$refs.refFile.intFilesClone()
+        this.$refs.refFile.intFilesClone();
         this.entity = r.result;
       });
     },
@@ -197,6 +199,26 @@ export default {
       this.$refs.form.validate(v => {
         if (v) {
           this.disabled = true;
+          this.entity.qualityTemplateName = "";
+          this.entity.qualityTemplate = "";
+          if (this.$refs.refFile.nameList.length > 0) {
+            let nameList = this.$refs.refFile.nameList;
+            let names = [];
+            let url = [];
+            nameList.forEach(e => {
+              names.push(e.fileName);
+              url.push(e.filePath);
+            });
+            this.entity.qualityTemplateName = JSON.stringify(names)
+              .replace("[", "")
+              .replace("]", "")
+              .replace(/\"/g, ""); //附件本地库暂存文件名称
+            this.entity.qualityTemplate = JSON.stringify(url)
+              .replace("[", "")
+              .replace("]", "")
+              .replace(/\"/g, "");
+          }
+
           Api.update(this.entity)
             .then(r => {
               this.disabled = false;
@@ -231,11 +253,11 @@ export default {
           tempObj.value = data.id;
           tempObj.label = data.name;
           tempD.push(tempObj);
-        })
-        this.routingDetailList = tempD
+        });
+        this.routingDetailList = tempD;
       });
     },
-   
+
     l(key) {
       key = "routing_qc_card" + "." + key;
       return this.$t(key);