Merge branch 'purchaseDev' into 'dev'

Purchase dev

See merge request new-business/drp-web!423

src/views/material/basicFile/details.vue

@@ -281,8 +281,11 @@
               <!-- 副信息 -->
               <div class="md-vice">
 
-                <dr-tabs v-if="activeMainTab == 'material'" :tabList="basicMessage"
-                         :handleTabClick="handleViceTabClick">
+                <dr-tabs 
+                  v-if="activeMainTab == 'material'" 
+                  :tabList="basicMessage"
+                  :handleTabClick="handleViceTabClick"
+                >
 
                   <template #tabContent>
 
@@ -293,6 +296,7 @@
                       :model="medcineData.value" 
                       class="md-vice-content"
                       :rules="medcineRules"
+                      :key="medcineData.value.id"
                     >
 
                       <el-row :gutter="10">
@@ -2466,7 +2470,7 @@
             this.medcineData.value[item.prop] = ''
           })
           this.medcineData.form = form;
-          this.medcineData.value = initParams(this.medcineData.form,'prop')
+          this.medcineData.value = initParams(this.medcineData.form,'prop');
           this.medcineRules = initRules(form);
           this.getMedcineDetails(this.materialId, 'material_medcine');
         })

src/views/material/changeApply/columns.js

@@ -67,6 +67,16 @@ export default function useColumns() {
         clearable: true,
       },
     },
+    {
+      item: {
+        key: "code",
+        title: "单据编码",
+      },
+      attr: {
+        clearable: true,
+        is: "el-input",
+      },
+    },
   
   ].map(({ item, attr }) => ({
     attr,

src/views/material/changeApply/index.vue

@@ -200,6 +200,7 @@ export default {
  
   },
   created(){
+    this.params.code = this.$route.query.billCode
     this.useQuery(this.params, this.page);
   },
 }

src/views/material/requisition/index.vue

@@ -192,6 +192,7 @@
 
     },
     mounted() {
+      this.params.billCode = this.$route.query.billCode
       this.getList(this.queryParams)
     },
     methods: {

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

@@ -86,6 +86,7 @@
           const {
             recentlyPrice = "0",
             isApprovalFirst = "N",
+            purchasequantity
           } = await fetchExist({puOrg, customer, supplier, materialCode, customerName: "", priceType: prop.row.priceType});
           this.loading = false;
           await this.onRowAdd(this.tabName, {
@@ -101,6 +102,7 @@
             puUnitName: puUnitName,
             recentlyPrice,
             isApprovalFirst,
+            yPurchaseQuantity: purchasequantity,
             tax: Number(ntaxrate === "0E-8" ? 0 : ntaxrate),
             createByName: createByName,
             updateByName: createByName,

src/views/purchase/apply/copy/index.vue

@@ -102,6 +102,7 @@ export default {
         const {
           recentlyPrice = "0",
           isApprovalFirst = "N",
+          purchasequantity
         } = await fetchExist({ puOrg, customer, supplier, materialCode, priceType: prop.row.priceType });
         this.loading = false;
         await this.onRowAdd(this.tabName, {
@@ -117,6 +118,7 @@ export default {
           puUnitName: puUnitName,
           recentlyPrice,
           isApprovalFirst,
+          yPurchaseQuantity: purchasequantity,
           tax: Number(ntaxrate === "0E-8" ? 0 : ntaxrate),
           createByName: createByName,
           updateByName: createByName,

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

@@ -131,6 +131,7 @@
           const {
             recentlyPrice = "0",
             isApprovalFirst = "N",
+            purchasequantity
           } = await fetchExist({puOrg, customer, supplier, materialCode, customerName: "",priceType: prop.row.priceType});
           this.loading = false;
           await this.onRowAdd(this.tabName, {
@@ -146,6 +147,7 @@
             puUnitName: puUnitName,
             recentlyPrice,
             isApprovalFirst,
+            yPurchaseQuantity: purchasequantity,
             tax: Number(ntaxrate === "0E-8" ? 0 : ntaxrate),
             createByName: createByName,
             updateByName: createByName,

src/views/purchase/purchase-order/add/column.js

@@ -557,7 +557,7 @@ export const TabColumns = [
           materialManufacturersCode:'manufacturersMaterialCode',
           specification:'specification',
           model:'model',
-          isMedcine:'isMedicineValue',
+          isMedcine:'isMedicine',
           manufacturer:'manufacturerId',
           manufacturerName:'manufacturerIdName',
           unit:'unitId',
@@ -1026,4 +1026,12 @@ export const TabColumns = [
   },
 ];
 
+
+// 集采中心
+const PurColumns =[];
+const PurchaseTabColumns =[];
+
+// 事业发展部
+const CauseColumns =[];
+const CauseTabColumns =[];
 // export const initTabColumns = () => tabColumns;

src/views/purchase/purchase-order/index.vue

@@ -63,6 +63,7 @@ export default {
     },
   },
   created() {
+    this.params.orderCode = this.$route.query.billCode
     this.fetchList(this.params, this.page);
     // this.handleRefreshList();
   },

src/views/purchase/transferOrder/index.vue

@@ -356,7 +356,7 @@ export default {
       queryParams: {
         deliveryInventoryOrg: '',
         storageInventoryOrg: '',
-        code: '',
+        code: this.$route.query.billCode,
         createBy:'',
         pageNum: 1,
         pageSize: 100