diff --git a/.env.development b/.env.development index 6e322d7..9a19918 100644 --- a/.env.development +++ b/.env.development @@ -2,6 +2,7 @@ ENV = 'development' # base api +#VUE_APP_BASE_API='http://192.167.20.118:8080/' VUE_APP_BASE_API='https://cz-hjjc-test.115.langye.net' VUE_APP_UPLOAD_API='https://cz-hjjc-test.115.langye.net/api/upload-file' VUE_APP_PREVIEW=//view.langye.net/preview/onlinePreview diff --git a/src/views/contract/components/EditContract.vue b/src/views/contract/components/EditContract.vue index 212b9cd..00e0256 100644 --- a/src/views/contract/components/EditContract.vue +++ b/src/views/contract/components/EditContract.vue @@ -857,7 +857,7 @@ export default { money_way_id: [ { validator: (rule, value, callback) => { - if (!this.hasValue(value) || !this.form.is_common_purchase) { + if (!this.hasValue(value) && !this.form.is_common_purchase) { callback(new Error("必填")); } else { callback(); @@ -912,7 +912,9 @@ export default { value !== "" && value !== undefined && value !== "undefined" && - value !== null + value !== null && + value !== 'null' && + (value instanceof Array ? value.length > 0 : true) ); }, planPick(selection) { diff --git a/src/views/contract/contractEdit.vue b/src/views/contract/contractEdit.vue index e8d0e99..3e54d12 100644 --- a/src/views/contract/contractEdit.vue +++ b/src/views/contract/contractEdit.vue @@ -1524,6 +1524,10 @@ export default { if (this.form.is_contract) { this.form.is_tender_audit = 1 } + if (this.form.is_simple) { + this.form.is_contract = 0 + this.form.is_tender_audit = 0 + } // this.form.is_contract = this.flowIds?.find(i => i.id == this.form.flow_mod_id)?.type == 2 ? 0 : 1; if (!this.form.money) { this.form.money = this.form.plan_price