update

src/views/material/changeApply/add/column.js

@@ -129,6 +129,7 @@ export default function useColumns(){
             require: true,
           },
           attr:{
+            readonly:true,
             is: "el-popover-select-v2",
             valueKey: "code",
             referName: "MATERIAL_PARAM",

src/views/material/requisition/add.vue

@@ -1362,7 +1362,7 @@
             })
           })
 
-          Promise.all([form1, form2]).then(() => {
+          // Promise.all([form1, form2]).then(() => {
             if (this.basicForm.isMedicine == '0' && this.sysMaterialMedcineItemApply.length == 0) {
               this.$modal.notifyWarning("医药物料需要维护物料类别!");
 
@@ -1381,7 +1381,7 @@
                 this.$modal.closeLoading();
               })
             }
-          })
+          // })
         } else {
 
           // alert('保存传status：0')
@@ -1395,6 +1395,7 @@
           sparams.sysMaterialMedcineItemApply = this.sysMaterialMedcineItemApply;
 
           console.log('保存参数', sparams)
+
           const form1 = new Promise((resolve, reject) => {
             this.$refs['basic'].validate(valid => {
               if (valid) resolve()
@@ -1405,7 +1406,8 @@
               if (valid) resolve()
             })
           })
-          Promise.all([form1, form2]).then(() => {
+
+          // Promise.all([form1, form2]).then(() => {
             if (this.basicForm.isMedicine == '0' && this.sysMaterialMedcineItemApply.length == 0) {
               this.$modal.notifyWarning("医药物料需要维护物料类别!");
             } else {
@@ -1423,7 +1425,7 @@
                 this.$modal.closeLoading();
               })
             }
-          })
+          // })
         }
       },
       submit() {
@@ -1445,7 +1447,8 @@
             if (valid) resolve()
           })
         })
-        Promise.all([form1, form2]).then(() => {
+
+        // Promise.all([form1, form2]).then(() => {
           // 提交时候要维护物料类别
           if (this.sysMaterialMedcineItemApply.length !== 0) {
             this.$modal.loading("提交中...");
@@ -1467,7 +1470,7 @@
               type: 'warning'
             });
           }
-        })
+        // })
       },
       back() {
         this.$emit('jugislist', true)

src/views/purchase/contract/add/columns.js

@@ -526,7 +526,7 @@ export default function useColumns() {
           item: {
             title: "物料名称",
             key: "materialName",
-            required: true,
+            require: true,
           },
           attr: {
             is: "el-popover-select-v2",
@@ -539,6 +539,8 @@ export default function useColumns() {
               registration: "registrationNo",
               specification: "specification",
               manufacturer: "manufacturerIdName",
+              tax: "materialRateName",
+              // tax: "materialRate",
             },
           },
         },
@@ -546,6 +548,7 @@ export default function useColumns() {
           item: {
             title: "物料编码",
             key: "material",
+            
           },
           attr: {},
         },
@@ -577,7 +580,7 @@ export default function useColumns() {
           },
         },
         {
-          item: { title: "税率%", key: "tax", required: true },
+          item: { title: "税率%", key: "tax", require: true },
           attr: {
             is: "el-popover-select-v2",
             valueKey: "ntaxrate",
@@ -594,7 +597,7 @@ export default function useColumns() {
           },
         },
         {
-          item: { title: "含税单价", key: "taxPrice", required: true },
+          item: { title: "含税单价", key: "taxPrice", require: true },
           attr: {
             is: "el-input-number",
           },
@@ -610,7 +613,7 @@ export default function useColumns() {
           },
         },
         {
-          item: { title: "无税单价", key: "taxFreePrice", required: true },
+          item: { title: "无税单价", key: "taxFreePrice", require: true },
           attr: {
             formatter: (prop) => {
               const { tax = 0, taxPrice = 0 } = prop;
@@ -709,7 +712,7 @@ export default function useColumns() {
           item: {
             title: "付款起点",
             key: "origin",
-            required: true,
+            require: true,
           },
           attr: {
             is: "el-select",
@@ -717,14 +720,14 @@ export default function useColumns() {
           },
         },
         {
-          item: { title: "账期天数", key: "paymetDays", required: true },
+          item: { title: "账期天数", key: "paymetDays", require: true },
           attr: {
             is: "el-input-number",
             precision: 2,
           },
         },
         {
-          item: { title: "付款比例%", key: "ratio", required: true },
+          item: { title: "付款比例%", key: "ratio", require: true },
           attr: {
             is: "el-input-number",
           },
@@ -759,7 +762,7 @@ export default function useColumns() {
           item: {
             title: "结算方式",
             key: "paymentMeans",
-            required: true,
+            require: true,
           },
           attr: {
             is: "el-popover-select-v2",

src/views/purchase/contract/edit/columns.js

@@ -513,7 +513,7 @@ export default function useColumns() {
           item: {
             title: "物料名称",
             key: "materialName",
-            required: true,
+            require: true,
           },
           attr: {
             is: "el-popover-select-v2",
@@ -564,7 +564,7 @@ export default function useColumns() {
           },
         },
         {
-          item: { title: "税率%", key: "tax", required: true },
+          item: { title: "税率%", key: "tax", require: true },
           attr: {
             is: "el-popover-select-v2",
             valueKey: "ntaxrate",
@@ -581,7 +581,7 @@ export default function useColumns() {
           },
         },
         {
-          item: { title: "含税单价", key: "taxPrice", required: true },
+          item: { title: "含税单价", key: "taxPrice", require: true },
           attr: {
             is: "el-input-number",
           },
@@ -597,7 +597,7 @@ export default function useColumns() {
           },
         },
         {
-          item: { title: "无税单价", key: "taxFreePrice", required: true },
+          item: { title: "无税单价", key: "taxFreePrice", require: true },
           attr: {
             formatter: (prop) => {
               const { tax = 0, taxPrice = 0 } = prop;
@@ -696,7 +696,7 @@ export default function useColumns() {
           item: {
             title: "付款起点",
             key: "origin",
-            required: true,
+            require: true,
           },
           attr: {
             is: "el-select",
@@ -704,14 +704,14 @@ export default function useColumns() {
           },
         },
         {
-          item: { title: "账期天数", key: "paymetDays", required: true },
+          item: { title: "账期天数", key: "paymetDays", require: true },
           attr: {
             is: "el-input-number",
             precision: 2,
           },
         },
         {
-          item: { title: "付款比例%", key: "ratio", required: true },
+          item: { title: "付款比例%", key: "ratio", require: true },
           attr: {
             is: "el-input-number",
           },
@@ -746,7 +746,7 @@ export default function useColumns() {
           item: {
             title: "结算方式",
             key: "paymentMeans",
-            required: true,
+            require: true,
           },
           attr: {
             is: "el-popover-select-v2",