From 42f4dedf15dec62db092a0ddc8e8d9324135f0f7 Mon Sep 17 00:00:00 2001
From: anthonywj <yewenjie20@vip.qq.com>
Date: Mon, 29 Jul 2024 15:37:21 +0800
Subject: [PATCH] =?UTF-8?q?=E6=98=AF=E5=90=A6=E7=BB=84=E5=A5=97=E4=BF=AE?=
=?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/basic/product/productEdit.vue | 34 ++++-
.../company/basicCompanyproductEdit.vue | 117 ++++++++++--------
.../products/supAddDiProductSelectUdi.vue | 23 +++-
.../supplier/products/supProductsAdd.vue | 17 ++-
4 files changed, 129 insertions(+), 62 deletions(-)
diff --git a/src/views/basic/product/productEdit.vue b/src/views/basic/product/productEdit.vue
index 2417d62..54cd212 100644
--- 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() {
diff --git a/src/views/supplier/company/basicCompanyproductEdit.vue b/src/views/supplier/company/basicCompanyproductEdit.vue
index 34b3935..2f37d0e 100644
--- a/src/views/supplier/company/basicCompanyproductEdit.vue
+++ b/src/views/supplier/company/basicCompanyproductEdit.vue
@@ -84,8 +84,8 @@
splaceholder="请输入内容"
v-model="editQuery.ybbm"
v-debounce-input:500ms="getYbHcData"
- ></el-input>
- </el-form-item>
+ ></el-input>
+ </el-form-item>
</el-col>
</el-row>
@@ -140,7 +140,7 @@
</el-row>
<el-row type="flex" class="edit-row">
- <el-col :span="12">
+ <el-col :span="12">
<el-form-item label="采购类型">
<el-select
v-model="editQuery.purType"
@@ -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
@@ -321,39 +323,53 @@
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="分类编码:"
- prop="flbm"
- class="query-form-item">
- <el-select
- v-model="editQuery.flbm"
- filterable
- remote
- clearable="true"
- style="width: 80%"
- reserve-keyword
- placeholder="请选择"
- :loading="loading"
- @change="classifyChange()"
- >
- <el-option
- v-for="item in classifyList"
- :key="item.code"
- :label="item.name"
- :value="item.code">
- <span>{{ item.code }}</span>
- <span>{{ item.name }}</span>
- </el-option>
- </el-select>
+ <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 class="edit-row">
- <el-button-group style="display: flex">
- <el-button type="primary" @click.native="submitUpload()" style="margin: 0 60px 10px auto; height: 35px"
- :loading="loading"
- >提交
- </el-button>
- </el-button-group>
+ <el-row type="flex" class="edit-row">
+ <el-col :span="12">
+ <el-form-item label="分类编码:"
+ prop="flbm"
+ class="query-form-item">
+ <el-select
+ v-model="editQuery.flbm"
+ filterable
+ remote
+ clearable="true"
+ style="width: 80%"
+ reserve-keyword
+ placeholder="请选择"
+ :loading="loading"
+ @change="classifyChange()"
+ >
+ <el-option
+ v-for="item in classifyList"
+ :key="item.code"
+ :label="item.name"
+ :value="item.code">
+ <span>{{ item.code }}</span>
+ <span>{{ item.name }}</span>
+ </el-option>
+ </el-select>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row class="edit-row">
+ <el-button-group style="display: flex">
+ <el-button type="primary" @click.native="submitUpload()" style="margin: 0 60px 10px auto; height: 35px"
+ :loading="loading"
+ >提交
+ </el-button>
+ </el-button-group>
</el-row>
</el-form>
</el-card>
@@ -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,21 +703,21 @@ 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) {
- let timeout
- el.addEventListener('input', () => {
- clearTimeout(timeout)
- timeout = setTimeout(() => {
- binding.value()
- }, parseInt(binding.arg) || 300)
- })
+ 'debounce-input': {
+ inserted(el, binding) {
+ let timeout
+ el.addEventListener('input', () => {
+ clearTimeout(timeout)
+ timeout = setTimeout(() => {
+ binding.value()
+ }, parseInt(binding.arg) || 300)
+ })
+ }
}
}
}
-}
</script>
<style scoped>
diff --git a/src/views/supplier/products/supAddDiProductSelectUdi.vue b/src/views/supplier/products/supAddDiProductSelectUdi.vue
index 36e36a7..41bbeda 100644
--- 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) {
diff --git a/src/views/supplier/products/supProductsAdd.vue b/src/views/supplier/products/supProductsAdd.vue
index 95c9a69..349f060 100644
--- 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";
@@ -483,7 +496,7 @@ export default {
})
} else if (this.newType == 2) {
// addProduct(this.newProductData).then((res) => {
- addThrAddProductsNew(this.newProductData).then((res) => {
+ addThrAddProductsNew(this.newProductData).then((res) => {
if (res.code == 20000) {
this.$message.success("添加成功");
//清空弹窗数据