|
@@ -42,7 +42,7 @@
|
|
|
:underline="false"
|
|
|
style="font-size: 12px; vertical-align: baseline"
|
|
|
@click="importTemplate"
|
|
|
- >下载模板
|
|
|
+ >下载模板
|
|
|
</el-link>
|
|
|
</div>
|
|
|
</el-upload>
|
|
@@ -68,7 +68,7 @@
|
|
|
size="mini"
|
|
|
v-hasPermi="['system:RetailOrder:insert']"
|
|
|
@click="addHandler"
|
|
|
- >新增
|
|
|
+ >新增
|
|
|
</el-button>
|
|
|
</el-col>
|
|
|
<!-- <el-col :span="1.5" v-if="false">
|
|
@@ -91,7 +91,7 @@
|
|
|
:disabled="multiple"
|
|
|
v-hasPermi="['system:RetailOrder:remove']"
|
|
|
@click="myDeleteHandler"
|
|
|
- >删除
|
|
|
+ >删除
|
|
|
</el-button>
|
|
|
</el-col>
|
|
|
<!-- <el-col :span="1.5">
|
|
@@ -153,19 +153,21 @@
|
|
|
<el-table-column prop="customName" align="center" label="客户名称" />
|
|
|
<el-table-column prop="deliveryDate" align="center" label="交货日期" />
|
|
|
<el-table-column prop="saleLeadTime" align="center" label="交货天数" />
|
|
|
- <el-table-column prop="saleAmountInWords" align="center" label="合计金额(大写)" />
|
|
|
+ <el-table-column
|
|
|
+ prop="saleAmountInWords"
|
|
|
+ align="center"
|
|
|
+ label="合计金额(大写)"
|
|
|
+ />
|
|
|
<el-table-column label="付款方式" align="center" prop="salePayType">
|
|
|
<template slot-scope="scope">
|
|
|
- {{
|
|
|
- getDictLabel(scope.row.salePayType, "payment_method")
|
|
|
- }}
|
|
|
+ {{ getDictLabel(scope.row.salePayType, "payment_method") }}
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column prop="status" align="center" label="状态">
|
|
|
<template slot-scope="scope">
|
|
|
<el-tag :type="scope.row.listClass">{{
|
|
|
- getDictLabel(scope.row.status, "sales_order_status")
|
|
|
- }}</el-tag>
|
|
|
+ getDictLabel(scope.row.status, "sales_order_status")
|
|
|
+ }}</el-tag>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
|
|
@@ -185,7 +187,7 @@
|
|
|
icon="el-icon-edit"
|
|
|
v-hasPermi="['system:RetailOrder:update']"
|
|
|
@click="handleUpdate(scope.row)"
|
|
|
- >修改
|
|
|
+ >修改
|
|
|
</el-button>
|
|
|
</el-dropdown-item>
|
|
|
<el-dropdown-item v-show="scope.row.status == 9">
|
|
@@ -195,7 +197,7 @@
|
|
|
icon="el-icon-edit"
|
|
|
v-hasPermi="['system:RetailOrder:update']"
|
|
|
@click="handleComplate(scope.row)"
|
|
|
- >完成
|
|
|
+ >完成
|
|
|
</el-button>
|
|
|
</el-dropdown-item>
|
|
|
<el-dropdown-item>
|
|
@@ -205,7 +207,7 @@
|
|
|
icon="el-icon-tickets"
|
|
|
v-hasPermi="['system:RetailOrder:info']"
|
|
|
@click="handlePrint(scope.row)"
|
|
|
- >详情
|
|
|
+ >详情
|
|
|
</el-button>
|
|
|
</el-dropdown-item>
|
|
|
<!-- <el-dropdown-item>
|
|
@@ -234,7 +236,7 @@
|
|
|
type="text"
|
|
|
icon="el-icon-folder-delete"
|
|
|
@click="handleOutDetail(scope.row)"
|
|
|
- >出库明细
|
|
|
+ >出库明细
|
|
|
</el-button>
|
|
|
</el-dropdown-item>
|
|
|
<el-dropdown-item v-show="scope.row.status == 5">
|
|
@@ -243,7 +245,7 @@
|
|
|
type="text"
|
|
|
icon="el-icon-folder-delete"
|
|
|
@click="myPrintOutBoundHandler(scope.row)"
|
|
|
- >打印出库单
|
|
|
+ >打印出库单
|
|
|
</el-button>
|
|
|
</el-dropdown-item>
|
|
|
<el-dropdown-item v-show="scope.row.status != 6">
|
|
@@ -253,7 +255,7 @@
|
|
|
icon="el-icon-delete"
|
|
|
v-hasPermi="['system:RetailOrder:remove']"
|
|
|
@click="myDeleteHandler(scope.row)"
|
|
|
- >删除
|
|
|
+ >删除
|
|
|
</el-button>
|
|
|
</el-dropdown-item>
|
|
|
</el-dropdown-menu>
|
|
@@ -414,7 +416,6 @@
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
|
|
|
-
|
|
|
<!-- <el-col :span="12">
|
|
|
<el-form-item label="付款方式:">
|
|
|
<el-select
|
|
@@ -525,11 +526,11 @@
|
|
|
:value="item.productSpecifications"
|
|
|
>
|
|
|
<span class="discribe" style="float: left">{{
|
|
|
- item.productSpecifications
|
|
|
- }}</span>
|
|
|
+ item.productSpecifications
|
|
|
+ }}</span>
|
|
|
<span
|
|
|
style="float: right; color: #8492a6; font-size: 13px"
|
|
|
- >{{ item.productType }}</span
|
|
|
+ >{{ item.productType }}</span
|
|
|
>
|
|
|
</el-option>
|
|
|
</el-select>
|
|
@@ -556,8 +557,8 @@
|
|
|
:value="item.materielCode"
|
|
|
>
|
|
|
<span class="discribe" style="float: left">{{
|
|
|
- item.materieEncoding + item.materieColorNumber
|
|
|
- }}</span>
|
|
|
+ item.materieEncoding + item.materieColorNumber
|
|
|
+ }}</span>
|
|
|
<!-- <span
|
|
|
style="float: right; color: #8492a6; font-size: 13px"
|
|
|
>{{ item.materielCode }}</span
|
|
@@ -625,28 +626,28 @@
|
|
|
</el-form-item>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
-<!-- <el-table-column prop="productUnitPrice" label="单价">-->
|
|
|
-<!-- <template slot-scope="scope">-->
|
|
|
-<!-- <el-form-item-->
|
|
|
-<!-- :prop="'productUnitPrice-' + scope.$index"-->
|
|
|
-<!-- :name="'productUnitPrice-' + scope.$index"-->
|
|
|
-<!-- style="margin: 0px; padding: 0px"-->
|
|
|
-<!-- >-->
|
|
|
-<!-- <el-input-->
|
|
|
-<!-- v-model="scope.row.productUnitPrice"-->
|
|
|
-<!-- size="small"-->
|
|
|
-<!-- oninput="value=value.replace(/[^0-9.]/g,'')"-->
|
|
|
-<!-- @change="computedPrice(scope.row)"-->
|
|
|
-<!-- clearable-->
|
|
|
-<!-- ></el-input>-->
|
|
|
-<!-- </el-form-item>-->
|
|
|
-<!-- </template>-->
|
|
|
-<!-- </el-table-column>-->
|
|
|
-<!-- <el-table-column prop="productAmounts" label="金额">-->
|
|
|
-<!-- <template slot-scope="scope">-->
|
|
|
-<!-- {{ scope.row.productAmounts }}-->
|
|
|
-<!-- </template>-->
|
|
|
-<!-- </el-table-column>-->
|
|
|
+ <!-- <el-table-column prop="productUnitPrice" label="单价">-->
|
|
|
+ <!-- <template slot-scope="scope">-->
|
|
|
+ <!-- <el-form-item-->
|
|
|
+ <!-- :prop="'productUnitPrice-' + scope.$index"-->
|
|
|
+ <!-- :name="'productUnitPrice-' + scope.$index"-->
|
|
|
+ <!-- style="margin: 0px; padding: 0px"-->
|
|
|
+ <!-- >-->
|
|
|
+ <!-- <el-input-->
|
|
|
+ <!-- v-model="scope.row.productUnitPrice"-->
|
|
|
+ <!-- size="small"-->
|
|
|
+ <!-- oninput="value=value.replace(/[^0-9.]/g,'')"-->
|
|
|
+ <!-- @change="computedPrice(scope.row)"-->
|
|
|
+ <!-- clearable-->
|
|
|
+ <!-- ></el-input>-->
|
|
|
+ <!-- </el-form-item>-->
|
|
|
+ <!-- </template>-->
|
|
|
+ <!-- </el-table-column>-->
|
|
|
+ <!-- <el-table-column prop="productAmounts" label="金额">-->
|
|
|
+ <!-- <template slot-scope="scope">-->
|
|
|
+ <!-- {{ scope.row.productAmounts }}-->
|
|
|
+ <!-- </template>-->
|
|
|
+ <!-- </el-table-column>-->
|
|
|
<el-table-column prop="inventoryBoxNum" label="库存箱数">
|
|
|
<template slot-scope="scope">
|
|
|
{{ scope.row.inventoryBoxNum }}
|
|
@@ -672,7 +673,7 @@
|
|
|
type="danger"
|
|
|
size="small"
|
|
|
@click="deleteProduct(scope.$index)"
|
|
|
- >删除</el-button
|
|
|
+ >删除</el-button
|
|
|
>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
@@ -683,7 +684,7 @@
|
|
|
style="width: 100%"
|
|
|
size="small"
|
|
|
@click="addProduct"
|
|
|
- >添加货品</el-button
|
|
|
+ >添加货品</el-button
|
|
|
>
|
|
|
<el-col :span="24">
|
|
|
<el-divider>备注</el-divider>
|
|
@@ -730,7 +731,7 @@
|
|
|
<span slot="footer" class="dialog-footer">
|
|
|
<el-button @click="detailShow = false">取 消</el-button>
|
|
|
<el-button type="primary" @click="detailPrintHandler"
|
|
|
- >打 印</el-button
|
|
|
+ >打 印</el-button
|
|
|
>
|
|
|
</span>
|
|
|
</el-dialog>
|
|
@@ -1102,6 +1103,7 @@ export default {
|
|
|
created() {
|
|
|
// 得到当前展示的table的唯一标识
|
|
|
this.tableKey = this.$route.query.tableKey;
|
|
|
+ this.getList(this.queryParams);
|
|
|
},
|
|
|
watch: {
|
|
|
totalMoney: {
|
|
@@ -1192,7 +1194,7 @@ export default {
|
|
|
productName,
|
|
|
productSpecifications,
|
|
|
productColour,
|
|
|
- inventoryType:'2',
|
|
|
+ inventoryType: "2",
|
|
|
};
|
|
|
if (
|
|
|
!lotNumber &&
|
|
@@ -1702,7 +1704,7 @@ export default {
|
|
|
getRowKey(row) {
|
|
|
return row[
|
|
|
camelCase(this.tableName + "_" + this.templateInfo.template?.primaryKey)
|
|
|
- ];
|
|
|
+ ];
|
|
|
},
|
|
|
/** 查询列表 */
|
|
|
async getList() {
|
|
@@ -1972,7 +1974,7 @@ export default {
|
|
|
sale_order[0];
|
|
|
saleDate && (this.formData.saleDate = new Date(saleDate));
|
|
|
saleOrderEstimatedTime &&
|
|
|
- (this.formData.saleOrderEstimatedTime = saleOrderEstimatedTime);
|
|
|
+ (this.formData.saleOrderEstimatedTime = saleOrderEstimatedTime);
|
|
|
deliveryDate && (this.formData.deliveryDate = new Date(deliveryDate));
|
|
|
|
|
|
this.productIds = sale_products.map((item) => item.saleProductNo);
|
|
@@ -2129,9 +2131,9 @@ export default {
|
|
|
this.$refs.mychild.pageList(
|
|
|
row == undefined
|
|
|
? {
|
|
|
- limit: this.queryParams.pageSize,
|
|
|
- page: this.queryParams.pageNum,
|
|
|
- }
|
|
|
+ limit: this.queryParams.pageSize,
|
|
|
+ page: this.queryParams.pageNum,
|
|
|
+ }
|
|
|
: row
|
|
|
);
|
|
|
},
|
|
@@ -2471,9 +2473,9 @@ export default {
|
|
|
<tr>
|
|
|
<td width="600px" colspan="4">合同号:${saleNo}</td>
|
|
|
<td width="600px" colspan="5">日期:${saleDate.replace(
|
|
|
- "T",
|
|
|
- " "
|
|
|
- )}</td>
|
|
|
+ "T",
|
|
|
+ " "
|
|
|
+ )}</td>
|
|
|
</tr>
|
|
|
<tr align="center">
|
|
|
<td width="300px" colspan="2">客户名称:</td>
|
|
@@ -2723,7 +2725,7 @@ export default {
|
|
|
importTemplate() {
|
|
|
this.download(
|
|
|
process.env.VUE_APP_BASE_API1 +
|
|
|
- `common/exportTemplate?tableName=${this.tableName}&sqlkey=${this.templateInfo.template.sqlKey}`,
|
|
|
+ `common/exportTemplate?tableName=${this.tableName}&sqlkey=${this.templateInfo.template.sqlKey}`,
|
|
|
{},
|
|
|
`下载模版名称${new Date().getTime()}.xlsx`
|
|
|
);
|
|
@@ -2739,8 +2741,8 @@ export default {
|
|
|
this.$refs.upload.clearFiles();
|
|
|
this.$alert(
|
|
|
"<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" +
|
|
|
- response.msg +
|
|
|
- "</div>",
|
|
|
+ response.msg +
|
|
|
+ "</div>",
|
|
|
"导入结果",
|
|
|
{ dangerouslyUseHTMLString: true }
|
|
|
);
|
|
@@ -2865,7 +2867,7 @@ export default {
|
|
|
item.fieldValue
|
|
|
? item.fieldValue
|
|
|
: this.currentRow[
|
|
|
- camelCase(item.fieldName.replace(".", "_"))
|
|
|
+ camelCase(item.fieldName.replace(".", "_"))
|
|
|
];
|
|
|
});
|
|
|
conditionData.forEach((item) => {
|
|
@@ -2873,7 +2875,7 @@ export default {
|
|
|
item.fieldValue
|
|
|
? item.fieldValue
|
|
|
: this.currentRow[
|
|
|
- camelCase(item.fieldName.replace(".", "_"))
|
|
|
+ camelCase(item.fieldName.replace(".", "_"))
|
|
|
];
|
|
|
});
|
|
|
}
|
|
@@ -3255,9 +3257,9 @@ export default {
|
|
|
<tr>
|
|
|
<td width="600px" colspan="4">合同号:${saleNo}</td>
|
|
|
<td width="600px" colspan="4">日期:${saleDate.replace(
|
|
|
- "T",
|
|
|
- " "
|
|
|
- )}</td>
|
|
|
+ "T",
|
|
|
+ " "
|
|
|
+ )}</td>
|
|
|
</tr>
|
|
|
<tr align="center">
|
|
|
<td width="300px" colspan="2">客户名称:</td>
|
|
@@ -3274,9 +3276,9 @@ export default {
|
|
|
<tr align="center">
|
|
|
<td width="300px" colspan="2">预计下单时间:</td>
|
|
|
<td colspan="1">${saleOrderEstimatedTime.replace(
|
|
|
- "T",
|
|
|
- " "
|
|
|
- )}</td>
|
|
|
+ "T",
|
|
|
+ " "
|
|
|
+ )}</td>
|
|
|
<td colspan="1">交货周期:</td>
|
|
|
<td >${saleLeadTime}</td>
|
|
|
<td colspan="2">交货日期:</td>
|
|
@@ -3481,4 +3483,3 @@ export default {
|
|
|
min-width: 610px !important;
|
|
|
}
|
|
|
</style>
|
|
|
-
|