Merge branch 'purchaseDev' of http://172.16.100.139/new-business/drp-web into purchaseDev

src/components/popover-select-v2/index.vue

@@ -6,7 +6,7 @@ export default {
   props: {
     // v-model
     value: {
-      type: [Array, String],
+      type: [Array, String,Number],
       require: true,
     },
     // 参照类型 ，对应后端

src/views/material/requisition/index.vue

@@ -380,8 +380,10 @@
       },
       getList(val) {
         console.log('val', val)
+        this.failLoad = true;
         
         getReqList({...this.params,...this.pageStatus}).then(res => {
+          this.failLoad = false;
           if (res.code === 200) {
             this.tableList = res.rows;
             // this.total = res.total;

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

@@ -283,7 +283,7 @@ export default function useColumns() {
     },
     {
       item: { key: "createTime", title: "合同创建时间", width: 100 },
-      attr: { is: "el-date-picker", valueFormat: "yyyy-MM-dd" },
+      attr: { is: "el-date-picker", valueFormat: "yyyy-MM-dd",disabled:true,},
     },
     {
       item: { key: "project", title: "项目医院", required: true, width: 100 },
@@ -539,8 +539,7 @@ export default function useColumns() {
               registration: "registrationNo",
               specification: "specification",
               manufacturer: "manufacturerIdName",
-              tax: "materialRateName",
-              // tax: "materialRate",
+              rateCode: "materialRateName",
             },
           },
         },

src/views/purchase/contract/add/index.vue

@@ -34,6 +34,7 @@ export default {
       ],
     } = useColumns();
     const rules = this.$init.rules([...TabColumns, ...TableColumns]);
+    console.log(rules,'rules------------');
     const params = this.$init.params([...TabColumns, ...TableColumns]);
     return {
       loading: false,
@@ -128,7 +129,7 @@ export default {
         // try
         this.loading = true;
         const { ntaxrate } = await tax(rateCode);
-        row.tax = Number(ntaxrate === "0E-8" ? 0 : ntaxrate);
+        row.tax = ntaxrate === "0E-8" ? 0 : ntaxrate;
       } catch (err) {
         // catch
         console.error(err);

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

@@ -286,7 +286,7 @@ export default function useColumns() {
     },
     {
       item: { key: "createTime", title: "合同创建时间", width: 100 },
-      attr: { is: "el-date-picker", valueFormat: "yyyy-MM-dd" },
+      attr: { is: "el-date-picker", valueFormat: "yyyy-MM-dd" ,disabled:true,},
     },
     {
       item: { key: "project", title: "项目医院", required: true, width: 100 },
@@ -526,6 +526,7 @@ export default function useColumns() {
               registration: "registrationNo",
               specification: "specification",
               manufacturer: "manufacturerIdName",
+              rateCode: "materialRateName",
             },
           },
         },

src/views/purchase/contract/edit/index.vue

@@ -131,7 +131,8 @@ export default {
         // try
         this.loading = true;
         const { ntaxrate } = await tax(rateCode);
-        row.tax = Number(ntaxrate === "0E-8" ? 0 : ntaxrate);
+        // row.tax = Number(ntaxrate === "0E-8" ? 0 : ntaxrate);
+        row.tax = ntaxrate === "0E-8" ? 0 : ntaxrate;
       } catch (err) {
         // catch
         console.error(err);