From 213d38cbb55886265b04ea761bf56ca42fb7d619 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com>
Date: Tue, 11 Jul 2023 16:35:27 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=9A=E6=95=B0=E5=8C=85bug=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/basic/destiny/destiny.vue                   | 10 +++++-----
 src/views/basic/destiny/destinyModelEdit.vue          |  6 ++++++
 src/views/basic/destiny/destinyModelSelectProduct.vue |  9 ++++-----
 src/views/basic/destiny/destinySelectProduct.vue      |  1 +
 4 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/src/views/basic/destiny/destiny.vue b/src/views/basic/destiny/destiny.vue
index efa933bd..58f290b6 100644
--- a/src/views/basic/destiny/destiny.vue
+++ b/src/views/basic/destiny/destiny.vue
@@ -3,12 +3,12 @@
     <el-card>
       <el-form :model="filterQuery" label-width="100px" size="mini">
         <el-row>
-          <el-col :span="4">
+          <el-col :span="6">
             <el-form-item label="模板名称:" class="query-form-item">
               <el-input v-model="filterQuery.name" placeholder="请输入模板名称"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="4">
+          <el-col :span="6">
             <el-form-item label="模板编码:" class="query-form-item">
               <el-input v-model="filterQuery.code" placeholder="请输入模板编码"></el-input>
             </el-form-item>
@@ -28,8 +28,8 @@
       <el-table v-loading="loading" :data="list" @current-change="handleDetail" border highlight-current-row
                 style="width: 100%">
         <el-table-column label="序号" type="index"></el-table-column>
-        <el-table-column label="模板编码" prop="name" width="260"></el-table-column>
-        <el-table-column label="模板名称" prop="code" width="260"></el-table-column>
+        <el-table-column label="模板编码" prop="code" width="260"></el-table-column>
+        <el-table-column label="模板名称" prop="name" width="260"></el-table-column>
         <el-table-column label="备注" prop="remark" width="260"></el-table-column>
         <el-table-column label="创建人" prop="createByName" width="260"></el-table-column>
         <el-table-column label="创建时间" prop="createTime" width="260"></el-table-column>
@@ -61,7 +61,7 @@
         <el-table-column label="计量单位" prop="measname"></el-table-column>
         <el-table-column label="数量" prop="count"></el-table-column>
         <el-table-column label="生产企业" prop="ylqxzcrbarmc"></el-table-column>
-        <el-table-column label="注册/备案号" prop="certCode"></el-table-column>
+        <el-table-column label="注册/备案号" prop="zczbhhzbapzbh"></el-table-column>
       </el-table>
       <pagination
           v-show="delectTotal>0"
diff --git a/src/views/basic/destiny/destinyModelEdit.vue b/src/views/basic/destiny/destinyModelEdit.vue
index 4fcbdfda..f243e7d2 100644
--- a/src/views/basic/destiny/destinyModelEdit.vue
+++ b/src/views/basic/destiny/destinyModelEdit.vue
@@ -73,6 +73,12 @@ export default {
   },
   methods: {
     onModifySubmit() {
+      if(isBlank(this.editLogin.name)){
+        return this.$message.error("模板名称不能为空");
+      }
+      if(isBlank(this.editLogin.code)){
+        return this.$message.error("模板编号不能为空");
+      }
       if (this.editLogin.id != null) {
         editModeldestiny(this.editLogin).then(res => {
           if (res.code == 20000) {
diff --git a/src/views/basic/destiny/destinyModelSelectProduct.vue b/src/views/basic/destiny/destinyModelSelectProduct.vue
index 1ff5a657..8d4df949 100644
--- a/src/views/basic/destiny/destinyModelSelectProduct.vue
+++ b/src/views/basic/destiny/destinyModelSelectProduct.vue
@@ -27,9 +27,9 @@
 
         <el-table v-loading="loading" :data="list" border highlight-current-row style="width: 100%">
           <el-table-column label="序号" type="index"></el-table-column>
-          <el-table-column label="产品DI" prop="nameCode" width="260"></el-table-column>
-          <el-table-column label="产品编码" prop="thirdId" width="260"></el-table-column>
-          <el-table-column label="产品名称" prop="cpmctymc" width="260"></el-table-column>
+          <el-table-column label="产品DI" prop="nameCode" ></el-table-column>
+          <el-table-column label="产品编码" prop="thirdId" ></el-table-column>
+          <el-table-column label="产品名称" prop="cpmctymc" ></el-table-column>
           <el-table-column label="规格型号" prop="ggxh"></el-table-column>
           <el-table-column label="计量单位" prop="measname"></el-table-column>
           <el-table-column label="数量" prop="count">
@@ -73,7 +73,7 @@
         :close-on-click-modal="false"
         :close-on-press-escape="false"
         width="80%"
-        :before-close="closeDialog"
+        :before-close="closeProudDialog"
         v-if="selectFormVisible"
     >
       <destinySelectProduct
@@ -140,7 +140,6 @@ export default {
           .then((response) => {
             this.loading = false;
             if (response.code === 20000) {
-              console.log(response)
               this.list = response.data.list || [];
               this.total = response.data.total || 0;
             } else {
diff --git a/src/views/basic/destiny/destinySelectProduct.vue b/src/views/basic/destiny/destinySelectProduct.vue
index e4ed795c..ee6cd67e 100644
--- a/src/views/basic/destiny/destinySelectProduct.vue
+++ b/src/views/basic/destiny/destinySelectProduct.vue
@@ -317,6 +317,7 @@ export default {
   components: {udiRlDetailDialog},
 
   created() {
+    this.getList();
   },
 };
 </script>