瀏覽代碼

采购信息和仓库信息表单字段校验规则优化

yusheng 1 年之前
父節點
當前提交
7e3f52af07

+ 145 - 96
src/views/material/product/components/PurchasingInfo.vue

@@ -11,28 +11,65 @@
       <el-row :gutter="24">
         <el-col :span="8">
           <el-form-item label="周期" prop="purchasingCycle">
-            <el-input v-model="form.purchasingCycle" placeholder="请输入" @input="handleInput1"
-              style="width: calc(100% - 100px)" />
-            <DictSelection dictName="周期单位" clearable v-model="form.purchasingCycleUnit" style="width: 100px">
+            <el-input
+              v-model="form.purchasingCycle"
+              placeholder="请输入"
+              @input="handleInput1"
+              style="width: calc(100% - 100px)"
+            />
+            <DictSelection
+              dictName="周期单位"
+              clearable
+              v-model="form.purchasingCycleUnit"
+              style="width: 100px"
+            >
             </DictSelection>
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="倍数" prop="purchaseMultiplier">
-            <el-input v-model="form.purchaseMultiplier" placeholder="请输入" @input="handleInput2" style="width: 100%" />
+            <el-input
+              v-model="form.purchaseMultiplier"
+              placeholder="请输入"
+              @input="handleInput2"
+              style="width: 100%"
+            />
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="最低订购量" prop="minimumOrderQuantity">
-            <el-input v-model="form.minimumOrderQuantity" placeholder="请输入" @input="handleInput3"
-              style="width: calc(100% - 100px)" />
-            <DictSelection dictName="计量单位" clearable v-model="form.measuringUnit" style="width: 100px">
+            <el-input
+              v-model="form.minimumOrderQuantity"
+              placeholder="请输入"
+              @input="handleInput3"
+              style="width: calc(100% - 100px)"
+            />
+            <DictSelection
+              dictName="计量单位"
+              clearable
+              v-model="form.measuringUnit"
+              style="width: 100px"
+            >
             </DictSelection>
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item label="产地" prop="purchaseOrigins">
-            <DictSelection dictName="产地" clearable style="width: 100%" v-model="form.purchaseOrigins" multiple>
+          <el-form-item
+            label="产地"
+            prop="purchaseOrigins"
+            :rules="{
+              required: clientEnvironmentId == 10 ? true : false,
+              message: '请选择产地',
+              trigger: 'blur'
+            }"
+          >
+            <DictSelection
+              dictName="产地"
+              clearable
+              style="width: 100%"
+              v-model="form.purchaseOrigins"
+              multiple
+            >
             </DictSelection>
 
             <!-- <el-select
@@ -52,12 +89,19 @@
         </el-col>
         <el-col :span="8">
           <el-form-item label="采购组织" prop="checkDepart">
-            <deptSelect v-model="form.checkDepart" @changeGroup="searchDeptNodeClick" />
+            <deptSelect
+              v-model="form.checkDepart"
+              @changeGroup="searchDeptNodeClick"
+            />
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="采购员" prop="checkPerson">
-            <personSelect ref="directorRef" v-model="form.checkPerson" :init="false" />
+            <personSelect
+              ref="directorRef"
+              v-model="form.checkPerson"
+              :init="false"
+            />
           </el-form-item>
         </el-col>
       </el-row>
@@ -66,109 +110,114 @@
 </template>
 
 <script>
-import deptSelect from '@/components/CommomSelect/dept-select.vue';
-import personSelect from '@/components/CommomSelect/person-select.vue';
-import { getByCode } from '@/api/system/dictionary-data';
-export default {
-  props: {
-    form: {
-      type: Object,
-      default: {}
-    }
-  },
-  components: { deptSelect, personSelect },
-  data() {
-    return {
-      dictList: []
-    };
-  },
-  watch: {
-    form(data) {
-      if (data.checkDepart) {
-        const params = { executeGroupId: data.checkDepart };
-        this.$nextTick(() => {
-          this.$refs.directorRef.getList(params);
-        });
+  import deptSelect from '@/components/CommomSelect/dept-select.vue';
+  import personSelect from '@/components/CommomSelect/person-select.vue';
+  import { getByCode } from '@/api/system/dictionary-data';
+  export default {
+    props: {
+      form: {
+        type: Object,
+        default: {}
       }
-    }
-  },
-  activated() {
-    this.getDictList('purchase_origin');
-  },
-  methods: {
-    async getDictList(code) {
-      let { data: res } = await getByCode(code);
-      this.dictList = res.map((item) => {
-        let values = Object.keys(item);
-        return {
-          value: Number(values[0]),
-          label: item[values[0]]
-        };
-      });
     },
-    // 选择所属部门
-    searchDeptNodeClick(id, info) {
-      // 根据部门获取人员
-      const params = { executeGroupId: id };
-      this.$nextTick(() => {
-        this.$refs.directorRef.getList(params);
-      });
+    components: { deptSelect, personSelect },
+    data() {
+      return {
+        dictList: []
+      };
+    },
+    computed: {
+      clientEnvironmentId() {
+        return this.$store.state.user.info.clientEnvironmentId;
+      }
     },
-    handleInput1(val) {
-      this.form.purchasingCycle = this.$handleInputPublicHasPoint(val);
+    watch: {
+      form(data) {
+        if (data.checkDepart) {
+          const params = { executeGroupId: data.checkDepart };
+          this.$nextTick(() => {
+            this.$refs.directorRef.getList(params);
+          });
+        }
+      }
     },
-    handleInput2(val) {
-      this.form.purchaseMultiplier = this.$handleInputPublicHasPoint(val);
+    activated() {
+      this.getDictList('purchase_origin');
     },
-    handleInput3(val) {
-      this.form.minimumOrderQuantity = this.$handleInputPublicHasPoint(val);
+    methods: {
+      async getDictList(code) {
+        let { data: res } = await getByCode(code);
+        this.dictList = res.map((item) => {
+          let values = Object.keys(item);
+          return {
+            value: Number(values[0]),
+            label: item[values[0]]
+          };
+        });
+      },
+      // 选择所属部门
+      searchDeptNodeClick(id, info) {
+        // 根据部门获取人员
+        const params = { executeGroupId: id };
+        this.$nextTick(() => {
+          this.$refs.directorRef.getList(params);
+        });
+      },
+      handleInput1(val) {
+        this.form.purchasingCycle = this.$handleInputPublicHasPoint(val);
+      },
+      handleInput2(val) {
+        this.form.purchaseMultiplier = this.$handleInputPublicHasPoint(val);
+      },
+      handleInput3(val) {
+        this.form.minimumOrderQuantity = this.$handleInputPublicHasPoint(val);
+      }
     }
-  }
-};
+  };
 </script>
 
 <style lang="scss" scoped>
-.other {
-  background: #fff;
-  padding: 1px 17px;
-}
+  .other {
+    background: #fff;
+    padding: 1px 17px;
+  }
 
-.divider {
-  margin: 0px 0 20px;
+  .divider {
+    margin: 0px 0 20px;
 
-  .title {
-    display: flex;
-    align-items: center;
-    margin-bottom: 10px;
+    .title {
+      display: flex;
+      align-items: center;
+      margin-bottom: 10px;
 
-    div {
-      width: 8px;
-      height: 20px;
-      margin-right: 10px;
-    }
+      div {
+        width: 8px;
+        height: 20px;
+        margin-right: 10px;
+      }
 
-    span {
-      font-size: 20px;
+      span {
+        font-size: 20px;
+      }
     }
-  }
 
-  .ele-width {
-    width: 100%;
-    height: 2px;
+    .ele-width {
+      width: 100%;
+      height: 2px;
+    }
   }
-}
 
-.form-line {
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
+  .form-line {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
 
-  .line-select {
-    margin-left: 15px;
+    .line-select {
+      margin-left: 15px;
+    }
   }
-}
 
-::v-deep .el-input-number .el-input__inner {
-  text-align: left !important;
-}
+  ::v-deep .el-input-number .el-input__inner {
+    text-align: left !important;
+  }
 </style>

+ 433 - 338
src/views/material/product/components/WarehouseInfo.vue

@@ -25,16 +25,24 @@
         </el-col>
         <el-col :span="8">
           <el-form-item label="允许拆包" prop="isUnpack">
-            <el-switch v-model="form.isUnpack" :active-value="1" :inactive-value="0">
+            <el-switch
+              v-model="form.isUnpack"
+              :active-value="1"
+              :inactive-value="0"
+            >
             </el-switch>
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item label="安全库存" prop="secureInventory" :rules="{
-            required: this.form.isWarn == 1 ? true : false,
-            message: '请输入安全库存',
-            trigger: 'blur'
-          }">
+          <el-form-item
+            label="安全库存"
+            prop="secureInventory"
+            :rules="{
+              required: this.form.isWarn == 1 ? true : false,
+              message: '请输入安全库存',
+              trigger: 'blur'
+            }"
+          >
             <el-input v-model="form.secureInventory" @input="handleInput1">
               <template #append>
                 {{ measuringUnit }}
@@ -43,11 +51,15 @@
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item label="最小库存" prop="minInventory" :rules="{
-            required: this.form.isWarn == 1 ? true : false,
-            message: '请输入最小库存',
-            trigger: 'blur'
-          }">
+          <el-form-item
+            label="最小库存"
+            prop="minInventory"
+            :rules="{
+              required: this.form.isWarn == 1 ? true : false,
+              message: '请输入最小库存',
+              trigger: 'blur'
+            }"
+          >
             <el-input v-model="form.minInventory" @input="handleInput2">
               <template #append>
                 {{ measuringUnit }}
@@ -56,11 +68,15 @@
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item label="最大库存" prop="maxInventory" :rules="{
-            required: this.form.isWarn == 1 ? true : false,
-            message: '请输入最大库存',
-            trigger: 'blur'
-          }">
+          <el-form-item
+            label="最大库存"
+            prop="maxInventory"
+            :rules="{
+              required: this.form.isWarn == 1 ? true : false,
+              message: '请输入最大库存',
+              trigger: 'blur'
+            }"
+          >
             <el-input v-model="form.maxInventory" @input="handleInput3">
               <template #append>
                 {{ measuringUnit }}
@@ -71,25 +87,57 @@
 
         <el-col :span="8">
           <el-form-item label="质保预警参考" prop="warrantyWarnRefer">
-            <DictSelection dictName="质保预警参考" clearable v-model="form.warrantyWarnRefer">
+            <DictSelection
+              dictName="质保预警参考"
+              clearable
+              v-model="form.warrantyWarnRefer"
+            >
             </DictSelection>
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item label="保质期">
+          <el-form-item
+            label="保质期"
+            prop="warrantyPeriod"
+            :rules="{
+              required: clientEnvironmentId == 10 ? true : false,
+              message: '请输入保质期',
+              trigger: 'blur'
+            }"
+          >
             <div class="form-line">
-              <el-input v-model="form.warrantyPeriod" @input="handleInput4" style="width: calc(100% - 100px)" />
-              <DictSelection dictName="保质期单位" clearable v-model="form.warrantyPeriodUnit" style="width: 100px">
+              <el-input
+                v-model="form.warrantyPeriod"
+                @input="handleInput4"
+                style="width: calc(100% - 100px)"
+              />
+              <DictSelection
+                dictName="保质期单位"
+                clearable
+                v-model="form.warrantyPeriodUnit"
+                style="width: 100px"
+              >
               </DictSelection>
             </div>
           </el-form-item>
         </el-col>
       </el-row>
       <div class="rules_box">
-        <el-button type="primary" @click="addPackingRules">添加包装组</el-button>
-        <el-tabs v-model="packingRules" editable @tab-click="handleClick" @edit="handleTabsEdit">
-          <el-tab-pane v-for="(items, indexs) in packagingSpecification" :label="items.name" :name="items.code"
-            :key="indexs">
+        <el-button type="primary" @click="addPackingRules"
+          >添加包装组</el-button
+        >
+        <el-tabs
+          v-model="packingRules"
+          editable
+          @tab-click="handleClick"
+          @edit="handleTabsEdit"
+        >
+          <el-tab-pane
+            v-for="(items, indexs) in packagingSpecification"
+            :label="items.name"
+            :name="items.code"
+            :key="indexs"
+          >
             <div class="rules_box_tabs">
               <el-row :gutter="24">
                 <el-col :span="8">
@@ -104,7 +152,10 @@
                 </el-col>
                 <el-col :span="8">
                   <el-form-item label="是否启用">
-                    <el-radio-group v-model="items.status" @input="statusChange($event, indexs)">
+                    <el-radio-group
+                      v-model="items.status"
+                      @input="statusChange($event, indexs)"
+                    >
                       <el-radio :label="1">是</el-radio>
                       <el-radio :label="0">否</el-radio>
                     </el-radio-group>
@@ -112,42 +163,82 @@
                 </el-col>
                 <el-col :span="24">
                   <el-form-item label="最小包装单元">
-                    <el-input class="packingUnit" v-model="items.minPackageCell" placeholder="请输入内容" type="number"></el-input>
+                    <el-input
+                      class="packingUnit"
+                      v-model="items.minPackageCell"
+                      placeholder="请输入内容"
+                      type="number"
+                    ></el-input>
                     <div class="packingUnit">
-                      <DictSelection dictName="计量单位" clearable v-model="items.packageUnit" :isProhibit="true">
+                      <DictSelection
+                        dictName="计量单位"
+                        clearable
+                        v-model="items.packageUnit"
+                        :isProhibit="true"
+                      >
                       </DictSelection>
                     </div>
                     <span>/</span>
                     <div class="lastPackingUnit">
-                      <DictSelection dictName="计量单位" clearable v-model="items.minConversionUnit">
+                      <DictSelection
+                        dictName="计量单位"
+                        clearable
+                        v-model="items.minConversionUnit"
+                      >
                       </DictSelection>
                     </div>
                   </el-form-item>
                 </el-col>
                 <el-col :span="24">
                   <el-form-item label="内包装单元">
-                    <el-input class="packingUnit" v-model="items.inPackageCell" placeholder="请输入内容" type="number"></el-input>
+                    <el-input
+                      class="packingUnit"
+                      v-model="items.inPackageCell"
+                      placeholder="请输入内容"
+                      type="number"
+                    ></el-input>
                     <div class="packingUnit">
-                      <DictSelection dictName="计量单位" clearable v-model="items.minConversionUnit">
+                      <DictSelection
+                        dictName="计量单位"
+                        clearable
+                        v-model="items.minConversionUnit"
+                      >
                       </DictSelection>
                     </div>
                     <span>/</span>
                     <div class="lastPackingUnit">
-                      <DictSelection dictName="计量单位" clearable v-model="items.inConversionUnit">
+                      <DictSelection
+                        dictName="计量单位"
+                        clearable
+                        v-model="items.inConversionUnit"
+                      >
                       </DictSelection>
                     </div>
                   </el-form-item>
                 </el-col>
                 <el-col :span="24">
                   <el-form-item label="外包装单元">
-                    <el-input class="packingUnit" v-model="items.outPackageCell" placeholder="请输入内容" type="number"></el-input>
+                    <el-input
+                      class="packingUnit"
+                      v-model="items.outPackageCell"
+                      placeholder="请输入内容"
+                      type="number"
+                    ></el-input>
                     <div class="packingUnit">
-                      <DictSelection dictName="计量单位" clearable v-model="items.inConversionUnit">
+                      <DictSelection
+                        dictName="计量单位"
+                        clearable
+                        v-model="items.inConversionUnit"
+                      >
                       </DictSelection>
                     </div>
                     <span>/</span>
                     <div class="lastPackingUnit">
-                      <DictSelection dictName="计量单位" clearable v-model="items.outConversionUnit">
+                      <DictSelection
+                        dictName="计量单位"
+                        clearable
+                        v-model="items.outConversionUnit"
+                      >
                       </DictSelection>
                     </div>
                   </el-form-item>
@@ -182,176 +273,234 @@
 </template>
 
 <script>
-import deptSelect from '@/components/CommomSelect/dept-select.vue';
-import personSelect from '@/components/CommomSelect/person-select.vue';
-import { deletePackageDisposition } from '@/api/material/list.js';
-import { getCode } from '@/api/codeManagement/index.js';
-export default {
-  components: { deptSelect, personSelect },
-  props: {
-    form: {
-      type: Object,
-      default: () => { }
-    },
-    packageDispositionVOList: {
-      type: Array,
-      default: () => []
+  import deptSelect from '@/components/CommomSelect/dept-select.vue';
+  import personSelect from '@/components/CommomSelect/person-select.vue';
+  import { deletePackageDisposition } from '@/api/material/list.js';
+  import { getCode } from '@/api/codeManagement/index.js';
+  export default {
+    components: { deptSelect, personSelect },
+    props: {
+      form: {
+        type: Object,
+        default: () => {}
+      },
+      packageDispositionVOList: {
+        type: Array,
+        default: () => []
+      },
+      measuringUnit: {
+        type: String,
+        default() {
+          return '';
+        }
+      },
+      packingUnit: {
+        type: String,
+        default() {
+          return '';
+        }
+      }
     },
-    measuringUnit: {
-      type: String,
-      default() {
-        return '';
+    watch: {
+      measuringUnit(val) {
+        this.packagingSpecification = this.packagingSpecification.map(
+          (item) => {
+            return { ...item, packageUnit: val };
+          }
+        );
+      },
+      packingUnit(val) {
+        this.packagingSpecification = this.packagingSpecification.map(
+          (item) => {
+            return { ...item, minConversionUnit: val };
+          }
+        );
+      },
+      packagingSpecification: {
+        handler(val) {
+          this.$emit('change', val);
+        },
+        deep: true
+      },
+      packageDispositionVOList: {
+        handler(packageDispositionVOList) {
+          if (packageDispositionVOList.length > 0) {
+            let codeList = new Set(
+              packageDispositionVOList.map((item) => item.code)
+            );
+            console.log(codeList);
+            let arr = [];
+            codeList.forEach((code) => {
+              let obj = {};
+              let filters = packageDispositionVOList.filter(
+                (item) => item.code == code
+              );
+              this.idsList.push({
+                code,
+                ids: filters.map((item) => item.id)
+              });
+              filters.map((item) => {
+                obj['id' + item.sort] = item.id;
+                switch (item.sort) {
+                  case '0':
+                    obj.code = item.code;
+                    obj.name = item.name;
+                    obj.status = Number(item.status);
+                    break;
+                  case '1':
+                    obj.minPackageCell = item.packageCell;
+                    obj.packageUnit = item.packageUnit;
+                    obj.minConversionUnit = item.conversionUnit;
+                  case '2':
+                    obj.inPackageCell = item.packageCell;
+                    obj.inConversionUnit = item.conversionUnit;
+                    break;
+                  case '3':
+                    obj.outPackageCell = item.packageCell;
+                    obj.outConversionUnit = item.conversionUnit;
+                    break;
+                }
+              });
+              arr.push(obj);
+            });
+            this.packagingSpecification = arr;
+            this.packingRules = arr[0].code;
+          } else {
+            this.packagingSpecification = [];
+          }
+        },
+        deep: true
       }
     },
-    packingUnit: {
-      type: String,
-      default() {
-        return '';
+    data() {
+      return {
+        idsList: [],
+        packagingSpecification: [],
+        packingRules: '',
+        dialogVisible: false,
+        ruleItem: {
+          code: '',
+          name: '',
+          status: 0,
+          minPackageCell: '',
+          packageUnit: this.measuringUnit,
+          minConversionUnit: '',
+          inPackageCell: '',
+          inConversionUnit: '',
+          outPackageCell: '',
+          inConversionUnit: '',
+          outConversionUnit: ''
+        },
+        option: [
+          {
+            label: 'KG',
+            value: 'KG'
+          }
+        ],
+        hasPushed: false
+      };
+    },
+    computed: {
+      clientEnvironmentId() {
+        return this.$store.state.user.info.clientEnvironmentId;
       }
     },
-  },
-  watch: {
-    measuringUnit(val) {
-      this.packagingSpecification = this.packagingSpecification.map(
-        (item) => {
-          return { ...item, packageUnit: val };
-        }
+    created() {
+      console.log(
+        'this.packageDispositionVOList------------------包装组',
+        this.packageDispositionVOList,
+        this.form
       );
+      if (this.packageDispositionVOList.length == 0) {
+        this.hasPushed = false;
+      }
+      console.log(this.hasPushed, 'has');
     },
-    packingUnit(val) {
-      this.packagingSpecification = this.packagingSpecification.map(
-        (item) => {
-          return { ...item, minConversionUnit: val };
+    mounted() {},
+    methods: {
+      changeNetWeight(val) {
+        console.log(val);
+        if (this.packagingSpecification.length > 0) {
+          this.$nextTick(() => {
+            this.packagingSpecification[0].minPackageCell = val;
+          });
         }
-      );
-    },
-    packagingSpecification: {
-      handler(val) {
-        this.$emit('change', val);
       },
-      deep: true
-    },
-    packageDispositionVOList: {
-      handler(packageDispositionVOList) {
-        if (packageDispositionVOList.length > 0) {
-          let codeList = new Set(
-            packageDispositionVOList.map((item) => item.code)
-          );
-          console.log(codeList);
-          let arr = [];
-          codeList.forEach((code) => {
-            let obj = {};
-            let filters = packageDispositionVOList.filter(
-              (item) => item.code == code
-            );
-            this.idsList.push({
-              code,
-              ids: filters.map((item) => item.id)
-            });
-            filters.map((item) => {
-              obj['id' + item.sort] = item.id;
-              switch (item.sort) {
-                case '0':
-                  obj.code = item.code;
-                  obj.name = item.name;
-                  obj.status = Number(item.status);
-                  break;
-                case '1':
-                  obj.minPackageCell = item.packageCell;
-                  obj.packageUnit = item.packageUnit;
-                  obj.minConversionUnit = item.conversionUnit;
-                case '2':
-                  obj.inPackageCell = item.packageCell;
-                  obj.inConversionUnit = item.conversionUnit;
-                  break;
-                case '3':
-                  obj.outPackageCell = item.packageCell;
-                  obj.outConversionUnit = item.conversionUnit;
-                  break;
-              }
-            });
-            arr.push(obj);
-          });
-          this.packagingSpecification = arr;
-          this.packingRules = arr[0].code;
+      handleInput1(value) {
+        this.form.secureInventory = this.$handleInputPublic(value);
+      },
+      handleInput2(value) {
+        this.form.minInventory = this.$handleInputPublic(value);
+      },
+      handleInput3(value) {
+        this.form.maxInventory = this.$handleInputPublic(value);
+      },
+      handleInput4(value) {
+        this.form.warrantyPeriod = this.$handleInputPublicHasPoint(value);
+      },
+
+      async defaultBuild(val) {
+        console.log(this.hasPushed, 'jjjjjjjjjjj');
+        if (!this.hasPushed) {
+          let code = await getCode('package_disposition');
+          this.ruleItem = {
+            code: code,
+            name: '默认包装组',
+            status: 1,
+            minPackageCell: '1',
+            packageUnit: this.measuringUnit,
+            minConversionUnit: this.packingUnit,
+            inPackageCell: '',
+            inConversionUnit: '',
+            outPackageCell: '',
+            inConversionUnit: '',
+            outConversionUnit: ''
+          };
+          this.packagingSpecification.push(this.ruleItem);
+          console.log('111111第一次添加');
+          this.packingRules = this.ruleItem.code;
+          this.hasPushed = true;
         } else {
-          this.packagingSpecification = [];
+          console.log('数组已经进行过push操作,无法再次添加元素。');
+          this.packagingSpecification = this.packagingSpecification.map(
+            (item) => {
+              return { ...item, minConversionUnit: val };
+            }
+          );
         }
       },
-      deep: true
-    }
-  },
-  data() {
-    return {
-      idsList: [],
-      packagingSpecification: [],
-      packingRules: '',
-      dialogVisible: false,
-      ruleItem: {
-        code: '',
-        name: '',
-        status: 0,
-        minPackageCell: '',
-        packageUnit: this.measuringUnit,
-        minConversionUnit: '',
-        inPackageCell: '',
-        inConversionUnit: '',
-        outPackageCell: '',
-        inConversionUnit: '',
-        outConversionUnit: ''
+      statusChange(value, indexs) {
+        console.log(value);
+        if (value == 1) {
+          this.packagingSpecification = this.packagingSpecification.map(
+            (item, index) => {
+              if (indexs == index) {
+                item.status = 1;
+              } else {
+                item.status = 0;
+              }
+              return item;
+            }
+          );
+        }
       },
-      option: [
-        {
-          label: 'KG',
-          value: 'KG'
+      ruleConig() {
+        console.log(this.ruleItem);
+        if (this.packagingSpecification.length == 0) {
+          this.ruleItem.status = 1;
+        } else {
+          this.ruleItem.status = 0;
         }
-      ],
-      hasPushed: false
-    };
-  },
-  created() {
-    console.log(
-      'this.packageDispositionVOList------------------包装组',
-      this.packageDispositionVOList, this.form
-    );
-    if (this.packageDispositionVOList.length == 0) {
-      this.hasPushed = false;
-    }
-    console.log(this.hasPushed, 'has');
-  },
-  mounted() {
-
-  },
-  methods: {
-    changeNetWeight(val) {
-      console.log(val)
-      if (this.packagingSpecification.length > 0) {
-        this.$nextTick(() => {
-          this.packagingSpecification[0].minPackageCell = val
-        })
-      }
-    },
-    handleInput1(value) {
-      this.form.secureInventory = this.$handleInputPublic(value);
-    },
-    handleInput2(value) {
-      this.form.minInventory = this.$handleInputPublic(value);
-    },
-    handleInput3(value) {
-      this.form.maxInventory = this.$handleInputPublic(value);
-    },
-    handleInput4(value) {
-      this.form.warrantyPeriod = this.$handleInputPublicHasPoint(value);
-    },
-
-    async defaultBuild(val) {
-      console.log(this.hasPushed, 'jjjjjjjjjjj')
-      if (!this.hasPushed) {
+        this.packagingSpecification.push(this.ruleItem);
+        this.dialogVisible = false;
+        this.packingRules = this.ruleItem.code;
+      },
+      async addPackingRules() {
         let code = await getCode('package_disposition');
         this.ruleItem = {
           code: code,
-          name: '默认包装组',
-          status: 1,
+          name: '',
+          status: 0,
           minPackageCell: '1',
           packageUnit: this.measuringUnit,
           minConversionUnit: this.packingUnit,
@@ -361,180 +510,126 @@ export default {
           inConversionUnit: '',
           outConversionUnit: ''
         };
-        this.packagingSpecification.push(this.ruleItem);
-        console.log('111111第一次添加');
-        this.packingRules = this.ruleItem.code;
-        this.hasPushed = true;
-      } else {
-        console.log('数组已经进行过push操作,无法再次添加元素。');
-        this.packagingSpecification = this.packagingSpecification.map(
-          (item) => {
-            return { ...item, minConversionUnit: val };
-          }
-        );
-      }
-    },
-    statusChange(value, indexs) {
-      console.log(value);
-      if (value == 1) {
-        this.packagingSpecification = this.packagingSpecification.map(
-          (item, index) => {
-            if (indexs == index) {
-              item.status = 1;
-            } else {
-              item.status = 0;
-            }
-            return item;
-          }
-        );
-      }
-    },
-    ruleConig() {
-      console.log(this.ruleItem);
-      if (this.packagingSpecification.length == 0) {
-        this.ruleItem.status = 1;
-      } else {
-        this.ruleItem.status = 0;
-      }
-      this.packagingSpecification.push(this.ruleItem);
-      this.dialogVisible = false;
-      this.packingRules = this.ruleItem.code;
-    },
-    async addPackingRules() {
-      let code = await getCode('package_disposition');
-      this.ruleItem = {
-        code: code,
-        name: '',
-        status: 0,
-        minPackageCell: '1',
-        packageUnit: this.measuringUnit,
-        minConversionUnit: this.packingUnit,
-        inPackageCell: '',
-        inConversionUnit: '',
-        outPackageCell: '',
-        inConversionUnit: '',
-        outConversionUnit: ''
-      };
-      this.dialogVisible = true;
-    },
-    handleClick(val) {
-      console.log(val);
-      this.packingRules = val.name;
-    },
-    // 删除tab
-    handleTabsEdit(targetName, action) {
-      if (action == 'remove') {
-        let index = this.packagingSpecification.findIndex(
-          (item) => item.code == targetName
-        );
-        let idsIndex = this.idsList.findIndex(
-          (item) => item.code == targetName
-        );
-        if (this.idsList.length > 0 && idsIndex > -1) {
-          let ids = this.idsList.filter(
-            (item) => item.code == this.packagingSpecification[index].code
-          )[0].ids;
-          deletePackageDisposition(ids).then(() => {
-            this.idsList = this.idsList.filter(
-              (item) => item.code != this.packagingSpecification[index].code
-            );
+        this.dialogVisible = true;
+      },
+      handleClick(val) {
+        console.log(val);
+        this.packingRules = val.name;
+      },
+      // 删除tab
+      handleTabsEdit(targetName, action) {
+        if (action == 'remove') {
+          let index = this.packagingSpecification.findIndex(
+            (item) => item.code == targetName
+          );
+          let idsIndex = this.idsList.findIndex(
+            (item) => item.code == targetName
+          );
+          if (this.idsList.length > 0 && idsIndex > -1) {
+            let ids = this.idsList.filter(
+              (item) => item.code == this.packagingSpecification[index].code
+            )[0].ids;
+            deletePackageDisposition(ids).then(() => {
+              this.idsList = this.idsList.filter(
+                (item) => item.code != this.packagingSpecification[index].code
+              );
+              this.packagingSpecification.splice(index, 1);
+            });
+          } else {
             this.packagingSpecification.splice(index, 1);
-          });
-        } else {
-          this.packagingSpecification.splice(index, 1);
+          }
         }
-      }
-    },
-    // inventoryModeChange(value) {
-    //   if (value == 1) {
-    //     this.form.isUnpack = 1;
-    //   } else {
-    //     this.form.isUnpack = 0;
-    //   }
-    // },
-    // 选择所属部门
-    searchDeptNodeClick(id, info) {
-      // 根据部门获取人员
-      const params = { executeGroupId: id };
-      this.$nextTick(() => {
-        this.$refs.directorRef.getList(params);
-      });
-    },
-    //选择负责人
-    handleDirectorChange(id, info) { },
-    getFormValid() {
-      return new Promise((resolve, reject) => {
-        this.$refs.form1.validate(async (valid) => {
-          resolve(await valid);
+      },
+      // inventoryModeChange(value) {
+      //   if (value == 1) {
+      //     this.form.isUnpack = 1;
+      //   } else {
+      //     this.form.isUnpack = 0;
+      //   }
+      // },
+      // 选择所属部门
+      searchDeptNodeClick(id, info) {
+        // 根据部门获取人员
+        const params = { executeGroupId: id };
+        this.$nextTick(() => {
+          this.$refs.directorRef.getList(params);
         });
-      });
+      },
+      //选择负责人
+      handleDirectorChange(id, info) {},
+      getFormValid() {
+        return new Promise((resolve, reject) => {
+          this.$refs.form1.validate(async (valid) => {
+            resolve(await valid);
+          });
+        });
+      }
     }
-  }
-};
+  };
 </script>
 
 <style lang="scss" scoped>
-.other {
-  background: #fff;
-  padding: 1px 17px;
-}
+  .other {
+    background: #fff;
+    padding: 1px 17px;
+  }
 
-.divider {
-  margin: 0px 0 20px;
+  .divider {
+    margin: 0px 0 20px;
 
-  .title {
-    display: flex;
-    align-items: center;
-    margin-bottom: 10px;
+    .title {
+      display: flex;
+      align-items: center;
+      margin-bottom: 10px;
 
-    div {
-      width: 8px;
-      height: 20px;
-      margin-right: 10px;
-    }
+      div {
+        width: 8px;
+        height: 20px;
+        margin-right: 10px;
+      }
 
-    span {
-      font-size: 20px;
+      span {
+        font-size: 20px;
+      }
     }
-  }
 
-  .ele-width {
-    width: 100%;
-    height: 2px;
+    .ele-width {
+      width: 100%;
+      height: 2px;
+    }
   }
-}
 
-.form-line {
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
+  .form-line {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
 
-  .line-select {
-    margin-left: 15px;
+    .line-select {
+      margin-left: 15px;
+    }
   }
-}
 
-.rules_box {
-  margin: 0px 20px 20px 0;
+  .rules_box {
+    margin: 0px 20px 20px 0;
 
-  .rules_box_tabs {
-    margin: 20px 0;
+    .rules_box_tabs {
+      margin: 20px 0;
 
-    :deep(.el-form-item__content) {
-      >div {
-        display: inline-block;
+      :deep(.el-form-item__content) {
+        > div {
+          display: inline-block;
+        }
       }
     }
   }
-}
 
-.packingUnit {
-  width: 200px;
-  margin-right: 10px;
-}
+  .packingUnit {
+    width: 200px;
+    margin-right: 10px;
+  }
 
-.lastPackingUnit {
-  width: 200px;
-  margin-left: 10px;
-}
+  .lastPackingUnit {
+    width: 200px;
+    margin-left: 10px;
+  }
 </style>

+ 59 - 38
src/views/material/product/detail.vue

@@ -286,7 +286,7 @@
           </el-col>
 
           <el-col :span="8" v-for="(f, idx) in fileList" :key="idx">
-            <el-form-item :label="f.label">
+            <el-form-item :label="f.label"  :prop="'extField.'+f.prop">
               <template>
                 <div class="form-line">
                   <component
@@ -584,43 +584,7 @@
         ],
         fileList: [],
         // 表单验证规则
-        rules: {
-          measureType: [
-            { required: true, message: '请选择计量类型', trigger: 'change' }
-          ],
-          categoryLevelGroupName: [
-            { required: true, message: '请选择所属物料组', trigger: 'change' }
-          ],
-          code: [{ required: true, message: '请输入编码', trigger: 'blur' }],
-          name: [{ required: true, message: '请输入名称', trigger: 'blur' }],
-          // produceType: [
-          //   { required: true, message: '请选择生产类型', trigger: 'change' }
-          // ],
-          componentAttribute: [
-            { required: true, message: '请选择属性类型', trigger: 'change' }
-          ],
-          attributeType: [
-            { required: true, message: '请选择属性类型', trigger: 'change' }
-          ],
-          categoryLevelName: [
-            { required: true, message: '请选择所属分类', trigger: 'change' }
-          ],
-          measuringUnit: [
-            { required: true, message: '请选择计量单位', trigger: 'change' }
-          ],
-
-          weightUnit: [
-            { required: true, message: '请选择重量单位', trigger: 'change' }
-          ],
-
-          packingUnit: [
-            { required: true, message: '请选择包装单位', trigger: 'change' }
-          ],
 
-          netWeight: [
-            { required: true, message: '请输入净重', trigger: 'blur' }
-          ]
-        },
         PathInfo: {},
         id: null,
 
@@ -712,6 +676,64 @@
     computed: {
       clientEnvironmentId() {
         return this.$store.state.user.info.clientEnvironmentId;
+      },
+      rules() {
+        return {
+          measureType: [
+            { required: true, message: '请选择计量类型', trigger: 'change' }
+          ],
+          categoryLevelGroupName: [
+            { required: true, message: '请选择所属物料组', trigger: 'change' }
+          ],
+          code: [{ required: true, message: '请输入编码', trigger: 'blur' }],
+          name: [{ required: true, message: '请输入名称', trigger: 'blur' }],
+          specification: [
+            {
+              required: this.clientEnvironmentId == 10 ? true : false,
+              message: '请输入规格',
+              trigger: 'blur'
+            }
+          ],
+          modelType: [
+            {
+              required: this.clientEnvironmentId == 10 ? true : false,
+              message: '请输入型号',
+              trigger: 'blur'
+            }
+          ],
+          'extField.layBy': [
+            {
+              required: this.clientEnvironmentId == 10 ? true : false,
+              message: '请输入贮藏',
+              trigger: 'blur'
+            }
+          ],
+
+          componentAttribute: [
+            { required: true, message: '请选择属性类型', trigger: 'change' }
+          ],
+          attributeType: [
+            { required: true, message: '请选择属性类型', trigger: 'change' }
+          ],
+          categoryLevelName: [
+            { required: true, message: '请选择所属分类', trigger: 'change' }
+          ],
+          measuringUnit: [
+            { required: true, message: '请选择计量单位', trigger: 'change' }
+          ],
+
+          weightUnit: [
+            { required: true, message: '请选择重量单位', trigger: 'change' }
+          ],
+
+          packingUnit: [
+            { required: true, message: '请选择包装单位', trigger: 'change' }
+          ],
+
+          netWeight: [
+            { required: true, message: '请输入净重', trigger: 'blur' }
+          ]
+        };
       }
     },
     async activated() {
@@ -776,7 +798,6 @@
       if (this.clientEnvironmentId == 4) {
         this.form.measureType = 3;
         this.$set(this.categoryWms, 'isUnpack', 0);
-
       }
     },
     methods: {