资源物料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) {
+        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,7 +314,7 @@ 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 { 
           codeList.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/resource/resource/index.vue

 <template>
-<Layout class="full">
+  <Layout class="full">
     <Sider hide-trigger v-if="showMenu" class="menu_side" width="300">
       <StoreTree @on-hide="onHide" @on-select="productSearch" />
     </Sider>
@@ -9,11 +9,26 @@
       </a>
     </div>
     <Content class="content" :class="!showMenu?'con_bord':''">
-        <DataGrid :columns="columns" ref="grid" :action="action" :conditions="easySearch" :batch="true" :format="checkData" @all-change="allchange" @on-selection-change="onSelect" exportTitle="制造资源">
+      <DataGrid
+        :columns="columns"
+        ref="grid"
+        :action="action"
+        :conditions="easySearch"
+        :batch="true"
+        :format="checkData"
+        @all-change="allchange"
+        @on-selection-change="onSelect"
+        exportTitle="制造资源"
+      >
         <template slot="easySearch">
           <Form ref="formInline" :model="easySearch" inline>
             <FormItem prop="keys">
-                        <Input clearable placeholder="请输入资源名称/资源编码/编码" v-model.trim="easySearch.keys.value" v-width="260" />
+              <Input
+                clearable
+                placeholder="请输入资源名称/资源编码/编码"
+                v-model.trim="easySearch.keys.value"
+                v-width="260"
+              />
             </FormItem>
             <FormItem>
               <Button type="primary" @click="search">查询</Button>
@@ -36,11 +51,31 @@
         </template>
       </DataGrid>
       <Modal v-model="modal" :title="title" width="1200" footer-hide :fullscreen="fscreeen">
-            <component :is="detail" :eid="curId" :rootName="rootName" :storeTitle="storeTitle" :materialType="materialType" :storeId="storeId" :mcode="mCode" :cartList="this.$u.clone(this.$store.state.cart)" @on-close="cancel" @on-ok="ok" @substr="substr" />
+        <component
+          :is="detail"
+          :eid="curId"
+          :rootName="rootName"
+          :storeTitle="storeTitle"
+          :materialType="materialType"
+          :codeRuleType="codeRuleType"
+          :storeId="storeId"
+          :mcode="mCode"
+          :cartList="this.$u.clone(this.$store.state.cart)"
+          @on-close="cancel"
+          @on-ok="ok"
+          @substr="substr"
+        />
       </Modal>
-        <ImportExcel ref="importExcel" @on-get-data="getData" :columns="columns" :open="ModalIm" @on-cancel="ModalImCancel" @on-ok="ok" />
+      <ImportExcel
+        ref="importExcel"
+        @on-get-data="getData"
+        :columns="columns"
+        :open="ModalIm"
+        @on-cancel="ModalImCancel"
+        @on-ok="ok"
+      />
     </Content>
-</Layout>
+  </Layout>
 </template>
 
 <script>
@@ -63,7 +98,7 @@ export default {
       easySearch: {
         keys: {
           op: "nameOfResource,code,resourceCode",
-                    value: null
+          value: null,
         },
       },
       fscreeen: false,
@@ -76,7 +111,8 @@ export default {
       storeTitle: "",
       materialType: "",
       mCode: "",
-            columns: [{
+      columns: [
+        {
           key: "selection",
           type: "selection",
           width: 50,
@@ -97,19 +133,23 @@ export default {
           high: true,
           width: 60,
           render: (h, params) => {
-                        return h("div", {
-                            class: "action"
-                        }, [
+            return h(
+              "div",
+              {
+                class: "action",
+              },
+              [
                 h(params.row.numberAvailable > 0 ? "op" : "", {
                   attrs: {
                     icon: "ios-cart-outline",
                     type: "icon",
                   },
                   on: {
-                                    click: () => this.addCart(params.row)
+                    click: () => this.addCart(params.row),
                   },
                 }),
-                        ]);
+              ]
+            );
           },
         },
         {
@@ -250,36 +290,44 @@ export default {
           key: "action",
           hide: false,
           render: (h, params) => {
-                        return h("div", {
-                            class: "action"
-                        }, [
+            return h(
+              "div",
+              {
+                class: "action",
+              },
+              [
                 h(
-                                "op", {
+                  "op",
+                  {
                     attrs: {
                       oprate: "delete",
                       title: "删除",
                     },
-                                    class: params.row.totalNum === params.row.numberAvailable ?
-                                        "remove" : "disable",
+                    class:
+                      params.row.totalNum === params.row.numberAvailable
+                        ? "remove"
+                        : "disable",
                     on: {
-                                        click: () => this.remove(params.row)
+                      click: () => this.remove(params.row),
                     },
                   },
                   "删除"
                 ),
                 h(
-                                "op", {
+                  "op",
+                  {
                     attrs: {
                       oprate: "detail",
                       title: "查看日志",
                     },
                     on: {
-                                        click: () => this.logDetail(params.row.id)
+                      click: () => this.logDetail(params.row.id),
                     },
                   },
                   "查看日志"
                 ),
-                        ]);
+              ]
+            );
           },
         },
       ],
@@ -293,6 +341,7 @@ export default {
       selectRows: [],
       //导入
       ModalIm: false,
+      codeRuleType: null,
     };
   },
   created() {
@@ -307,10 +356,7 @@ export default {
       })();
     };
   },
-    async fetch({
-        store,
-        params
-    }) {
+  async fetch({ store, params }) {
     await store.dispatch("loadDictionary"); // 加载数据字典
   },
   computed: {},
@@ -371,7 +417,7 @@ export default {
               hasPush = true;
               thisArr[index] = {
                 ...item,
-                                ...item2
+                ...item2,
               };
               return;
             }
@@ -433,10 +479,14 @@ export default {
     },
     add() {
       if (this.curId) {
+        if (this.codeRuleType == 3) {
           this.title = "新增";
           this.detail = () => import("./add");
           this.fscreeen = false;
           this.modal = true;
+        } else {
+          this.$Message.error("请先选择正确的库房类型");
+        }
       } else {
         this.$Message.error("请先选择库房库位");
       }
@@ -478,14 +528,23 @@ export default {
     productSearch(item, ids, rootName) {
       // console.log(item);
       this.curId = item.id;
+      let type = [];
+      type = item.codeRuleType.split(",");
+      if (type) {
+        type.forEach((e) => {
+          if (e == 3) {
+            this.codeRuleType = 3;
+          }
+        });
+      }
       this.storeTitle = item.title;
       this.rootName = rootName.join(" / ");
       this.materialType = item.materialType;
       let where = {
         storeId: {
           op: "In",
-                    value: ids
-                }
+          value: ids,
+        },
       };
       this.$refs.grid.reload(where);
     },
@@ -499,14 +558,18 @@ export default {
     //批量导入start
     //导入功能
     openModalIm() {
-            this.ModalIm = true
+      this.ModalIm = true;
     },
     ModalImCancel() {
-            this.ModalIm = false
+      this.ModalIm = false;
     },
     getData(val) {
       let url = `${resourceUrl}/resourceimportservice/import`;
-            this.$refs.importExcel.deelData(url, this.columns, this.formatMethod(val))
+      this.$refs.importExcel.deelData(
+        url,
+        this.columns,
+        this.formatMethod(val)
+      );
     },
     //根据页面二次处理数据
     formatMethod(val) {
@@ -514,26 +577,31 @@ export default {
       let tempList = [];
       tempData.forEach((ele) => {
         let obj = {
-                    nameOfResource: ele.nameOfResource ? ele.nameOfResource : '',
-                    resourceCode: ele.resourceCode ? ele.resourceCode : '',
-                    code: ele.code ? ele.code : '',
+          nameOfResource: ele.nameOfResource ? ele.nameOfResource : "",
+          resourceCode: ele.resourceCode ? ele.resourceCode : "",
+          code: ele.code ? ele.code : "",
           totalNum: ele.totalNum ? ele.nameOfResource : 0,
-                    storeTitle: ele.storeTitle ? ele.storeTitle : '',
+          storeTitle: ele.storeTitle ? ele.storeTitle : "",
           storeId: ele.storeId ? ele.nameOfResource : null,
           state: 1,
           numberAvailable: ele.numberAvailable ? ele.nameOfResource : 0,
-                    json: {}
+          json: {},
         };
-                if (ele.nameOfResource && ele.nameOfResource != '' && ele.code && ele.code != '' && ele.resourceCode && ele.resourceCode != '') {
-                    obj.ico = false
+        if (
+          ele.nameOfResource &&
+          ele.nameOfResource != "" &&
+          ele.code &&
+          ele.code != "" &&
+          ele.resourceCode &&
+          ele.resourceCode != ""
+        ) {
+          obj.ico = false;
         } else {
-                    obj.ico = true
+          obj.ico = true;
         }
         tempList.push(obj);
-
       });
-            return tempList
-
+      return tempList;
     },
     //批量导入end
     l(key) {

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)