From 9a286ecefebeabeb3caf6859e74ec541c6c9d4d9 Mon Sep 17 00:00:00 2001
From: x_z <zrhdyxa@163.com>
Date: Mon, 26 Sep 2022 20:50:18 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E9=83=A8=E5=88=86=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E5=B1=95=E7=A4=BA=E5=86=85=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/basic/UdiInfoManage.vue | 191 ++++++++++++++++--------------
 src/views/product/UnitManage.vue  |   2 +-
 2 files changed, 103 insertions(+), 90 deletions(-)

diff --git a/src/views/basic/UdiInfoManage.vue b/src/views/basic/UdiInfoManage.vue
index 478ff84..ecbce8b 100644
--- a/src/views/basic/UdiInfoManage.vue
+++ b/src/views/basic/UdiInfoManage.vue
@@ -198,6 +198,107 @@
                     ></el-table-column>
                 </el-table>
             </el-card>
+
+            <el-card style="margin-top: 20px;">
+                <span style="font-size: 18px;">编辑内容</span>
+                <el-form
+                    :model="editQuery"
+                    ref="editQuery"
+                    style="margin-top: 20px;"
+                >
+                    <el-form-item >
+                        <el-row :gutter="20" class="el-row" type="flex">
+                            <el-col :span="12" class="el-col">
+                                <div class="text item">
+                                    <div class="itemTag">
+                                        <span>商品条码:&nbsp;</span>
+                                    </div>
+                                    <el-input
+                                        style="width: 65%"
+                                        size="small"
+                                        splaceholder="请输入内容"
+                                        v-model="editQuery.sptm"
+                                    ></el-input>
+                                </div>
+                            </el-col>
+
+                            <el-col :span="12" class="el-col">
+                                <div class="text item">
+                                    <div class="itemTag">
+                                        <span>医保编码:&nbsp;</span>
+                                    </div>
+                                    <el-input
+                                        style="width: 65%"
+                                        size="small"
+                                        splaceholder="请输入内容"
+                                        v-model="editQuery.ybbm"
+                                    ></el-input>
+                                </div>
+                            </el-col>
+                        </el-row>
+
+                        <el-row :gutter="20" class="el-row" type="flex">
+                            <el-col :span="12" class="el-col">
+                                <div class="text item">
+                                    <div class="itemTag">
+                                        <span>生产厂家:&nbsp;</span>
+                                    </div>
+                                    <el-input
+                                        style="width: 65%"
+                                        size="small"
+                                        splaceholder="请输入内容"
+                                        v-model="editQuery.manufactory"
+                                    ></el-input>
+                                </div>
+                            </el-col>
+
+                            <el-col :span="12" class="el-col">
+                                <div class="text item">
+                                    <div class="itemTag">
+                                        <span>产品描述:&nbsp;</span>
+                                    </div>
+                                    <el-input
+                                        style="width: 65%"
+                                        size="small"
+                                        splaceholder="请输入内容"
+                                        v-model="editQuery.cpms"
+                                    ></el-input>
+                                </div>
+                            </el-col>
+                        </el-row>
+
+                        <el-row :gutter="20" class="el-row" type="flex">
+
+                            <el-col :span="12" class="el-col">
+                                <div class="text item">
+                                    <div class="itemTag">
+                                        <span>第三方系统ID:&nbsp;</span>
+                                    </div>
+                                    <el-input
+                                        style="width: 65%"
+                                        size="small"
+                                        splaceholder="请输入内容"
+                                        v-model="editQuery.thirdId"
+                                    ></el-input>
+                                </div>
+                            </el-col>
+
+                            <el-col :span="12" class="el-col">
+                                <el-form-item prop="name">
+                                    <el-checkbox v-model="isUseDyValue" class="text item itemTag" :disabled="!isUseDyCheck"
+                                    >以使用单元数量入库
+                                    </el-checkbox>
+                                    <el-checkbox v-model="editQuery.isDisable" class="text item itemTag"
+                                                 @change="diableChange"
+                                    >是否禁用
+                                    </el-checkbox>
+                                </el-form-item>
+                            </el-col>
+                        </el-row>
+                    </el-form-item>
+                </el-form>
+            </el-card>
+
             <el-form
                 :model="editQuery"
                 :rules="rules"
@@ -414,38 +515,6 @@
                             </el-col>
                         </el-row>
 
-                        <el-row :gutter="20" class="el-row" type="flex">
-
-                            <el-col :span="12" class="el-col">
-                                <div class="text item">
-                                    <div class="itemTag">
-                                        <span>商品条码:&nbsp;</span>
-                                    </div>
-                                    <el-input
-                                        style="width: 65%"
-                                        size="small"
-                                        :disabled="!checked"
-                                        splaceholder="请输入内容"
-                                        v-model="editQuery.sptm"
-                                    ></el-input>
-                                </div>
-                            </el-col>
-                            <el-col :span="12" class="el-col">
-                                <div class="text item">
-                                    <div class="itemTag">
-                                        <span>医保编码:&nbsp;</span>
-                                    </div>
-                                    <el-input
-                                        style="width: 65%"
-                                        size="small"
-                                        :disabled="!checked"
-                                        splaceholder="请输入内容"
-                                        v-model="editQuery.ybbm"
-                                    ></el-input>
-                                </div>
-                            </el-col>
-                        </el-row>
-
                         <el-row :gutter="20" class="el-row" type="flex">
                             <el-col :span="12" class="el-col">
                                 <div class="text item">
@@ -476,40 +545,8 @@
                                 </div>
                             </el-col>
                         </el-row>
-
-                        <el-row :gutter="20" class="el-row" type="flex">
-                            <el-col :span="12" class="el-col">
-                                <div class="text item">
-                                    <div class="itemTag">
-                                        <span>产品描述:&nbsp;</span>
-                                    </div>
-                                    <el-input
-                                        style="width: 65%"
-                                        size="small"
-                                        splaceholder="请输入内容"
-                                        :disabled="!checked"
-                                        v-model="editQuery.cpms"
-                                    ></el-input>
-                                </div>
-                            </el-col>
-                            <el-col :span="12" class="el-col">
-                                <div class="text item">
-                                    <div class="itemTag">
-                                        <span>第三方系统ID:&nbsp;</span>
-                                    </div>
-                                    <el-input
-                                        style="width: 65%"
-                                        size="small"
-                                        :disabled="!checked"
-                                        splaceholder="请输入内容"
-                                        v-model="editQuery.thirdId"
-                                    ></el-input>
-                                </div>
-                            </el-col>
-                        </el-row>
                     </el-collapse-item>
 
-
                     <el-collapse-item name="3">
                         <template slot="title">
                             <p class="form-title">生产标识基本信息</p>
@@ -653,33 +690,9 @@
 
                 </el-collapse>
 
-                <el-row :gutter="20" class="el-row" type="flex">
-                    <el-col :span="10" class="el-col">
-                    </el-col>
-                    <el-col :span="4" class="el-col">
-                        <el-form-item prop="name">
-                            <el-checkbox v-model="isUseDyValue" class="text item itemTag"
-                                         :disabled="!isUseDyCheck"
-                            >以使用单元数量入库
-                            </el-checkbox>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="3" class="el-col">
-                        <el-form-item prop="name">
-                            <el-checkbox :disabled="!checked" v-model="editQuery.isDisable" class="text item itemTag"
-                                         @change="diableChange"
-                            >是否禁用
-                            </el-checkbox>
-                        </el-form-item>
-                    </el-col>
-
-                </el-row>
             </el-form>
 
-            <div style="text-align: center">
-                <el-button type="primary" size="small" icon="search" @click="checked=true"
-                >编辑
-                </el-button>
+            <div style="text-align: center; margin-top: 10px;">
                 <el-button type="primary" size="small" icon="search" @click="onAddSubmit"
                 >提交
                 </el-button>
diff --git a/src/views/product/UnitManage.vue b/src/views/product/UnitManage.vue
index 6f0a53c..f8283ea 100644
--- a/src/views/product/UnitManage.vue
+++ b/src/views/product/UnitManage.vue
@@ -49,7 +49,7 @@
             </el-table-column>
             <el-table-column label="拼音码" prop="pinyinCode" fixed></el-table-column>
             <el-table-column label="社会信用号" prop="creditNo" fixed></el-table-column>
-            <el-table-column label="第三方系统编码" prop="thirdId" fixed></el-table-column>
+            <el-table-column label="企业自定义ID" prop="thirdId" fixed></el-table-column>
             <el-table-column label="操作" fixed="right">
                 <template slot-scope="scope">
                     <el-button