From 9da16916ed616cc8c989345e9c42ea19014d8b25 Mon Sep 17 00:00:00 2001
From: 17602169347 <h17602169347@163.com>
Date: Thu, 16 Mar 2023 11:22:08 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=9C=B0=E7=82=B9=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/PoundlistController.java       |  2 +-
 .../controller/TradeuploadController.java     |  2 +-
 .../poundlist/PurchaseOrderForm.vue           | 22 +++++++++----------
 .../basicInformation/purchaseorder/index.vue  |  2 +-
 4 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/controller/PoundlistController.java b/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/controller/PoundlistController.java
index 3be634fa..bc097a74 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/controller/PoundlistController.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/controller/PoundlistController.java
@@ -392,7 +392,7 @@ public class PoundlistController {
     public ActionResult<PoundlistInfoVO> info(@PathVariable("id") String id){
         PoundlistEntity entity= poundlistService.getInfo(id);
         PoundlistInfoVO vo=JsonUtil.getJsonToBean(entity, PoundlistInfoVO.class);
-
+        vo.setOriginPlace(generaterSwapUtil.provinceData(vo.getOriginPlace()));
     //子表
     //副表
         return ActionResult.success(vo);
diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/tradeupload/controller/TradeuploadController.java b/SC-boot/linkage-scm/src/main/java/jnpf/tradeupload/controller/TradeuploadController.java
index b6571637..faf07aff 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/tradeupload/controller/TradeuploadController.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/tradeupload/controller/TradeuploadController.java
@@ -734,7 +734,7 @@ public class TradeuploadController {
         if(vo.getCreatorTime()!=null){
             vo.setCreatorTime(vo.getCreatorTime());
         }
-
+        vo.setOriginPlace(generaterSwapUtil.provinceData(vo.getOriginPlace()));
         //子表
         //副表
         return ActionResult.success(vo);
diff --git a/SC-web/src/views/scm/basicInformation/poundlist/PurchaseOrderForm.vue b/SC-web/src/views/scm/basicInformation/poundlist/PurchaseOrderForm.vue
index 0cca2970..2a5d4a0b 100644
--- a/SC-web/src/views/scm/basicInformation/poundlist/PurchaseOrderForm.vue
+++ b/SC-web/src/views/scm/basicInformation/poundlist/PurchaseOrderForm.vue
@@ -49,35 +49,35 @@
           </el-col>
           <el-col :span="8">
             <el-form-item label="垫资金额" prop="advanceAmount">
-              <el-input-number v-model="dataForm.advanceAmount" placeholder="数字文本" :step="1" :precision="6" :style='{"width":"100%"}'>
+              <el-input-number v-model="dataForm.advanceAmount" placeholder="数字文本" :step="1" :precision="6" :style='{"width":"100%"}' :disabled="true">
 
               </el-input-number>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="重量" prop="num">
-              <el-input-number v-model="dataForm.num" placeholder="数字文本" :step="1" :precision="6" :style='{"width":"100%"}'>
+              <el-input-number v-model="dataForm.num" placeholder="数字文本" :step="1" :precision="6" :style='{"width":"100%"}' :disabled="true">
 
               </el-input-number>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="金额" prop="amount">
-              <el-input-number v-model="dataForm.amount" placeholder="数字文本" :step="1" :precision="6" :style='{"width":"100%"}'>
+              <el-input-number v-model="dataForm.amount" placeholder="数字文本" :step="1" :precision="6" :style='{"width":"100%"}' :disabled="true">
 
               </el-input-number>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="不含税金额" prop="notAmount">
-              <el-input-number v-model="dataForm.notAmount" placeholder="数字文本" :step="1" :precision="6" :style='{"width":"100%"}'>
+              <el-input-number v-model="dataForm.notAmount" placeholder="数字文本" :step="1" :precision="6" :style='{"width":"100%"}' :disabled="true">
 
               </el-input-number>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="税额" prop="rate">
-              <el-input-number v-model="dataForm.rate" placeholder="数字文本" :step="1" :precision="6" :style='{"width":"100%"}'>
+              <el-input-number v-model="dataForm.rate" placeholder="数字文本" :step="1" :precision="6" :style='{"width":"100%"}' :disabled="true">
 
               </el-input-number>
             </el-form-item>
@@ -221,21 +221,21 @@
                           </el-select>
                         </template>
                       </el-table-column>
-                      <el-table-column prop="amount" label="金额" align="center" width="130" >
+                      <el-table-column prop="remark" label="备注" align="center" width="130" >
                         <template slot-scope="scope">
-                          <el-input v-model="scope.row.amount" placeholder="请输入" clearable :style='{"width":"100%"}' :disabled="true">
+                          <el-input v-model="scope.row.remark" placeholder="请输入" clearable :style='{"width":"100%"}'>
                           </el-input>
                         </template>
                       </el-table-column>
-                      <el-table-column prop="notAmount" label="不含税金额" align="center" width="130" >
+                      <el-table-column prop="amount" label="金额" align="center" width="130" >
                         <template slot-scope="scope">
-                          <el-input v-model="scope.row.notAmount" placeholder="请输入" clearable :style='{"width":"100%"}' :disabled="true">
+                          <el-input v-model="scope.row.amount" placeholder="请输入" clearable :style='{"width":"100%"}' :disabled="true">
                           </el-input>
                         </template>
                       </el-table-column>
-                      <el-table-column prop="remark" label="备注" align="center" width="130" >
+                      <el-table-column prop="notAmount" label="不含税金额" align="center" width="130" >
                         <template slot-scope="scope">
-                          <el-input v-model="scope.row.remark" placeholder="请输入" clearable :style='{"width":"100%"}'>
+                          <el-input v-model="scope.row.notAmount" placeholder="请输入" clearable :style='{"width":"100%"}' :disabled="true">
                           </el-input>
                         </template>
                       </el-table-column>
diff --git a/SC-web/src/views/scm/basicInformation/purchaseorder/index.vue b/SC-web/src/views/scm/basicInformation/purchaseorder/index.vue
index 38bcceae..a072c8fa 100644
--- a/SC-web/src/views/scm/basicInformation/purchaseorder/index.vue
+++ b/SC-web/src/views/scm/basicInformation/purchaseorder/index.vue
@@ -84,7 +84,7 @@
               {{ scope.row.status | dynamicText(statusOptions) }}
             </template>
           </el-table-column>
-          <el-table-column prop="erpNo" label="ERP订单号" sortable width="200" align="center" />
+          <!-- <el-table-column prop="erpNo" label="ERP订单号" sortable width="200" align="center" /> -->
           <el-table-column prop="contractName" label="合同" sortable width="250" align="center" />
           <el-table-column prop="supplierName" label="供应商" sortable width="200" align="center" />
           <el-table-column prop="amount" label="金额" sortable width="150" align="center" />