是否组套修改

8 months ago · 42f4dedf15
parent a7517e24a9
commit 42f4dedf15
4 changed files with 129 additions and 62 deletions
--- a/src/views/basic/product/productEdit.vue
+++ b/src/views/basic/product/productEdit.vue
@ -507,6 +507,23 @@
              </el-col>
            </el-row>
            <el-divider></el-divider>
+            <el-row>
+              <el-col span="5">
+                <span class="sptext">是否组套</span>
+              </el-col>
+              <el-divider direction="vertical"></el-divider>
+              <el-col span="5">
+                <el-select v-model="editQuery.isStack" style="width: 65%" placeholder="选择是否组套" clearable>
+                  <el-option label="是" :value="true"></el-option>
+                  <el-option label="否" :value="false"></el-option>
+                </el-select>
+              </el-col>
+              <el-divider direction="vertical"></el-divider>
+              <el-col span="13">
+                <span class="sptext">是否组套</span>
+              </el-col>
+            </el-row>
+            <el-divider></el-divider>
            <el-row>
              <el-col span="5">
                <span class="sptext">最小包装可使用次数</span>
@ -758,7 +775,14 @@
 </template>

 <script>
-import {getYbHcflDetail,disableUdi, removeDiRl, removeRl, thirdSysDetail, updatetSingleUdiInfo} from "@/api/basic/product/udiRelevance";
+import {
+  getYbHcflDetail,
+  disableUdi,
+  removeDiRl,
+  removeRl,
+  thirdSysDetail,
+  updatetSingleUdiInfo
+} from "@/api/basic/product/udiRelevance";
 import {isBlank} from "@/utils/strUtil";
 import {filterByUuid} from "@/api/basic/product/udiInfo";
 import ProductSingleEdit from "@/views/basic/product/productSingleEdit";
@ -857,7 +881,7 @@ export default {
    this.classifySearch("")
  },
  methods: {
-    classifyChange(){
+    classifyChange() {
      this.classifySearch(this.editQuery.flbm)
      let item = this.classifyList.find(item => item.code == this.editQuery.flbm)
      if (item != null) this.editQuery.requireScanCode = item.requireScanCode;
@ -877,7 +901,7 @@ export default {
          this.classifyList = [];
        });
    },
-    getYbHcData(){
+    getYbHcData() {
      let query = {
        specificationCode: this.editQuery.ybbm
      };
@ -890,7 +914,7 @@ export default {
          this.editQuery.catalogname3 = this.ybHcflDetail.catalogname3
          this.editQuery.matrial = this.ybHcflDetail.matrial
          this.$forceUpdate();
-        }else {
+        } else {
          this.editQuery.catalogcode = ""
          this.editQuery.catalogname1 = ""
          this.editQuery.catalogname2 = ""
@ -902,7 +926,7 @@ export default {
      })

    },
-    onClose(){
+    onClose() {
      this.$emit("onClose")
    },
    diableChange() {
--- a/src/views/supplier/company/basicCompanyproductEdit.vue
+++ b/src/views/supplier/company/basicCompanyproductEdit.vue
@ -263,6 +263,8 @@
              </el-select>
            </el-form-item>
          </el-col>
+        </el-row>
+        <el-row type="flex" class="edit-row">
          <el-col :span="12" v-if="productRemarkSet.remarkEnable8==true  && editQuery.basicPrductRemak6=='1'">
            <el-form-item :label="productRemarkSet.remarkTitle8+':'">
              <el-select
@ -320,6 +322,20 @@
              </el-radio-group>
            </el-form-item>
          </el-col>
+          <el-col :span="12">
+            <el-form-item
+              label="是否组套:"
+              prop="isStack"
+              class="query-form-item"
+            >
+              <el-radio-group v-model="editQuery.isStack">
+                <el-radio :label="true">是</el-radio>
+                <el-radio :label="false">否</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row type="flex" class="edit-row">
          <el-col :span="12">
            <el-form-item label="分类编码:"
                          prop="flbm"
@ -383,13 +399,13 @@
 </template>

 <script>
-import {getYbHcflDetail,disableUdi, removeDiRl, removeRl, thirdSysDetail} from '@/api/basic/product/udiRelevance'
+import {getYbHcflDetail, disableUdi, removeDiRl, removeRl, thirdSysDetail} from '@/api/basic/product/udiRelevance'
 import {updateById} from '@/api/basic/udiRelevance'
 import {filterByUuid} from '@/api/basic/udiInfo'
 import selectErp from "./udiInfoselectErpUdi";
 import selectUdiVersion from '@/views/basic/product/UdiinfoSelectVersion'
 import {getHslbs, getThrProductType} from "@/api/thrsys/thrHsfl";
-import { filterClassify } from '@/api/purchase/classifyCode'
+import {filterClassify} from '@/api/purchase/classifyCode'

 export default {
  name: 'productEdit',
@ -443,7 +459,7 @@ export default {
  },

  methods: {
-    classifyChange(){
+    classifyChange() {
      this.classifySearch(this.editQuery.flbm)
      let item = this.classifyList.find(item => item.code == this.editQuery.flbm)
      if (item != null) this.editQuery.requireScanCode = item.requireScanCode;
@ -462,7 +478,7 @@ export default {
          this.classifyList = [];
        });
    },
-    getYbHcData(){
+    getYbHcData() {
      let query = {
        specificationCode: this.editQuery.ybbm
      };
@ -475,7 +491,7 @@ export default {
          this.editQuery.catalogname3 = this.ybHcflDetail.catalogname3
          this.editQuery.matrial = this.ybHcflDetail.matrial
          this.$forceUpdate();
-        }else {
+        } else {
          this.editQuery.catalogcode = ""
          this.editQuery.catalogname1 = ""
          this.editQuery.catalogname2 = ""
@ -487,7 +503,7 @@ export default {
      })

    },
-    onClose(){
+    onClose() {
      this.$emit("onClose")
    },
    submitUpload() {
@ -504,6 +520,7 @@ export default {
        purType: this.editQuery.purType,
        attributeType: this.editQuery.attributeType,
        hcType: this.editQuery.hcType,
+        isStack: this.editQuery.isStack,
        overStockNum: this.editQuery.overStockNum,
        lowStockNum: this.editQuery.lowStockNum,
        recentDateTime: this.editQuery.recentDateTime,
@ -686,7 +703,7 @@ export default {
    this.findThrTypeMethod(this.editQuery.basicPrductRemak7);
    // }
    this.classifySearch()
-console.log("editQuery:",this.editQuery)
+    console.log("editQuery:", this.editQuery)
  }, directives: {
    'debounce-input': {
      inserted(el, binding) {
@ -699,7 +716,7 @@ console.log("editQuery:",this.editQuery)
        })
      }
    }
-}
+  }
 }
 </script>

--- a/src/views/supplier/products/supAddDiProductSelectUdi.vue
+++ b/src/views/supplier/products/supAddDiProductSelectUdi.vue
@ -164,7 +164,7 @@
            </el-form-item>
          </el-col>
        </el-row>
-        <el-row >
+        <el-row>
          <el-col :span="12" class="el-col">
            <el-form-item label="一级分类名称:">
              <el-input
@ -189,7 +189,7 @@
          </el-col>
        </el-row>

-        <el-row >
+        <el-row>
          <el-col :span="12" class="el-col">
            <el-form-item label="三级分类名称:">
              <el-input
@ -290,6 +290,7 @@
              </el-select>
            </el-form-item>
          </el-col>
+
          <el-col :span="12">
            <el-form-item
              label="是否可集采:"
@ -302,6 +303,18 @@
              </el-radio-group>
            </el-form-item>
          </el-col>
+          <el-col :span="12">
+            <el-form-item
+              label="是否组套:"
+              prop="isStack"
+              class="query-form-item"
+            >
+              <el-radio-group v-model="editQuery.isStack">
+                <el-radio :label="true">是</el-radio>
+                <el-radio :label="false">否</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
          <el-col :span="12" class="el-col" v-if="productRemarkSet.remarkEnable1">
            <el-form-item :label="productRemarkSet.remarkTitle1 ">
              <el-input style="width: 65%" size="small" splaceholder="请输入内容"
@ -523,7 +536,7 @@ export default {
    }
  },
  methods: {
-    getYbHcData(){
+    getYbHcData() {
      if (this.editQuery.ybbm == null || this.editQuery.ybbm == '') return;
      let query = {
        specificationCode: this.editQuery.ybbm
@ -537,7 +550,7 @@ export default {
          this.editQuery.catalogname3 = this.ybHcflDetail.catalogname3
          this.editQuery.matrial = this.ybHcflDetail.matrial
          this.$forceUpdate();
-        }else {
+        } else {
          this.editQuery.catalogcode = ""
          this.editQuery.catalogname1 = ""
          this.editQuery.catalogname2 = ""
@ -549,7 +562,7 @@ export default {
      })

    },
-    onClose(){
+    onClose() {
      this.$emit("onClose")
    },
    change(e) {
--- a/src/views/supplier/products/supProductsAdd.vue
+++ b/src/views/supplier/products/supProductsAdd.vue
@ -156,6 +156,19 @@
              </el-select>
            </el-form-item>
          </el-col>
+          <el-col :span="12">
+            <el-form-item label="是否组套" prop="isStack">
+              <el-select
+                v-model="newProductData.isStack"
+                placeholder="请选择"
+                clearable
+                style="width: 90%"
+              >
+                <el-option label="是" :value="true"></el-option>
+                <el-option label="否" :value="false"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>

          <el-col :span="12" v-if="productRemarkSet.remarkEnable1">
            <el-form-item :label="productRemarkSet.remarkTitle1+':'" prop="basicPrductRemak1">
@ -291,7 +304,7 @@ import {saveNewProduct} from "@/api/thrsys/thrProducts";


 import {getBasicThirdSys} from "@/api/basic/basicThirdSys";
-import {addProduct,addThrAddProductsNew} from "@/api/thrsys/thrProductsAdd";
+import {addProduct, addThrAddProductsNew} from "@/api/thrsys/thrProductsAdd";
 import {getHslbs, getThrProductType} from "@/api/thrsys/thrHsfl";
 import {finProductSet} from "@/api/param/systemParamConfig";