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

src/views/material/changeApply/add.vue

@@ -696,14 +696,24 @@
             this.basicForm.storageConditions = data.storageCondition
             this.basicForm.transportCondition = data.transportationCondition
             this.basicForm.leadTime = data.deliveryPeriod
+            this.basicForm.diCode = data.diCode
+            this.basicForm.businessLine = data.businessLine
+            this.basicForm.productionPermit = data.productionPermit
             if (data.manufacturerId) {
               this.getFactoryDetails(data.manufacturerId)
             }
+            if (data.businessLine) {
+              this.getLineDetails(data.businessLine)
+            }
             if (data.medcines.length !== 0) {
               this.basicForm2.drug = data.medcines[0].isDrug
               this.basicForm2.registrationNo = data.medcines[0].registrationNo
               this.basicForm2.medicalDevices = data.medcines[0].medicalInstruments
               this.basicForm2.maintenanceType = data.medcines[0].curingType
+              this.basicForm2.dosageFrom = data.medcines[0].dosageFrom
+              if (data.medcines[0].dosageFrom) {
+                this.getDoseDetails(data.medcines[0].dosageFrom)
+              }
             }
             // 控制医药属性是否能够填写
             if (this.basicForm.medicineMaterial == '0') {

src/views/purchase/DemandSummary/index.vue

@@ -233,6 +233,22 @@
               </el-form-item>
             </el-col>
           </el-row>
+
+          <el-row :gutter="10">
+            <el-col :span="1.5">
+              <el-form-item label="审批结束日期">
+                <el-date-picker
+                  v-model="queryParams.approverFinishTime"
+                  type="date"
+                  clearable
+                  value-format="yyyy-MM-dd"
+                  size="small"
+                  style="width: 200px"
+                >
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
+          </el-row>
         </div>
         </CollapseTransition>
       </el-form>
@@ -459,6 +475,7 @@ export default {
         demandDate: '',
         auditTime: '',
         yesTime: '',
+        approverFinishTime: '',
         pageNum: 1,
         pageSize: 5
       },

src/views/purchase/PurchaseDemandList/add.vue

@@ -860,6 +860,12 @@ export default {
         this.basicForm.customer = selection[0].id
         this.basicForm.customerName = selection[0].name
         this.basicForm.customerCode = selection[0].code
+        if(this.basicForm.puDemandItemList.length !== 0) {
+          this.basicForm.puDemandItemList.forEach(item => {
+            item.demandCustomerName = this.basicForm.customerName
+            item.demandCustomer = this.basicForm.customer
+          })
+        }
       }
       if(this.referCondition.type == 'CONTACTS_PARAM') {
         this.personOptions = selection

src/views/purchase/PurchaseDemandList/index.vue

@@ -210,6 +210,7 @@
       :disabled="upload.isUploading"
       :on-progress="handleFileUploadProgress"
       :on-success="handleFileSuccess"
+      :on-error="errorFile"
       :auto-upload="false"
       drag
       >
@@ -261,7 +262,7 @@ export default {
         // 是否禁用上传
         isUploading: false,
         // 是否更新已经存在的用户数据
-        updateSupport: 0,
+        updateSupport: 1,
         // 设置上传的请求头部
         headers: { Authorization: "Bearer " + getToken() },
         // 上传的地址
@@ -424,6 +425,9 @@ export default {
       this.$alert(response.msg, "导入结果", { dangerouslyUseHTMLString: true });
       this.getList(this.queryParams);
     },
+    errorFile(err) {
+      this.$modal.notifyError("文件已变动，请重新上传");
+    },
     // 提交上传文件
     submitFileForm() {
       this.$refs.upload.submit();

src/views/purchase/transferOrder/index.vue

@@ -102,7 +102,7 @@
         >
           <el-table-column show-overflow-tooltip label="调出库存" align="center" prop="deliveryInventoryOrgName" width="150px"/>
           <el-table-column show-overflow-tooltip label="订单类型" align="center" prop="billType" width="150px"/>
-          <el-table-column show-overflow-tooltip label="单据号" align="center" prop="code" width="150px"/>
+          <el-table-column show-overflow-tooltip label="单据号" align="center" prop="code" width="180px"/>
           <el-table-column show-overflow-tooltip label="单据日期" align="center" prop="billDate" width="150px"/>
           <el-table-column show-overflow-tooltip label="调拨方式" align="center" prop="allotType" width="150px">
             <template slot-scope="scope">