|
@@ -162,7 +162,7 @@
|
|
|
</el-form>
|
|
|
</div>
|
|
|
|
|
|
- <div class="mymain-container" v-if="logisticsNumber === '001' && mainForm.pickupWay == 2 && flag">
|
|
|
+ <div class="mymain-container" key="666666666666" v-if="logisticsNumber === '001' && mainForm.pickupWay == 2 && flag">
|
|
|
<div class="table">
|
|
|
<el-table
|
|
|
ref="table"
|
|
@@ -344,7 +344,7 @@
|
|
|
</el-table>
|
|
|
</div>
|
|
|
</div>
|
|
|
- <div class="mymain-container" v-else-if="(logisticsNumber === '001' && mainForm.pickupWay == 2) && !flag">
|
|
|
+ <div class="mymain-container" key="77777777777" v-else-if="(logisticsNumber === '001' && mainForm.pickupWay == 2) && !flag">
|
|
|
<div class="table">
|
|
|
<el-table
|
|
|
ref="table"
|
|
@@ -519,7 +519,7 @@
|
|
|
</el-table>
|
|
|
</div>
|
|
|
</div>
|
|
|
- <div class="mymain-container" v-else-if="logisticsNumber !== '001' && (mainForm.pickupWay == 2 && flag)">
|
|
|
+ <div class="mymain-container" key="888888888" v-else-if="logisticsNumber !== '001' && (mainForm.pickupWay == 2 && flag)">
|
|
|
<div class="table">
|
|
|
<el-table
|
|
|
ref="table"
|
|
@@ -603,6 +603,83 @@
|
|
|
</el-table>
|
|
|
</div>
|
|
|
</div>
|
|
|
+ <div class="mymain-container" v-else key="9999999">
|
|
|
+ <div class="table">
|
|
|
+ <el-table
|
|
|
+ ref="table"
|
|
|
+ v-loading="listLoading"
|
|
|
+ :data="deliverList"
|
|
|
+ element-loading-text="Loading"
|
|
|
+ border
|
|
|
+ fit
|
|
|
+ highlight-current-row
|
|
|
+ stripe
|
|
|
+ height="520px"
|
|
|
+ @select="handleSelect"
|
|
|
+ @select-all="handleSelectAll"
|
|
|
+ >
|
|
|
+ <el-table-column align="center" type="selection" width="55" />
|
|
|
+ <el-table-column align="left" label="经销商订单" prop="customerOrderId" min-width="160" show-overflow-tooltip>
|
|
|
+ <template slot-scope="scope">
|
|
|
+ <el-input
|
|
|
+ v-model="scope.row.customerOrderId"
|
|
|
+ placeholder="请输入"
|
|
|
+ size="mini"
|
|
|
+ clearable
|
|
|
+ @input="handleOrderIdChange($event, scope.row)"
|
|
|
+ />
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ align="left"
|
|
|
+ label="工程登录编号"
|
|
|
+ prop="refEnginRecordNo"
|
|
|
+ min-width="160"
|
|
|
+ show-overflow-tooltip
|
|
|
+ >
|
|
|
+ <template v-if="scope.row" slot-scope="scope">
|
|
|
+ <CopyButton :copy-text="scope.row.refEnginRecordNo" />
|
|
|
+ <span>{{ scope.row.refEnginRecordNo }}</span>
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column align="left" label="规格型号" prop="specification" min-width="160" show-overflow-tooltip />
|
|
|
+ <el-table-column align="right" label="数量" prop="refundableQty" min-width="100" show-overflow-tooltip />
|
|
|
+ <el-table-column align="left" label="单据日期" prop="orderTime" min-width="120" show-overflow-tooltip>
|
|
|
+ <template slot-scope="scope">
|
|
|
+ {{ scope.row.orderTime | dateToDayFilter }}
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column align="left" label="发货申请单" prop="invoiceId" min-width="160" show-overflow-tooltip />
|
|
|
+ <el-table-column align="left" label="销售订单号" min-width="160" show-overflow-tooltip>
|
|
|
+ <template v-if="scope.row" slot-scope="scope">
|
|
|
+ <CopyButton
|
|
|
+ :copy-text="
|
|
|
+ scope.row.orderType === 'TRADE' ||
|
|
|
+ scope.row.orderType === 'HOME' ||
|
|
|
+ scope.row.orderType === 'REQUISITION_TRADE' ||
|
|
|
+ scope.row.orderType === 'REQUISITION_HOME'
|
|
|
+ ? scope.row.enginOrderNo
|
|
|
+ : scope.row.mainOrderId
|
|
|
+ "
|
|
|
+ />
|
|
|
+ <span>{{
|
|
|
+ scope.row.orderType === 'TRADE' ||
|
|
|
+ scope.row.orderType === 'HOME' ||
|
|
|
+ scope.row.orderType === 'REQUISITION_TRADE' ||
|
|
|
+ scope.row.orderType === 'REQUISITION_HOME'
|
|
|
+ ? scope.row.enginOrderNo
|
|
|
+ : scope.row.mainOrderId
|
|
|
+ }}</span>
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ <!-- <el-table-column align="left" label="工程编号" prop="enginOrderNo" min-width="140" show-overflow-tooltip></el-table-column> -->
|
|
|
+ <el-table-column align="left" label="产品名称" prop="materialName" min-width="160" show-overflow-tooltip />
|
|
|
+ <el-table-column align="left" label="销售类型" prop="saleTypeName" min-width="160" show-overflow-tooltip />
|
|
|
+ <el-table-column align="left" label="物料编码" prop="materialCode" min-width="160" show-overflow-tooltip />
|
|
|
+ <el-table-column align="left" label="单位" prop="unit" min-width="100" show-overflow-tooltip />
|
|
|
+ </el-table>
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
|
|
|
|
|
|
|