From d91ced5fcafab9269a7cf4277dae273e13d8f02a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E4=B8=96=E5=BC=BA?= <vayne0702@163.com>
Date: Thu, 2 Mar 2023 12:41:11 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../scm/basicInformation/poundlist/Form.vue   |  4 +--
 .../scm/basicInformation/poundlist/index.vue  | 30 +++++++++----------
 .../basicInformation/tradeupload/Form2.vue    |  2 ++
 3 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/SC-web/src/views/scm/basicInformation/poundlist/Form.vue b/SC-web/src/views/scm/basicInformation/poundlist/Form.vue
index b31873eb..a230f4b4 100644
--- a/SC-web/src/views/scm/basicInformation/poundlist/Form.vue
+++ b/SC-web/src/views/scm/basicInformation/poundlist/Form.vue
@@ -15,7 +15,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="物料名称" prop="materialId">
-              <popupSelect v-model="dataForm.materialId" placeholder="请选择物料编码" clearable field="materialId"
+              <popupSelect v-model="dataForm.materialId" placeholder="请选择物料名称" clearable field="materialId"
                            interfaceId="381037852907038533" :columnOptions="materialIdcolumnOptions" propsValue="id"
                            relationField="item_name" popupType="dialog" popupTitle="选择数据" popupWidth="800px" hasPage
                            :pageSize="20">
@@ -45,7 +45,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="供应商" prop="supplierId">
-              <popupSelect v-model="dataForm.supplierId" placeholder="请选择客户" clearable field="supplierId"
+              <popupSelect v-model="dataForm.supplierId" placeholder="请选择供应商" clearable field="supplierId"
                            interfaceId="382494924156735557" :columnOptions="supplierIdcolumnOptions" propsValue="id"
                            relationField="supplier_name" popupType="dialog" popupTitle="选择数据" popupWidth="800px" hasPage
                            :pageSize="20" >
diff --git a/SC-web/src/views/scm/basicInformation/poundlist/index.vue b/SC-web/src/views/scm/basicInformation/poundlist/index.vue
index 71c14d43..cee8c1c9 100644
--- a/SC-web/src/views/scm/basicInformation/poundlist/index.vue
+++ b/SC-web/src/views/scm/basicInformation/poundlist/index.vue
@@ -42,13 +42,13 @@
 				<JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c :hasNO="false"
 					@selection-change="handleSelectionChange" border>
           <el-table-column type="index" width="50" label="序号" fixed="left" align="center" />
-					<el-table-column prop="licenseNo" label="车号" fixed="left" sortable width="120" align="center" />
-					<el-table-column prop="customerName" label="客户名称" sortable width="150" align="center" />
-					<el-table-column prop="salesName" label="销售合同" sortable width="150" align="center" />
-					<el-table-column prop="supplierName" label="供应商名称" sortable width="150" align="center" />
-					<el-table-column prop="purchaseName" label="采购合同" sortable width="150" align="center" />
-					<el-table-column prop="materialCode" label="物料编码" sortable width="150" align="center" />
-					<el-table-column prop="materialName" label="物料名称" sortable width="150" align="center" />
+					<el-table-column prop="vehicleId" label="车号" fixed="left" sortable width="120" align="center" />
+					<el-table-column prop="customerId" label="客户名称" sortable width="150" align="center" />
+					<el-table-column prop="salesId" label="销售合同" sortable width="150" align="center" />
+					<el-table-column prop="supplierId" label="供应商名称" sortable width="150" align="center" />
+					<el-table-column prop="purchaseId" label="采购合同" sortable width="150" align="center" />
+<!--					<el-table-column prop="materialCode" label="物料编码" sortable width="150" align="center" />-->
+					<el-table-column prop="materialId" label="物料名称" sortable width="150" align="center" />
           <el-table-column prop="advance" label="是否垫资" sortable width="100" align="center" >
 						<template slot-scope="scope">
 							{{ scope.row.advance | dynamicText(advanceOptions) }}
@@ -176,31 +176,31 @@
         formVisible3: false,
 				exportBoxVisible: false,
 				columnList: [{
-						prop: 'licenseNo',
+						prop: 'vehicleId',
 						label: '车号'
 					},
 					{
-						prop: 'customerName',
+						prop: 'customerId',
 						label: '客户名称'
 					},
 					{
-						prop: 'salesName',
+						prop: 'salesId',
 						label: '销售合同'
 					},
 					{
-						prop: 'supplierName',
+						prop: 'supplierId',
 						label: '供应商名称'
 					},
 					{
-						prop: 'purchaseName',
+						prop: 'purchaseId',
 						label: '采购合同'
 					},
 					{
-						prop: 'materialCode',
-						label: '物料编码'
+						prop: 'materialId',
+						label: '物料名称'
 					},
 					{
-						prop: 'materialName',
+						prop: 'materialId',
 						label: '物料名称'
 					},
 					{
diff --git a/SC-web/src/views/scm/basicInformation/tradeupload/Form2.vue b/SC-web/src/views/scm/basicInformation/tradeupload/Form2.vue
index b0a957da..46f981cb 100644
--- a/SC-web/src/views/scm/basicInformation/tradeupload/Form2.vue
+++ b/SC-web/src/views/scm/basicInformation/tradeupload/Form2.vue
@@ -240,6 +240,7 @@
           naturalId: "",
           remark: '',
           creatorTime: "",
+          isExamine: "",
         },
         rules: {
           materialId: [{
@@ -570,6 +571,7 @@
         var grossWeight = this.dataForm.grossWeight;//毛重
         var buckleWeight = this.dataForm.buckleWeight;//扣重
         var netWeight = this.dataForm.netWeight;//净重
+        this.dataForm.isExamine = '1';
         this.dataForm.unit = this.dataForm.unit ? this.dataForm.unit : 0;
         this.dataForm.transportType = this.dataForm.transportType ? this.dataForm.transportType : 0;
         this.dataForm.advance = this.dataForm.advance ? this.dataForm.advance : 0;