diff --git a/src/views/contractManagement/expenditureContract/modules/ExpenditureContractModule.vue b/src/views/contractManagement/expenditureContract/modules/ExpenditureContractModule.vue
index f85266f..5ab1fad 100644
--- a/src/views/contractManagement/expenditureContract/modules/ExpenditureContractModule.vue
+++ b/src/views/contractManagement/expenditureContract/modules/ExpenditureContractModule.vue
@@ -278,7 +278,7 @@ export default {
validateTrigger: 'blur'
},
contractName: {
- rules: [{ required: true, validator: this.checkContractName }],
+ rules: [{ required: true, message:'请输入合同名称' }],
validateTrigger: 'blur'
},
signedCompany: {
@@ -440,33 +440,33 @@ export default {
callback('请输入合同编号')
}
},
- /**
- * 合同名称唯一性校验
- * @param rules
- * @param value
- * @param callback
- */
- checkContractName(rules, value, callback) {
- if (value) {
- if (!this.model.id) {
- const params = {
- confusionCode: 'pay_spending_contract_name',
- fieldVal: value
- }
- duplicateCheck(params).then(res => {
- if (res.success) {
- callback()
- } else {
- callback('合同名称已存在')
- }
- })
- return
- }
- callback()
- } else {
- callback('请输入合同名称')
- }
- },
+ // /**
+ // * 合同名称唯一性校验
+ // * @param rules
+ // * @param value
+ // * @param callback
+ // */
+ // checkContractName(rules, value, callback) {
+ // if (value) {
+ // if (!this.model.id) {
+ // const params = {
+ // confusionCode: 'pay_spending_contract_name',
+ // fieldVal: value
+ // }
+ // duplicateCheck(params).then(res => {
+ // if (res.success) {
+ // callback()
+ // } else {
+ // callback('合同名称已存在')
+ // }
+ // })
+ // return
+ // }
+ // callback()
+ // } else {
+ // callback('请输入合同名称')
+ // }
+ // },
/**
* 选中企业变化
* @param value
diff --git a/src/views/contractManagement/revenueContract/RevenueContractList.vue b/src/views/contractManagement/revenueContract/RevenueContractList.vue
index 812fe41..c5561da 100644
--- a/src/views/contractManagement/revenueContract/RevenueContractList.vue
+++ b/src/views/contractManagement/revenueContract/RevenueContractList.vue
@@ -93,17 +93,17 @@
@click="toRevenueContractDetail(record.id, record.contractNum)"
v-if="record.chargeStatus === 1"
:value="text"
- :length="20">
+ :length="18">
+ :length="18">
-
+
diff --git a/src/views/contractManagement/revenueContract/modules/RevenueContractModule.vue b/src/views/contractManagement/revenueContract/modules/RevenueContractModule.vue
index ec6aea9..e7dd46a 100644
--- a/src/views/contractManagement/revenueContract/modules/RevenueContractModule.vue
+++ b/src/views/contractManagement/revenueContract/modules/RevenueContractModule.vue
@@ -256,7 +256,7 @@
- {{
- item.realname
- }}
-
+ {{ item.realname }}
@@ -98,7 +95,7 @@
:disabled-charge-company="true"
:default-charge-way="2"
:is-contract-num-disabled="true"
- @ok="modalFormOk">
+ @ok="selectProjectOk">
@@ -310,6 +307,7 @@ export default {
},
handleCancel() {
this.close()
+ this.$emit('ok')
},
/**
* 打开新增module
@@ -346,9 +344,21 @@ export default {
*/
searchReset() {
this.lastQueryParam = {}
- this.queryParam.departId = this.departId
+ let obj = {
+ departId: this.departId,
+ principalId: undefined,
+ year: undefined,
+ }
+ this.queryParam = Object.assign(this.queryParam, obj)
this.loadData(1)
},
+ /**
+ * 新建项目完成后关闭两个模态框
+ */
+ selectProjectOk() {
+ this.close()
+ this.$emit('ok')
+ }
}
}
diff --git a/src/views/system/SystemDept.vue b/src/views/system/SystemDept.vue
new file mode 100644
index 0000000..d051cec
--- /dev/null
+++ b/src/views/system/SystemDept.vue
@@ -0,0 +1,264 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 保存
+ 取消
+
+
+
+
+
+
+
+
\ No newline at end of file