|
|
@@ -418,8 +418,8 @@
|
|
|
:value="item.productName"
|
|
|
>
|
|
|
<span class="discribe" style="float: left">{{
|
|
|
- item.productName
|
|
|
- }}</span>
|
|
|
+ item.productName
|
|
|
+ }}</span>
|
|
|
<!-- <span
|
|
|
style="float: right; color: #8492a6; font-size: 13px"
|
|
|
>{{ item.productSpecifications }}</span
|
|
|
@@ -448,11 +448,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>
|
|
|
@@ -491,6 +491,32 @@
|
|
|
</el-form-item>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
+
|
|
|
+ <el-table-column prop="level" width="100" label="等级">
|
|
|
+ <template slot-scope="scope">
|
|
|
+ <el-form-item
|
|
|
+ :prop="'level-' + scope.$index"
|
|
|
+ :name="'level-' + scope.$index"
|
|
|
+ style="margin: 0px; padding: 0px"
|
|
|
+ >
|
|
|
+ <el-select
|
|
|
+ v-model="scope.row.level"
|
|
|
+ placeholder=""
|
|
|
+ filterable
|
|
|
+ >
|
|
|
+ <el-option
|
|
|
+ v-for="item in levelOptions"
|
|
|
+ :key="item.id"
|
|
|
+ :label="item.codeName"
|
|
|
+ :value="item.codeName"
|
|
|
+ >
|
|
|
+ </el-option>
|
|
|
+ </el-select>
|
|
|
+ </el-form-item>
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+
|
|
|
+
|
|
|
<el-table-column prop="productNumber" label="数量/kg">
|
|
|
<template slot-scope="scope">
|
|
|
<el-form-item
|
|
|
@@ -571,7 +597,7 @@
|
|
|
type="danger"
|
|
|
size="small"
|
|
|
@click="deleteProduct(scope.$index)"
|
|
|
- >删除
|
|
|
+ >删除
|
|
|
</el-button>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
@@ -582,7 +608,7 @@
|
|
|
style="width: 100%"
|
|
|
size="small"
|
|
|
@click="addProduct"
|
|
|
- >添加货品
|
|
|
+ >添加货品
|
|
|
</el-button>
|
|
|
<el-col :span="12">
|
|
|
<el-form-item label-width="120px" label="合计金额(大写)">
|
|
|
@@ -729,7 +755,7 @@
|
|
|
@click="editConfirm"
|
|
|
:disabled="isAdding"
|
|
|
:loading="isAdding"
|
|
|
- >确 定</el-button
|
|
|
+ >确 定</el-button
|
|
|
>
|
|
|
<el-button @click="cancel">取 消</el-button>
|
|
|
</div>
|
|
|
@@ -781,7 +807,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>
|
|
|
@@ -871,6 +897,7 @@ import OutStock from "@/views/orderMange/components/dialogForm/OutStock.vue";
|
|
|
import OutStockDetail from "@/views/orderMange/components/dialogForm/OutStockDetail.vue"; //拆分零售订单与普通订单
|
|
|
import oldOutBound from "@/views/orderMange/components/dialogForm/oldOutBound.vue";
|
|
|
import { numToCapital } from "@/utils/other";
|
|
|
+import {getOptionLsit} from "@/api/codeListManage/productCodeList";
|
|
|
|
|
|
export default {
|
|
|
name: "listInfo",
|
|
|
@@ -904,6 +931,7 @@ export default {
|
|
|
|
|
|
// 出库单 end
|
|
|
myDelIds: [], //新增接口 删除的id
|
|
|
+ dropDownData: {},
|
|
|
// 详情弹窗数据
|
|
|
detailShow: false,
|
|
|
printDomData: "",
|
|
|
@@ -946,6 +974,7 @@ export default {
|
|
|
colourNumberLabel: "",
|
|
|
colours: "", //色号
|
|
|
remark: "", //备注
|
|
|
+ level: "", //等级
|
|
|
// 工艺表
|
|
|
craftGrid: "", //网络
|
|
|
craftOil: "", //油剂
|
|
|
@@ -959,6 +988,7 @@ export default {
|
|
|
sliceTypeOptions: [], //切片型号选项
|
|
|
colourNumberOptions: [], //色号选项
|
|
|
allProductionOptions: [], //所有产品选项
|
|
|
+ levelOptions: [], //等级选项
|
|
|
productionOptions: [],
|
|
|
customerOptions: [],
|
|
|
productionTableData: [
|
|
|
@@ -1258,6 +1288,34 @@ export default {
|
|
|
this.productionOptions = this.allProductionOptions.slice(0, 500);
|
|
|
}
|
|
|
},
|
|
|
+ // 获取下拉数据
|
|
|
+ async getSelectOptions() {
|
|
|
+ try {
|
|
|
+ let res = await getOptionLsit();
|
|
|
+ if (res.code == 200) {
|
|
|
+ this.dropDownData = res.data || {};
|
|
|
+ // 初始化默认值
|
|
|
+ if (this.dropDownData.level?.length > 0 && this.excuteType == 1) {
|
|
|
+ this.formData.level = this.dropDownData.level[0].codeName;
|
|
|
+ }
|
|
|
+ } else {
|
|
|
+ this.$message.error("网络异常!");
|
|
|
+ }
|
|
|
+ } catch (error) {}
|
|
|
+ },
|
|
|
+ // 等级改变回调
|
|
|
+ async levelChangeHandler() {
|
|
|
+ // return;
|
|
|
+ // 等级发生变化，重新获取码单号
|
|
|
+ this.tableData = []; //清空打印记录
|
|
|
+ let res = await getQrCode();
|
|
|
+ this.summertId = new Date().getTime(); //总码单id重新生成
|
|
|
+ if (res.code == 200) {
|
|
|
+ this.qrCode = res.msg;
|
|
|
+ } else {
|
|
|
+ this.$message.error(res.msg);
|
|
|
+ }
|
|
|
+ },
|
|
|
// 出库单回调
|
|
|
async myPrintOutBoundHandler(row, data) {
|
|
|
console.log("row", row);
|
|
|
@@ -1296,7 +1354,6 @@ export default {
|
|
|
productName: item.productName,
|
|
|
productSpecifications: item.productSpecifications,
|
|
|
productColour: item.productColour,
|
|
|
- productId: item.productId,
|
|
|
lotNumber: item.lotNumber,
|
|
|
weight: item.productNumber,
|
|
|
productPrice: item.productUnitPrice,
|
|
|
@@ -1405,6 +1462,7 @@ export default {
|
|
|
sliceType: "", //切片类型
|
|
|
sliceTypeLabel: "",
|
|
|
colourNumberLabel: "",
|
|
|
+ level: "",//等级
|
|
|
colours: "", //色号
|
|
|
remark: "", //备注
|
|
|
// 工艺表
|
|
|
@@ -1434,9 +1492,10 @@ export default {
|
|
|
index === 1 ||
|
|
|
index === 2 ||
|
|
|
index === 3 ||
|
|
|
- index === 7 ||
|
|
|
+ index === 4 ||
|
|
|
index === 8 ||
|
|
|
- index === 9
|
|
|
+ index === 9 ||
|
|
|
+ index === 10
|
|
|
) {
|
|
|
sums[index] = "";
|
|
|
} else if (!values.every((value) => isNaN(value))) {
|
|
|
@@ -1674,13 +1733,23 @@ export default {
|
|
|
} catch (error) {
|
|
|
console.log(error);
|
|
|
}
|
|
|
+ //等级
|
|
|
+ try{
|
|
|
+ let res = await getOptionLsit();
|
|
|
+ if (res.code == 200) {
|
|
|
+ this.levelOptions = res.data.level;
|
|
|
+ console.log("----------------------",res.data.level)
|
|
|
+ } else {
|
|
|
+ this.$message.error("网络异常!");
|
|
|
+ }
|
|
|
+ }catch (error){}
|
|
|
},
|
|
|
//
|
|
|
// 获取row-key
|
|
|
getRowKey(row) {
|
|
|
return row[
|
|
|
camelCase(this.tableName + "_" + this.templateInfo.template?.primaryKey)
|
|
|
- ];
|
|
|
+ ];
|
|
|
},
|
|
|
/** 查询列表 */
|
|
|
getList(queryParams, orderType = 0) {
|
|
|
@@ -2223,7 +2292,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);
|
|
|
@@ -2393,9 +2462,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
|
|
|
);
|
|
|
},
|
|
|
@@ -2530,7 +2599,7 @@ export default {
|
|
|
}
|
|
|
|
|
|
res.data.template.dfFormSql &&
|
|
|
- (this.dynamicData = JSON.parse(res.data.template.dfFormSql));
|
|
|
+ (this.dynamicData = JSON.parse(res.data.template.dfFormSql));
|
|
|
this.addRealFieldName(res.data.result.resultMap);
|
|
|
let resultMap = res.data.result.resultMap;
|
|
|
|
|
|
@@ -2796,7 +2865,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`
|
|
|
);
|
|
|
@@ -2812,8 +2881,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 }
|
|
|
);
|
|
|
@@ -2911,7 +2980,7 @@ export default {
|
|
|
item.fieldValue
|
|
|
? item.fieldValue
|
|
|
: this.currentRow[
|
|
|
- camelCase(item.fieldName.replace(".", "_"))
|
|
|
+ camelCase(item.fieldName.replace(".", "_"))
|
|
|
];
|
|
|
});
|
|
|
conditionData.forEach((item) => {
|
|
|
@@ -2919,7 +2988,7 @@ export default {
|
|
|
item.fieldValue
|
|
|
? item.fieldValue
|
|
|
: this.currentRow[
|
|
|
- camelCase(item.fieldName.replace(".", "_"))
|
|
|
+ camelCase(item.fieldName.replace(".", "_"))
|
|
|
];
|
|
|
});
|
|
|
}
|
|
|
@@ -3299,42 +3368,43 @@ export default {
|
|
|
<tbody>
|
|
|
<tr>
|
|
|
<td width="600px" colspan="4">合同号：${saleNo}</td>
|
|
|
- <td width="600px" colspan="5">日期：${saleDate.replace(
|
|
|
- "T",
|
|
|
- " "
|
|
|
- )}</td>
|
|
|
+ <td width="600px" colspan="6">日期：${saleDate.replace(
|
|
|
+ "T",
|
|
|
+ " "
|
|
|
+ )}</td>
|
|
|
</tr>
|
|
|
<tr align="center">
|
|
|
<td width="300px" colspan="2">客户名称：</td>
|
|
|
<td width="300px" colspan="2">${customerName}</td>
|
|
|
<td width="300px" colspan="2">联系人：</td>
|
|
|
- <td width="150px" colspan="3">${contactPerson}</td>
|
|
|
+ <td width="150px" colspan="4">${contactPerson}</td>
|
|
|
</tr>
|
|
|
<tr align="center">
|
|
|
<td width="300px" colspan="2">客户地址：</td>
|
|
|
<td width="300px" colspan="3">${customAddress}</td>
|
|
|
<td width="300px" colspan="2">客户国别：</td>
|
|
|
- <td width="300px" colspan="2">${customCountryType}</td>
|
|
|
+ <td width="300px" colspan="3">${customCountryType}</td>
|
|
|
</tr>
|
|
|
<tr align="center">
|
|
|
<td width="300px" colspan="2">预计下单时间：</td>
|
|
|
<td colspan="1">${saleOrderEstimatedTime.replace(
|
|
|
- "T",
|
|
|
- " "
|
|
|
- )}</td>
|
|
|
+ "T",
|
|
|
+ " "
|
|
|
+ )}</td>
|
|
|
<td colspan="2">交货周期：</td>
|
|
|
<td >${saleLeadTime}</td>
|
|
|
<td colspan="2">交货日期：</td>
|
|
|
- <td >${deliveryDate.replace("T", " ")}</td>
|
|
|
+ <td colspan="2">${deliveryDate.replace("T", " ")}</td>
|
|
|
</tr>
|
|
|
<tr align="center">
|
|
|
- <td colspan="9">货品明细</td>
|
|
|
+ <td colspan="10">货品明细</td>
|
|
|
</tr>
|
|
|
<tr align="center">
|
|
|
<td width="150px">品名</td>
|
|
|
<td width="100px">规格</td>
|
|
|
<td width="100px">类型</td>
|
|
|
<td width="100px">色号</td>
|
|
|
+ <td width="100px">等级</td>
|
|
|
<td width="150px">数量/kg</td>
|
|
|
<td width="150px">单价</td>
|
|
|
<td width="150px">金额</td>
|
|
|
@@ -3373,6 +3443,7 @@ export default {
|
|
|
<td>${productSpecifications}</td>
|
|
|
<td>${productType}</td>
|
|
|
<td>${item.colourNumberLabel}</td>
|
|
|
+ <td>${item.level}</td>
|
|
|
<td>${item.productNumber}</td>
|
|
|
<td>${item.productUnitPrice}</td>
|
|
|
<td>${item.productAmounts}</td>
|
|
|
@@ -3387,6 +3458,7 @@ export default {
|
|
|
<td></td>
|
|
|
<td></td>
|
|
|
<td></td>
|
|
|
+ <td></td>
|
|
|
<td>${amountTotal.toFixed(2)}</td>
|
|
|
<td>${singlTotal.toFixed(2)}</td>
|
|
|
<td>${moneyTotal.toFixed(2)}</td>
|
|
|
@@ -3394,7 +3466,7 @@ export default {
|
|
|
<td></td>
|
|
|
</tr>
|
|
|
<tr>
|
|
|
- <td colspan="9">合计金额（大写）：${saleAmountInWords}</td>
|
|
|
+ <td colspan="10">合计金额（大写）：${saleAmountInWords}</td>
|
|
|
</tr>
|
|
|
`;
|
|
|
|
|
|
@@ -3402,17 +3474,17 @@ export default {
|
|
|
//定金
|
|
|
printStr += `
|
|
|
<tr>
|
|
|
- <td colspan="4">付款方式：${payType}</td>
|
|
|
+ <td colspan="5">付款方式：${payType}</td>
|
|
|
<td colspan="5">定金：${earnestMoney}</td>
|
|
|
</tr>`;
|
|
|
} else {
|
|
|
printStr += `
|
|
|
<tr>
|
|
|
- <td colspan="9">付款方式：${payType}</td>
|
|
|
+ <td colspan="10">付款方式：${payType}</td>
|
|
|
</tr>`;
|
|
|
}
|
|
|
printStr += `<tr align="center">
|
|
|
- <td colspan="9">工艺要求</td>
|
|
|
+ <td colspan="10">工艺要求</td>
|
|
|
</tr>
|
|
|
<tr align="center">
|
|
|
<td width="150px">网络</td>
|
|
|
@@ -3435,18 +3507,19 @@ export default {
|
|
|
<td width="150px"></td>
|
|
|
<td width="150px"></td>
|
|
|
<td width="150px"></td>
|
|
|
+ <td width="150px"></td>
|
|
|
</tr>
|
|
|
<tr>
|
|
|
- <td colspan="9">包装/贴唛：${craftMark}</td>
|
|
|
+ <td colspan="10">包装/贴唛：${craftMark}</td>
|
|
|
</tr>
|
|
|
<tr>
|
|
|
- <td colspan="9">装运方式：${shippingMethod}</td>
|
|
|
+ <td colspan="10">装运方式：${shippingMethod}</td>
|
|
|
</tr>
|
|
|
<tr align="center">
|
|
|
<td colspan="2">业务员：</td>
|
|
|
<td colspan="2">${salesman}</td>
|
|
|
<td colspan="2">财务部：</td>
|
|
|
- <td colspan="3">${finance}</td>
|
|
|
+ <td colspan="4">${finance}</td>
|
|
|
|
|
|
</tr>
|
|
|
|
|
|
@@ -3530,7 +3603,7 @@ export default {
|
|
|
},
|
|
|
// 出库明细回调
|
|
|
handleOutDetail(row) {
|
|
|
- this.stockTitle = "出库明细1";
|
|
|
+ this.stockTitle = "出库明细";
|
|
|
this.outStockShow = true;
|
|
|
this.$nextTick(() => {
|
|
|
this.$refs.OutStockDetailRef.getOutStockDetail(row, false);
|
|
|
@@ -3671,7 +3744,7 @@ export default {
|
|
|
item.fieldValue
|
|
|
? item.fieldValue
|
|
|
: this.currentRow[
|
|
|
- camelCase(item.fieldName.replace(".", "_"))
|
|
|
+ camelCase(item.fieldName.replace(".", "_"))
|
|
|
];
|
|
|
});
|
|
|
}
|
