From bec91890d9ca83c93b7a1b5d1824ac024ba538c1 Mon Sep 17 00:00:00 2001
From: zzyuan <781948537@qq.com>
Date: Wed, 8 Jan 2025 15:11:55 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=8D=8F=E8=AE=AE=E6=96=B0=E5=A2=9E?=
=?UTF-8?q?=E9=83=A8=E5=88=86=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/material/lease/protocol/index.vue | 113 ++++++++++----------
1 file changed, 59 insertions(+), 54 deletions(-)
diff --git a/src/views/material/lease/protocol/index.vue b/src/views/material/lease/protocol/index.vue
index d750f4cc..6f93408a 100644
--- a/src/views/material/lease/protocol/index.vue
+++ b/src/views/material/lease/protocol/index.vue
@@ -139,7 +139,7 @@
:options="uniteList" :normalizer="normalizer"
:show-count="true" style="width: 100%;" :disable-branch-nodes="true"
noChildrenText="没有数据了" noOptionsText="没有数据" noResultsText="没有搜索结果"
- placeholder="请选择租赁单位"
+ placeholder="请选择租赁单位" @select="unitSelect"
/>
-
+
@@ -219,6 +219,18 @@
/>
+
+
+
+
+
-
-
+
-
-
+
+
+
+
+
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
+
0) {
this.maForm.unitId = this.unitId[this.unitId.length - 1];
@@ -964,7 +961,16 @@ export default {
// 表单重置
reset() {
- this.form = {};
+ this.form = {
+ unitId:null,
+ projectId:null,
+ authPerson:"",
+ phone:'',
+ contractCode:'',
+ planStartTime:'',
+ protocol:"1",
+ remark:'',
+ };
this.unitId = null;
this.projectId = null;
this.maForm = {
@@ -1006,15 +1012,14 @@ export default {
await this.editAgreementTemp(this.form);
await this.deleteFile();
}
-
} else {
console.log(1)
if (this.businessLicenseListTemp.length != 0) {
- console.log(2)
+ // console.log(2)
await this.getImaUpload(),
await this.addAgreementTemp(this.form);
} else {
- console.log(3)
+ // console.log(3)
await this.addAgreementTemp(this.form);
}
From 238c668ee08ec551519d562d7125087fe372e84b Mon Sep 17 00:00:00 2001
From: zzyuan <781948537@qq.com>
Date: Wed, 8 Jan 2025 15:25:25 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=96=B0=E8=B4=AD=E7=B1=BB=E5=9E=8B?=
=?UTF-8?q?=E9=80=89=E6=8B=A9=E9=80=BB=E8=BE=91=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../goodsArrived/component/addTools.vue | 34 ++++++++++++-------
1 file changed, 21 insertions(+), 13 deletions(-)
diff --git a/src/views/material/purchase/goodsArrived/component/addTools.vue b/src/views/material/purchase/goodsArrived/component/addTools.vue
index 3f407217..41440d1e 100644
--- a/src/views/material/purchase/goodsArrived/component/addTools.vue
+++ b/src/views/material/purchase/goodsArrived/component/addTools.vue
@@ -176,13 +176,7 @@
v-model.number="scope.row.purchaseNum"
controls-position="right" type="number"
style="width: 100%" :disabled="scope.row.status!=1&&scope.row.status!=12"
- :min="0"
- @input="
- v =>
- scope.row.unitValue == 1
- ? (scope.row.purchaseNum = Number(v.replace(/[^\d.]/g, '')))
- : (scope.row.purchaseNum = Number(v.replace(/[^\d]/g, '')))
- "
+ :min="0" @input="v =>scope.row.unitValue == 1? (scope.row.purchaseNum = Number(v.replace(/[^\d.]/g, ''))): (scope.row.purchaseNum = Number(v.replace(/[^\d]/g, '')))"
>
@@ -623,8 +617,7 @@ export default {
},
// 处理类型数据
processTypeData(data) {
- const result = []
-
+ const result = []
const traverse = (node, parents = []) => {
const path = [...parents, node.typeName]
@@ -638,7 +631,8 @@ export default {
maTypeName: parents[parents.length - 1] || '',
specificationType: node.typeName,
unitName: node.unitName,
- unitValue: node.unitValue
+ unitValue: node.unitValue,
+ rentPrice: node.rentPrice,
})
}
@@ -664,8 +658,7 @@ export default {
},
// 选择变化处理
handleTypeChange(val) {
- if (!val || val.length === 0) return
-
+ if (!val || val.length === 0) return
// 获取新选中的项
const lastSelected = val[val.length - 1]
const typeData = this.flattenTypeOptions.find(item => item.typeId === lastSelected)
@@ -681,10 +674,25 @@ export default {
this.$message.error('所选物资规格类型暂时无库存，无法申请！')
this.tempDeviceType = this.tempDeviceType.filter(id => id !== lastSelected)
} else {
+ console.log(typeData,"typeData")
+ if(typeData.rentPrice>0){//判断是否有租赁价格：有禁用;无修改;
+ typeData.rentPriceDisabled=true
+ }else{
+ typeData.rentPriceDisabled=false
+ }
// 将新项添加到数组开头，实现倒序
this.equipmentList.unshift({
...typeData,
- preNum: 0
+ preNum: 0,
+ createTime: null,
+ productionTime: this.maForm.productionTime,
+ purchaseTaxPrice: 0,
+ purchaseTaxPrice: 0,
+ purchaseNum : 1,
+ fixCode: '0',
+ status:1,
+ bmFileInfos:[]
+
})
this.deviceType.push(lastSelected)
this.$message({