【修改】bug

src/api/supply/pickup.js

@@ -116,6 +116,7 @@ export function addPrints(params) {
     params
   })
 }
+
 // 增加打印次数
 export function addPrint(params) {
   return request({

src/components/Common/print-common.vue

@@ -31,9 +31,9 @@
             <el-col :span="2">出库单号</el-col>
             <el-col :span="2">发货单号</el-col>
             <el-col :span="2">发货日期</el-col>
-            <el-col :span="2">订单号</el-col>
+            <el-col :span="3">订单号</el-col>
             <!-- <el-col :span="2">工程编号</el-col> -->
-            <el-col :span="4">存货名称</el-col>
+            <el-col :span="3">存货名称</el-col>
             <el-col :span="6">规格型号</el-col>
             <el-col :span="2">数量</el-col>
             <el-col :span="2">备注说明</el-col>
@@ -44,10 +44,10 @@
             <el-row :gutter="20">
               <el-col :span="2">{{ it.salesId }}</el-col>
               <el-col :span="2">{{ it.invoiceId }}</el-col>
-              <el-col :span="2">{{ it.id ? dateToDayFilter(item.orderTime) : '' }}</el-col>
-              <el-col :span="2">{{ it.enginOrderType =='HOME' || it.enginOrderType =='TRADE'? it.enginOrderNo :it.mainOrderId }}</el-col>
+              <el-col :span="2">{{ it.id ? dateToDayFilter(item.createTime) : '' }}</el-col>
+              <el-col :span="3">{{ it.enginOrderType =='HOME' || it.enginOrderType =='TRADE'? it.enginOrderNo :it.mainOrderId }}</el-col>
               <!-- <el-col :span="2">{{ it.refEnginRecordNo }}</el-col> -->
-              <el-col :span="4">{{ it.materialName }}</el-col>
+              <el-col :span="3">{{ it.materialName }}</el-col>
               <el-col :span="6">{{ it.specification }}</el-col>
               <el-col :span="2">{{ it.refundableQty }}</el-col>
                <el-col :span="2">{{ it.pjxh1Text }}</el-col>

src/views/supply/apply/components/apply_return_form.vue

@@ -77,9 +77,9 @@
     <div class="table" style="margin-top: 20px">
       <el-table :data="goodsList" element-loading-text="Loading" border fit highlight-current-row stripe max-height="400">
         <el-table-column align="center" label="序号" type="index" width="50"></el-table-column>
-        <el-table-column align="left" label="引用单号" prop="orderId" min-width="160" show-overflow-tooltip></el-table-column>
+        <!-- <el-table-column align="left" label="引用单号" prop="orderId" min-width="160" show-overflow-tooltip></el-table-column>
         <el-table-column align="left" label="销售出库单号" prop="id" min-width="100" show-overflow-tooltip></el-table-column>
-        <el-table-column align="left" label="发货申请单号" prop="orderNo" min-width="120" show-overflow-tooltip></el-table-column>
+        <el-table-column align="left" label="发货申请单号" prop="orderNo" min-width="120" show-overflow-tooltip></el-table-column> -->
         <el-table-column align="left" label="订单号" prop="mainOrderId" min-width="120" show-overflow-tooltip></el-table-column>
         <el-table-column align="left" label="销售类型" prop="saleTypeName" min-width="100" show-overflow-tooltip></el-table-column>
         <el-table-column align="left" label="物料编码" prop="materialCode" min-width="120" show-overflow-tooltip></el-table-column>
@@ -542,9 +542,9 @@ export default {
           let params = {
             remark: this.mainForm.remark,
             fileUrl: this.fileList && this.fileList.length > 0 ? this.fileList[0].url : '',
-            fileName: this.fileList && this.fileList.length > 0 ? this.fileList[0].name : '',
+            fileName: this.fileList && this.fileList.length > 0 ? this.fileList[0].name  : '',
             correspondId: this.mainForm.warehouse,
-            correspondName: warehouseItem.name,
+            correspondName: warehouseItem && warehouseItem.name?warehouseItem.name:'' ,
             salesOrderId: this.goodsList[0].id,
             orders: goodsList,
             examineStatus: status,

src/views/supply/apply/components/engin_form.vue

@@ -61,7 +61,7 @@
         </el-col>
         <el-col :xs="24" :sm="12" :lg="8">
           <el-form-item label="工程登录类型" prop="loginType">
-            <el-input v-model="mainForm.loginType" placeholder="请输入工程登录类型"></el-input>
+            <el-input v-model="mainForm.loginType" placeholder="请输入工程登录类型" disabled></el-input>
           </el-form-item>
         </el-col>
         <el-col :xs="24" :sm="12" :lg="8">

src/views/supply/deliver/sum_list.vue

@@ -140,8 +140,8 @@
             </el-table-column>
                <el-table-column align="left" label="订单号" prop="orderId" min-width="130" show-overflow-tooltip>
               <template slot-scope="scope">
-                <CopyButton :copyText="scope.row.orderId" />
-                <span>{{scope.row.orderId}}</span>
+                <CopyButton :copyText="scope.row.enginOrderType =='HOME' || scope.row.enginOrderType =='TRADE'? scope.row.enginOrderNo :scope.row.mainOrderId " />
+                <span>{{scope.row.enginOrderType =='HOME' || scope.row.enginOrderType =='TRADE'? scope.row.enginOrderNo :scope.row.mainOrderId }}</span>
               </template>
             </el-table-column>
             <el-table-column align="left" label="经销商编码" prop="customerNumber" min-width="100" show-overflow-tooltip>

src/views/supply/reserve/components/reserve_form.vue

@@ -93,7 +93,7 @@
             <div v-if="scope.row.orderId || listItem">{{scope.row.customerName}}</div>
             <el-select
               v-else
-              v-model="scope.row.customerName"
+              v-model="scope.row.customerNumber"
               placeholder="选择经销商"
               size="small"
               filterable
@@ -104,7 +104,7 @@
               <el-option
                 v-for="item in dealerList"
                 :key="item.number"
-                :label="item.number"
+                :label="item.name"
                 :value="item.number">
                 <span>{{ item.number }}</span>
                 <span style="color: #8492a6; font-size: 13px; margin-left: 6px">{{ item.name }}</span>
@@ -143,18 +143,18 @@
             <div v-if="scope.row.orderId || listItem">{{scope.row.specification}}</div>
             <el-select
               v-else
-              v-model="scope.row.specification"
+              v-model="scope.row.materialCode"
               placeholder="选择规格型号"
               size="small"
               filterable
               remote
               clearable
               :remote-method="(e)=>checkMaterialList(e,2)"
-              @change="changeDealer(scope.$index)">
+              @change="changeMaterial(scope.$index)">
               <el-option
                 v-for="item in materialList"
                 :key="item.number"
-                :label="item.number"
+                :label="item.specification"
                 :value="item.number">
                 <span>{{ item.number }}</span>
                 <span style="color: #8492a6; font-size: 13px; margin-left: 6px">{{ item.specification }}</span>
@@ -609,6 +609,7 @@ export default {
 
     // 更改经销商
     changeDealer(index) {
+      console.log(444,index,this.goodsList, this.goodsList[index].customerNumber);
       if(this.goodsList[index].customerNumber) {
         let obj = this.dealerList.find(o => o.number == this.goodsList[index].customerNumber);
         this.goodsList[index].customerName = obj.name;