@@ -247,13 +247,11 @@ export default {
{required:true,message:"必选项"}
],
money:[
- {required:true,message:"必填项"}
+ {required:true,message:"必填项"},
+ {pattern:/^\d+(\.\d+)?$/, message: '必须为数字'}
],
content:[
{required:true,message:"必填项"}
- ],
- remark:[
- {required:true,message:"必填项"}
]
},
list:[],
@@ -300,12 +298,6 @@ export default {
align:'right',
width: 160
},
- {
- label:"描述",
- prop:'content',
- align:'left',
- sortable:false
- },
{
label:"创建信息",
prop:'created_at',
@@ -313,7 +305,14 @@ export default {
formatter:(cell,data,value)=>{
return parseTime(new Date(value))
}
- }
+ },
+ {
+ label:"描述",
+ minWidth:300,
+ prop:'content',
+ align:'left',
+ sortable:false
+ },
],
select:{
page:1,
diff --git a/src/views/contract/components/contractSign.vue b/src/views/contract/components/contractSign.vue
index 55c309f..53bc9d5 100644
--- a/src/views/contract/components/contractSign.vue
+++ b/src/views/contract/components/contractSign.vue
@@ -45,7 +45,7 @@
*合同金额
-
@@ -145,7 +145,8 @@ export default {
{required:true,message:"必填"}
],
money:[
- {required:true,message:"必填"}
+ {required:true,message:"必填"},
+ {pattern:/^\d+(\.\d+)?$/, message: '必须为数字'}
]
},
@@ -201,7 +202,8 @@ export default {
{required:true,message:"必填"}
],
money:[
- {required:true,message:"必填"}
+ {required:true,message:"必填"},
+ {pattern:/^\d+(\.\d+)?$/, message: '必须为数字'}
]
}
}
@@ -264,7 +266,7 @@ export default {
let res = await getOatoken()
let url =`/oa/admin/flow/view/${this.contract.join_last_flow_id}?oatoken=${res.oatoken}&get_raw=1`
const oaInfo = await axios.get(url)
- this.form.money = Number(oaInfo.data.flow['合同金额(万元)']) * 10000
+ this.form.money = Number(oaInfo.data.flow['合同金额(万元)'])
this.form.number = oaInfo.data.flow['合同编号']
this.form.supply = oaInfo.data.flow['承包商\\供应商']
this.form.carryDepartment = oaInfo.data.flow['执行部门']
@@ -322,5 +324,18 @@ export default {
content:'(元)'
}
}
-
+.xy-table-item-price-wan{
+ position: relative;
+ &::after{
+ position: absolute;
+ right: 0;
+ top: 0;
+ content:'(万元)'
+ }
+ ::v-deep .el-input__clear{
+ position: relative;
+ right: 46px;
+ z-index: 2;
+ }
+}
diff --git a/src/views/contract/components/detailContract.vue b/src/views/contract/components/detailContract.vue
index d3da941..7b0777a 100644
--- a/src/views/contract/components/detailContract.vue
+++ b/src/views/contract/components/detailContract.vue
@@ -46,7 +46,7 @@
合同金额
{{detail.money}}
-
(元)
+
(万元)
diff --git a/src/views/contract/components/detailContractSign.vue b/src/views/contract/components/detailContractSign.vue
index 95a9ade..684c969 100644
--- a/src/views/contract/components/detailContractSign.vue
+++ b/src/views/contract/components/detailContractSign.vue
@@ -66,7 +66,8 @@ export default {
{required:true,message:"必填"}
],
money:[
- {required:true,message:"必填"}
+ {required:true,message:"必填"},
+ {pattern:/^\d+(\.\d+)?$/, message: '必须为数字'}
]
}
}
diff --git a/src/views/contract/components/detailPaymentRegistration.vue b/src/views/contract/components/detailPaymentRegistration.vue
index 23cc13b..3940a25 100644
--- a/src/views/contract/components/detailPaymentRegistration.vue
+++ b/src/views/contract/components/detailPaymentRegistration.vue
@@ -149,13 +149,16 @@ export default {
],
rules:{
apply_money:[
- {required:true,message:"必填"}
+ {required:true,message:"必填"},
+ {pattern:/^\d+(\.\d+)?$/, message: '必须为数字'}
],
act_money:[
- {required:true,message:"必填"}
+ {required:true,message:"必填"},
+ {pattern:/^\d+(\.\d+)?$/, message: '必须为数字'}
],
discount_money:[
- {required:true,message:"必填"}
+ {required:true,message:"必填"},
+ {pattern:/^\d+(\.\d+)?$/, message: '必须为数字'}
],
type:[
{required:true,message:"必选"}
diff --git a/src/views/contract/components/editorContract.vue b/src/views/contract/components/editorContract.vue
index 6200436..0c71a67 100644
--- a/src/views/contract/components/editorContract.vue
+++ b/src/views/contract/components/editorContract.vue
@@ -58,16 +58,6 @@
-
-
-
-
-
-
-
-
-
@@ -200,20 +170,12 @@ export default {
{required:true,message:"必选"}
],
price:[
- {required:true,message:"必填"}
- ],
- money:[
- {required:true,message:"必填"}
+ {required:true,message:"必填"},
+ {pattern:/^\d+(\.\d+)?$/, message: '必须为数字'}
],
fundingChannels:[
{required:true,message:"必填"}
],
- supply:[
- {required:true,message:"必填"}
- ],
- carryDepartment:[
- {required:true,message:"必填"}
- ],
plan:[
{validator:planPass}
]
@@ -319,9 +281,6 @@ export default {
modality:res.purchase_way_id,
fundingChannels:res.money_way_id,
price:res.plan_price,
- money:res.money,
- supply:res.supply,
- carryDepartment:res.carry_department,
isBudget:res.is_plan === 1 ? true : false,
plan:res.plans.map(item=>{
return {
@@ -345,7 +304,6 @@ export default {
money_way_id:this.detail.fundingChannels,
plan_price:this.detail.price,
name:this.detail.name,
- carry_department:this.detail.carryDepartment,
contract_plan_links:this.detail.plan.map(item=>{
return item.value
})
diff --git a/src/views/contract/components/examineRegistration.vue b/src/views/contract/components/examineRegistration.vue
index 30df027..3a53dfe 100644
--- a/src/views/contract/components/examineRegistration.vue
+++ b/src/views/contract/components/examineRegistration.vue
@@ -177,16 +177,19 @@ export default {
},
paymentRegistrationRules:{
applyMoney:[
- {required:true,message:"必填"}
+ {required:true,message:"必填"},
+ {pattern:/^\d+(\.\d+)?$/, message: '必须为数字'}
],
deductionMoney:[
- {required:true,message:"必填"}
+ {required:true,message:"必填"},
+ {pattern:/^\d+(\.\d+)?$/, message: '必须为数字'}
],
type:[
{required:true,message:"必选"}
],
actMoney:[
- {required:true,message:"必填"}
+ {required:true,message:"必填"},
+ {pattern:/^\d+(\.\d+)?$/, message: '必须为数字'}
]
},
planTable:[
diff --git a/src/views/contract/components/paymentRegistration.vue b/src/views/contract/components/paymentRegistration.vue
index d968ab2..4d8057b 100644
--- a/src/views/contract/components/paymentRegistration.vue
+++ b/src/views/contract/components/paymentRegistration.vue
@@ -163,10 +163,12 @@ export default {
},
paymentRegistrationRules:{
applyMoney:[
- {required:true,message:"必填"}
+ {required:true,message:"必填"},
+ {pattern:/^\d+(\.\d+)?$/, message: '必须为数字'}
],
deductionMoney:[
- {required:true,message:"必填"}
+ {required:true,message:"必填"},
+ {pattern:/^\d+(\.\d+)?$/, message: '必须为数字'}
],
type:[
{required:true,message:"必选"}
diff --git a/src/views/contract/contractList.vue b/src/views/contract/contractList.vue
index ff9d4e6..c86266e 100644
--- a/src/views/contract/contractList.vue
+++ b/src/views/contract/contractList.vue
@@ -13,9 +13,9 @@
- 合同类型
+ 项目类型
-
@@ -70,6 +70,15 @@
v-model="select.priceMax"/>
+
+
+ 状态
+
+
+
+
+
+