Merge branch 'purchaseDev' into 'dev'

Purchase dev

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

src/views/material/requisition/add.vue

@@ -1149,7 +1149,8 @@
         console.log('val1111111', val)
         if (val == '0') {
           this.isControl = false
-          this.basicForm2.dosageFrom = '0001A11000000000BX7Z'
+          this.basicForm2.dosageFrom = '0001A11000000000BX7Z';
+          this.basicForm2.isDrug = '2';
           this.getDoseDetails(this.basicForm2.dosageFrom)
         } else {
           this.basicForm2.isDrug = ''

src/views/purchase/PurchaseDemandList/add.vue

@@ -342,6 +342,7 @@
           <ux-table-column resizable title="调拨单号" align="center"  field="allotCode"></ux-table-column>
           <ux-table-column resizable title="调拨占有量" align="center"  field="allotQty" width="100px"/>
           <ux-table-column resizable title="最终净需求量" align="center"  field="resDemandQty" width="120px"/>
+          <ux-table-column resizable title="关闭数量" align="center"  field="closeQty" width="80px"/>
           <ux-table-column resizable title="最终采购执行数量" align="center"  field="executeQty" width="150px">
             <template v-slot:edit="scope">
               {{ scope.row.executeQty ? scope.row.executeQty : 0 }}
@@ -1349,6 +1350,8 @@ export default {
         this.adjust.contacts = ''
         this.adjust.contactsPhone = ''
         this.adjust.address = ''
+        // 选择完清空参数里面的组织id
+        this.referCondition.pkOrg = ''
       }
       if(this.referCondition.type == 'ALLOCATION_PARAM' && this.referCondition.title == '收货货位') {
         this.adjust.allocation = selection[0].id
@@ -1377,6 +1380,8 @@ export default {
         this.basicForm.puDemandItemList[this.tableIndex].contacts = null
         this.basicForm.puDemandItemList[this.tableIndex].contactsPhone = null
         this.basicForm.puDemandItemList[this.tableIndex].address = null
+        // 选择完清空参数里面的组织id
+        this.referCondition.pkOrg = ''
       }
       if(this.referCondition.title == '选择收货货位') {
         this.basicForm.puDemandItemList[this.tableIndex].deliveryAllocation = selection[0].id