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

pages/material/add.vue

@@ -38,7 +38,7 @@
       </Col>
       <Col :span="12">
         <FormItem :label="l('creator')" prop="creator">
-          <User :value="entity.creator" />
+         {{entity.creator}}
         </FormItem>
       </Col>
       <Col :span="24">
@@ -72,7 +72,7 @@ export default {
         specifications: "",
         batch: "",
         certificateOfApproval: "",
-        creator: this.$store.state.userInfo.userId,
+        creator: this.$store.state.userInfo.userName,
         unitPrice: null,
         originalManufacturer: "",
         remark: ""

pages/material/itemIndex.vue

@@ -73,11 +73,10 @@ export default {
           high: true
         },
         {
-          key: "creatorUserId",
+          key: "creator",
           title: this.l("creatorUserId"),
           align: "left",
           high: true,
-          type: "user"
         },
         {
           key: "remark",

pages/store/add.vue

@@ -61,7 +61,7 @@ export default {
         userIds: ""
       },
       rules: {
-        name: [{ required: true, message: "必填", trigger: "blur" }]
+        title: [{ required: true, message: "必填", trigger: "blur" }]
       }
     };
   },

pages/technology/processview.vue

@@ -47,7 +47,7 @@
             </Row>
             <Row class="table_row">
               <Col span="3">
-                <div class="row_label">工艺文件版本</div>
+                <div class="row_label">工艺版本</div>
               </Col>
               <Col span="9">
                 <div class="iview_cont">
@@ -304,7 +304,7 @@ export default {
     loadImg() {
       this.nameList = [];
       this.formValidate.files = [];
-      if (this.eid == undefined) {
+      if (this.eid == undefined) {//用于工艺审批时判断
         let pars = {
           conditions: [
             {