|
@@ -21,12 +21,7 @@
|
|
style="width: 100%"
|
|
style="width: 100%"
|
|
:disabled="!!listItem"
|
|
:disabled="!!listItem"
|
|
>
|
|
>
|
|
- <el-option
|
|
|
|
- v-for="(item, index) in warehouseList"
|
|
|
|
- :key="index"
|
|
|
|
- :label="item.name"
|
|
|
|
- :value="item.id"
|
|
|
|
- />
|
|
|
|
|
|
+ <el-option v-for="(item, index) in warehouseList" :key="index" :label="item.name" :value="item.id" />
|
|
</el-select>
|
|
</el-select>
|
|
</el-form-item>
|
|
</el-form-item>
|
|
</el-col>
|
|
</el-col>
|
|
@@ -66,7 +61,7 @@
|
|
:key="index"
|
|
:key="index"
|
|
:label="item.dictCode"
|
|
:label="item.dictCode"
|
|
:disabled="item.disabled"
|
|
:disabled="item.disabled"
|
|
- >{{ item.dictValue }}
|
|
|
|
|
|
+ >{{ item.dictValue }}
|
|
</el-radio>
|
|
</el-radio>
|
|
</el-radio-group>
|
|
</el-radio-group>
|
|
</el-form-item>
|
|
</el-form-item>
|
|
@@ -282,50 +277,18 @@
|
|
</template>
|
|
</template>
|
|
</el-table-column>
|
|
</el-table-column>
|
|
</template>
|
|
</template>
|
|
- <el-table-column
|
|
|
|
- align="left"
|
|
|
|
- label="经销商订单"
|
|
|
|
- prop="customerOrderId"
|
|
|
|
- min-width="160"
|
|
|
|
- show-overflow-tooltip
|
|
|
|
- >
|
|
|
|
|
|
+ <el-table-column align="left" label="经销商订单" prop="customerOrderId" min-width="160" show-overflow-tooltip>
|
|
<template slot-scope="scope">
|
|
<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="invoiceId"
|
|
|
|
- min-width="160"
|
|
|
|
- show-overflow-tooltip
|
|
|
|
- />
|
|
|
|
- <el-table-column
|
|
|
|
- align="left"
|
|
|
|
- label="产品名称"
|
|
|
|
- prop="materialName"
|
|
|
|
- min-width="160"
|
|
|
|
- show-overflow-tooltip
|
|
|
|
- />
|
|
|
|
- <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 }}
|
|
|
|
|
|
+ <el-input
|
|
|
|
+ v-model="scope.row.customerOrderId"
|
|
|
|
+ placeholder="请输入"
|
|
|
|
+ size="mini"
|
|
|
|
+ clearable
|
|
|
|
+ @input="handleOrderIdChange($event, scope.row)"
|
|
|
|
+ />
|
|
</template>
|
|
</template>
|
|
</el-table-column>
|
|
</el-table-column>
|
|
|
|
+
|
|
<el-table-column
|
|
<el-table-column
|
|
align="left"
|
|
align="left"
|
|
label="工程登录编号"
|
|
label="工程登录编号"
|
|
@@ -334,66 +297,55 @@
|
|
show-overflow-tooltip
|
|
show-overflow-tooltip
|
|
>
|
|
>
|
|
<template v-if="scope.row" slot-scope="scope">
|
|
<template v-if="scope.row" slot-scope="scope">
|
|
- <CopyButton
|
|
|
|
- :copy-text="scope.row.refEnginRecordNo"
|
|
|
|
- />
|
|
|
|
- <span>{{
|
|
|
|
- scope.row.refEnginRecordNo
|
|
|
|
- }}</span>
|
|
|
|
|
|
+ <CopyButton :copy-text="scope.row.refEnginRecordNo" />
|
|
|
|
+ <span>{{ scope.row.refEnginRecordNo }}</span>
|
|
</template>
|
|
</template>
|
|
</el-table-column>
|
|
</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>
|
|
<el-table-column align="left" label="销售订单号" min-width="160" show-overflow-tooltip>
|
|
<template v-if="scope.row" slot-scope="scope">
|
|
<template v-if="scope.row" slot-scope="scope">
|
|
<CopyButton
|
|
<CopyButton
|
|
:copy-text="
|
|
:copy-text="
|
|
scope.row.orderType === 'TRADE' ||
|
|
scope.row.orderType === 'TRADE' ||
|
|
- scope.row.orderType === 'HOME' ||
|
|
|
|
- scope.row.orderType === 'REQUISITION_TRADE' ||
|
|
|
|
- scope.row.orderType === 'REQUISITION_HOME'
|
|
|
|
|
|
+ scope.row.orderType === 'HOME' ||
|
|
|
|
+ scope.row.orderType === 'REQUISITION_TRADE' ||
|
|
|
|
+ scope.row.orderType === 'REQUISITION_HOME'
|
|
? scope.row.enginOrderNo
|
|
? scope.row.enginOrderNo
|
|
: scope.row.mainOrderId
|
|
: scope.row.mainOrderId
|
|
"
|
|
"
|
|
/>
|
|
/>
|
|
<span>{{
|
|
<span>{{
|
|
- (scope.row.orderType === 'TRADE' ||
|
|
|
|
- scope.row.orderType === 'HOME' ||
|
|
|
|
- scope.row.orderType === 'REQUISITION_TRADE' ||
|
|
|
|
- scope.row.orderType === 'REQUISITION_HOME')
|
|
|
|
|
|
+ scope.row.orderType === 'TRADE' ||
|
|
|
|
+ scope.row.orderType === 'HOME' ||
|
|
|
|
+ scope.row.orderType === 'REQUISITION_TRADE' ||
|
|
|
|
+ scope.row.orderType === 'REQUISITION_HOME'
|
|
? scope.row.enginOrderNo
|
|
? scope.row.enginOrderNo
|
|
: scope.row.mainOrderId
|
|
: scope.row.mainOrderId
|
|
}}</span>
|
|
}}</span>
|
|
</template>
|
|
</template>
|
|
</el-table-column>
|
|
</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="enginOrderNo" min-width="140" show-overflow-tooltip></el-table-column> -->
|
|
- <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="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-column align="left" label="单位" prop="unit" min-width="100" show-overflow-tooltip />
|
|
|
|
|
|
<el-table-column v-if="flag && mainForm.pickupWay == '2'" fixed="right" label="操作" width="250">
|
|
<el-table-column v-if="flag && mainForm.pickupWay == '2'" fixed="right" label="操作" width="250">
|
|
<template slot-scope="scope">
|
|
<template slot-scope="scope">
|
|
<el-button type="text" size="small" @click="handLogistics(scope.row)">物流信息</el-button>
|
|
<el-button type="text" size="small" @click="handLogistics(scope.row)">物流信息</el-button>
|
|
<el-button type="text" size="small" @click="getListCostBillV2(scope.row)">物流费用</el-button>
|
|
<el-button type="text" size="small" @click="getListCostBillV2(scope.row)">物流费用</el-button>
|
|
<el-button type="text" size="small" @click="getListCodeV2(scope.row)">出库条码</el-button>
|
|
<el-button type="text" size="small" @click="getListCodeV2(scope.row)">出库条码</el-button>
|
|
-
|
|
|
|
</template>
|
|
</template>
|
|
</el-table-column>
|
|
</el-table-column>
|
|
</el-table>
|
|
</el-table>
|
|
@@ -401,12 +353,8 @@
|
|
</div>
|
|
</div>
|
|
<div class="page-footer">
|
|
<div class="page-footer">
|
|
<div class="footer" :class="classObj">
|
|
<div class="footer" :class="classObj">
|
|
- <el-button
|
|
|
|
- v-if="!flag"
|
|
|
|
- type="primary"
|
|
|
|
- :loading="formLoading"
|
|
|
|
- @click="clickSubmitForm"
|
|
|
|
- >{{ formLoading ? '提交中 ...' : '提 交' }}
|
|
|
|
|
|
+ <el-button v-if="!flag" type="primary" :loading="formLoading" @click="clickSubmitForm"
|
|
|
|
+ >{{ formLoading ? '提交中 ...' : '提 交' }}
|
|
</el-button>
|
|
</el-button>
|
|
<el-popconfirm v-if="!listItem" title="确定重置吗?" style="margin-left: 10px" @onConfirm="resetForm">
|
|
<el-popconfirm v-if="!listItem" title="确定重置吗?" style="margin-left: 10px" @onConfirm="resetForm">
|
|
<el-button slot="reference">重 置</el-button>
|
|
<el-button slot="reference">重 置</el-button>
|