资源物料ok

components/page/materiel.vue

@@ -51,7 +51,6 @@
       :multiple="multiple"
       :departmentId="departmentId"
       :disabled="disabled"
-      clearable
       filterable
     >
       <Option
@@ -143,6 +142,11 @@ export default {
       type: String,
       default: "",
     },
+    codeRuleType: {
+      // 库房类型
+      type: Number,
+      default: "",
+    },
   },
   methods: {
     change(val) {
@@ -167,9 +171,14 @@ export default {
         conditions = [
           {
             conditionalType: "In",
-            fieldName: "categoryId",
+            fieldName: "rootCategoryId",
             fieldValue: this.materialType,
           },
+          {
+            fieldName: "codeRuleType",
+            fieldValue: this.codeRuleType + "",
+            conditionalType: "In",
+          },
         ];
       } else {
         conditions = [];

pages/material/add.vue

@@ -12,7 +12,7 @@
       </Col>
       <Col :span="12">
         <FormItem :label="l('name')" prop="materialId">
-          <Materiel v-model="entity.materialId" @on-change="change" :materialType="materialType"></Materiel>
+          <Materiel v-model="entity.materialId" @on-change="change" :materialType="materialType" :codeRuleType='codeRuleType'></Materiel>
         </FormItem>
       </Col>
 
@@ -123,13 +123,15 @@ export default {
       },
     };
   },
-  props: {
-    // v: Object,
-    eid: Number,
-    rootName: String,
-    storeTitle: String,
-    materialType: String,
-  },
+  props: ["eid", "rootName", "storeTitle", "materialType", "codeRuleType"],
+  // props: {
+
+  //   eid: Number,
+  //   rootName: String,
+  //   storeTitle: String,
+  //   materialType: String,
+  //   codeRuleType:String,
+  // },
   mounted() {},
   methods: {
     handleSubmit() {

pages/material/index.vue

@@ -31,6 +31,7 @@
           :rootName="rootName"
           :storeTitle="storeTitle"
           :materialType="materialType"
+          :codeRuleType="codeRuleType"
           :storeId="storeId"
           :mcode="mCode"
           @on-close="cancel"
@@ -60,6 +61,7 @@ export default {
       easySearch: {
         keys: { op: "name,storeTitle,materialCode", value: null },
       },
+      codeRuleType: null,
       fscreeen: false,
       modal: false,
       title: "新增",
@@ -211,10 +213,14 @@ export default {
     },
     add() {
       if (this.curId) {
-        this.title = "新增";
-        this.detail = () => import("./add");
-        this.fscreeen = false;
-        this.modal = true;
+        if (this.codeRuleType == 1) {
+          this.title = "新增";
+          this.detail = () => import("./add");
+          this.fscreeen = false;
+          this.modal = true;
+        } else {
+          this.$Message.error("请先选择正确的库房类型");
+        }
       } else {
         this.$Message.error("请先选择库房库位");
       }
@@ -262,7 +268,16 @@ export default {
     },
     productSearch(item, ids, rootName) {
       console.log(item);
+      let type = [];
       this.curId = item.id;
+      type = item.codeRuleType.split(",");
+      if (type) {
+        type.forEach((e) => {
+          if (e == 1) {
+            this.codeRuleType = 1;
+          }
+        });
+      }
       this.storeTitle = item.title;
       this.rootName = rootName.join(" / ");
       this.materialType = item.materialType;

pages/materiel/masterData/index.vue

@@ -102,6 +102,7 @@ export default {
   },
   methods: {
     clickItem(val) {
+      console.log(val);
       this.nodeInfo.codeRuleId = val;
       this.model8 = val;
       this.cityList.forEach((e) => {

pages/materiel/masterData/masterData.vue

@@ -258,7 +258,7 @@ export default {
                     this.addCol = items;
                     this.cols = this.$u.clone(this.columns);
                     let extra = items.map(u => {
-                        console.log(u);
+                        // console.log(u);
                         var col = {
                             key: u.field,
                             title: u.title

pages/materiel/masterData/submit.vue

@@ -90,6 +90,7 @@ export default {
     return {
       action: Api.index,
       rowId: "",
+      fileds:[],
       entity: {},
       metCodesStrTxt: "",
       results: {},
@@ -313,9 +314,9 @@ export default {
       let codeList = [];
       let idList = [];
       if (this.eid !== 0) {
-        if (this.entity.code) {
+        if (this.entity.code!=0) {
           codeList.push(this.entity.code);
-        } else {
+        } else { 
           codeList.push(this.eid);
         }
         idList.push(this.eid);

pages/resource/resource/add.vue

@@ -12,7 +12,12 @@
       </Col>
       <Col :span="12">
         <FormItem :label="l('name')" prop="resourceId">
-          <Materiel v-model="entity.resourceId" @on-change="change" :materialType="materialType"></Materiel>
+          <Materiel
+            v-model="entity.resourceId"
+            @on-change="change"
+            :materialType="materialType"
+            :codeRuleType="codeRuleType"
+          ></Materiel>
         </FormItem>
       </Col>
 
@@ -125,13 +130,14 @@ export default {
       },
     };
   },
-  props: {
-    // v: Object,
-    eid: Number,
-    rootName: String,
-    storeTitle: String,
-    materialType: String,
-  },
+  props: ["eid", "rootName", "storeTitle", "materialType", "codeRuleType"],
+  // props: {
+  //   // v: Object,
+  //   eid: Number,
+  //   rootName: String,
+  //   storeTitle: String,
+  //   materialType: String,
+  // },
   mounted() {},
   methods: {
     handleSubmit() {

pages/store/add.vue

@@ -68,6 +68,7 @@ export default {
         level: this.level,
         userName: "",
         userIds: "",
+        codeRuleType: "",
       },
       rules: {
         title: [{ required: true, message: "必填", trigger: "blur" }],
@@ -105,15 +106,19 @@ export default {
     },
     changeVal(val) {
       let code = [];
+      let type = [];
       for (let i = 0; i < this.list.length; i++) {
         let obj = this.list[i];
         for (let j = 0; j < val.length; j++) {
           if (obj.id == val[j]) {
             code.push(obj.code);
+            type.push(obj.codeRuleType);
           }
         }
       }
+  
       this.entity.materialTypeName = code.join(",");
+      this.entity.codeRuleType = type.join(",");
     },
     handleSubmit() {
       this.$refs.form.validate((v) => {
@@ -137,6 +142,7 @@ export default {
             userIds: userId, //库管员id
             materialType: materialType, //物料类型
             materialTypeName: this.entity.materialTypeName, //物料编码
+            codeRuleType:this.entity.codeRuleType
           };
 
           Api.create(paramsdata)

pages/store/edit.vue

@@ -51,6 +51,7 @@ export default {
       roleTitle: "库管",
       entity: {
         materialType: [],
+        codeRuleType: "",
       },
       materialType: [],
       rules: {
@@ -91,15 +92,19 @@ export default {
     },
     changeVal(val) {
       let code = [];
+      let type = [];
       for (let i = 0; i < this.list.length; i++) {
         let obj = this.list[i];
         for (let j = 0; j < val.length; j++) {
           if (obj.id == val[j]) {
             code.push(obj.code);
+            type.push(obj.codeRuleType);
           }
         }
       }
+      alert(type)
       this.entity.materialTypeName = code.join(",");
+      this.entity.codeRuleType = type.join(",");
     },
     load(v) {
       Api.get({ id: v }).then((r) => {
@@ -138,6 +143,7 @@ export default {
             creatorUserId: this.entity.creatorUserId,
             materialType: materialType, //物料类型
             materialTypeName: this.entity.materialTypeName, //物料编码
+            codeRuleType: this.entity.codeRuleType,
           };
 
           Api.update(paramsdata)