戴艳蓉 3 years ago
parent
commit
84e578cca6

+ 0 - 0
src/components/globalComponents/goodsClass/index.js → src/components/globalComponents/goodClass/index.js


+ 2 - 17
src/components/globalComponents/goodsClass/main.vue → src/components/globalComponents/goodClass/main.vue

@@ -1,13 +1,7 @@
 <template>
   <div class="select-goodsClass">
-    <!-- <el-cascader
-      filterable
-      clearable
-      :props="props"
-      @getCheckedNodes="getCheckedNodes"
-    ></el-cascader> -->
     <el-cascader
-      v-if="!loading"
+     v-loading="loading"
       style="width: 100%"
       :disabled="disabled"
       v-model="value"
@@ -16,12 +10,7 @@
       :size="size || 'medium'"
       :props="props"
       @change="handleChange"
-      @getCheckedNodes="getCheckedNodes"
     ></el-cascader>
-    <div class="loading-input" :class="{ disabled: disabled }" v-else>
-      <i class="el-icon-loading"></i>
-      <span>{{ placeholder || "" }}</span>
-    </div>
   </div>
 </template>
 
@@ -30,7 +19,7 @@ import asyncRequest from "@/apis/components/goods-class";
 import resToken from "@/mixins/resToken";
 import { isArray } from "@/utils/validate";
 export default {
-  name: "goodsClasss",
+  name: "goodClass",
   mixins: [resToken],
   props: ["size", "value", "placeholder", "isDetail", "disabled"],
   /**
@@ -73,11 +62,7 @@ export default {
     this.selectLoading = false;
   },
   methods: {
-    getCheckedNodes(e) {
-      console.log(e);
-    },
     handleChange(value) {
-      console.log(value);
       this.$emit("handleChange", value);
     },
     async selectChange(e) {

+ 0 - 0
src/components/globalComponents/goodsClass/商品分类 → src/components/globalComponents/goodClass/商品分类


+ 1 - 1
src/views/purchaseIn/storeManage/addModel.vue

@@ -3,7 +3,7 @@
     title="新建备货申请"
     :center="true"
     align="left"
-    top="18vh"
+    top="15vh"
     width="600px"
     @close="closeModel"
     :close-on-click-modal="false"

+ 44 - 12
src/views/purchaseIn/storeManage/components/addEdit.vue

@@ -9,7 +9,16 @@
       class="demo-ruleForm"
     >
       <el-row>
-        <el-col :span="24">
+        <el-col :span="type === '1' ? 12 : 24">
+          <el-form-item label="商品分类" prop="goods_name">
+            <good-class
+              :value="ruleForm.goods_class"
+              @handleChange="goods_class_change"
+              :placeholder="'商品分类'"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="type === '1' ? 12 : 24">
           <el-form-item label="商品名称" prop="goods_name">
             <el-input
               :disabled="
@@ -20,12 +29,13 @@
               "
               v-model="ruleForm.goods_name"
               readonly="true"
+              :placeholder="'商品名称'"
               @focus="hand"
             ></el-input>
           </el-form-item>
         </el-col>
         <!-- 采购数量 -->
-        <el-col :span="24">
+        <el-col :span="type === '1' ? 12 : 24">
           <el-form-item label="采购数量" prop="goods_num">
             <el-input
               :disabled="
@@ -40,7 +50,7 @@
           </el-form-item>
         </el-col>
         <!-- 最晚入库时间 -->
-        <el-col :span="24">
+        <el-col :span="type === '1' ? 12 : 24">
           <el-form-item label="最晚入库时间" prop="last_go_stock">
             <el-date-picker
               v-model="ruleForm.last_go_stock"
@@ -61,8 +71,8 @@
           </el-form-item>
         </el-col>
         <!-- 供应商选择 -->
-        <el-col :span="24">
-          <el-form-item label="供应商名称" prop="supplier_code">
+        <el-col :span="type === '1' ? 12 : 24">
+          <el-form-item label="入库公司" prop="supplier_code">
             <search-supplier
               :disabled="
                 !(
@@ -71,19 +81,19 @@
                 )
               "
               :value="ruleForm.supplier_code"
-              :placeholder="'请选择供应商'"
+              :placeholder="'入库公司'"
               :names="''"
               @searchChange="selectSupplier"
             />
           </el-form-item>
         </el-col>
         <!-- 仓库名称 -->
-        <el-col :span="24">
-          <el-form-item label="仓库名称" prop="stock_code">
+        <el-col :span="type === '1' ? 12 : 24">
+          <el-form-item label="入库仓库" prop="stock_code">
             <search-stock
               :disabled="!(id == 'add' || status === '0')"
               :value="ruleForm.stock_code"
-              :placeholder="'请选择备库仓库'"
+              :placeholder="'库仓库'"
               :isRelation="true"
               :names="''"
               :companyCode="companyCode"
@@ -120,7 +130,7 @@ import { isnumber } from "@/utils/validate";
 import searchStockGoodModal from "@/components/search-stock-good-modal";
 export default {
   name: "storeManage",
-  props: ["id", "sitem", "newTime"],
+  props: ["id", "sitem", "newTime", "type"],
   mixins: [resToken],
   components: { searchStockGoodModal },
   computed: {
@@ -169,6 +179,7 @@ export default {
       loading: false,
       ruleForm: {
         id: "",
+        goods_class: [],
         good_code: "",
         good_type_code: "",
         goods_name: "",
@@ -180,6 +191,14 @@ export default {
       },
       rulesThis: this.rules,
       rules: {
+        goods_class: [
+          {
+            type: "array",
+            required: true,
+            message: "请选择商品分类",
+            trigger: "change",
+          },
+        ],
         //出入库规则
         goods_name: [
           {
@@ -206,7 +225,7 @@ export default {
           {
             type: "array",
             required: true,
-            message: "请选择供应商",
+            message: "请选择供入库公司",
             trigger: "change",
           },
         ],
@@ -214,7 +233,7 @@ export default {
           {
             type: "array",
             required: true,
-            message: "请选择仓库",
+            message: "请选择入库仓库",
             trigger: "change",
           },
         ],
@@ -236,6 +255,14 @@ export default {
       await this.resetForm();
       this.loading = false;
     },
+    goods_class_change(e) {
+      this.ruleForm.goods_class = e;
+      this.$refs.ruleForm.validateField("goods_class");
+      this.ruleForm.good_type_code = "";
+      this.ruleForm.goods_name = "";
+      this.ruleForm.goods_num = "";
+      this.$refs.ruleForm.validateField("good_type_code");
+    },
     // 最晚入库时间选择
     selectTime(e) {
       this.ruleForm.expecttime = e;
@@ -273,6 +300,10 @@ export default {
       this.$refs.ruleForm.validateField("goods_name");
     },
     hand() {
+      if (this.ruleForm.goods_class.length === 0) {
+        this.$message.warning("请选择商品分类!");
+        return;
+      }
       this.showGoodsModel = true;
     },
     // 最晚入库时间选择
@@ -306,6 +337,7 @@ export default {
             this.companyCode = wsm_supplierNo;
             this.ruleForm = {
               id,
+              goods_class: [],
               good_code,
               good_type_code,
               goods_name: good_name,

+ 1 - 0
src/views/purchaseIn/storeManage/detail.vue

@@ -34,6 +34,7 @@
         :sitem="sitem"
         :id="queryId"
         :newTime="newTime"
+        :type="'1'"
         @refresh="initData"
         v-if="newTime != ''"
       />

+ 0 - 7
src/views/stock/check/components/addEdit.vue

@@ -82,11 +82,6 @@
         </el-col>
       </el-row>
     </el-form>
-    <search-good-modal
-      :show-model="showGoodsModel"
-      @cancel="showGoodsModel = false"
-      @resultList="addGoodsRes"
-    />
   </div>
 </template>
    <script>
@@ -117,7 +112,6 @@ export default {
       companyCode: "",
       companyName: "",
       loading: false,
-      showGoodsModel: false,
       typeList: [
         {
           value: "2",
@@ -177,7 +171,6 @@ export default {
     closeModel() {
       console.log("closeModel!!");
     },
-    addGoodsRes(e) {},
     //供应商选择
     supplierChange(e) {
       if (e && e.id) {