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

pages/technology/details/add.vue

@@ -90,7 +90,7 @@
         </Col>
         <Col :span="6">
           <FormItem :label="l('resourceType')" prop="resourceType">
-            <ResourceSelect v-model="entity.resourceId" @on-change="resourceChange"></ResourceSelect>
+            <ResourceSelect v-model="entity.resource" @on-change="resourceChange"></ResourceSelect>
           </FormItem>
         </Col>
         <Col :span="6">
@@ -181,6 +181,7 @@ export default {
         name: "",
         taskSeq: null,
         taskContent: "",
+        resource: [],
         resourceId: null,
         resourceType: null,
         resourceCode: "",

pages/technology/details/edit.vue

@@ -90,7 +90,7 @@
         </Col>
         <Col :span="6">
           <FormItem :label="l('resourceType')" prop="resourceType">
-            <ResourceSelect v-model="entity.resourceId" @on-change="resourceChange"></ResourceSelect>
+            <ResourceSelect v-model="entity.resource" @on-change="resourceChange"></ResourceSelect>
           </FormItem>
         </Col>
         <Col :span="6">
@@ -194,7 +194,7 @@ export default {
     load(v) {
       Api.get({ id: v }).then(r => {
         this.entity = r.result;
-        this.entity.resourceId = [r.result.resourceType, r.result.resourceId];
+        this.entity.resource = [r.result.resourceType, r.result.resourceId];
       });
     },
     handleSubmit() {
@@ -259,8 +259,8 @@ export default {
       this.entity.equipTypeId = items.id;
     },
     resourceChange(v, items) {
-      this.entity.resourceType = items[0].value;
-      this.entity.resourceId = v;
+      this.entity.resourceId = v[1];
+      this.entity.resourceType = v[0];
       this.entity.resourceCode = items[1].__label;
     }
   },