From 6db546415b56e3f22f61baa74f19d132db2e1718 Mon Sep 17 00:00:00 2001
From: 1178634255 <1178634255@qq.com>
Date: Thu, 13 Jul 2023 18:32:32 +0800
Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E8=B5=84=E5=AD=97=E5=85=B8=E7=BB=B4?=
 =?UTF-8?q?=E6=8A=A4=E7=9A=84=E5=8C=85=E8=A3=85=E5=8D=95=E4=BD=8D=EF=BC=8C?=
 =?UTF-8?q?=E5=9C=A8=E5=85=A5=E9=99=A2=E7=89=A9=E8=B5=84=E7=BB=B4=E6=8A=A4?=
 =?UTF-8?q?=E4=B8=AD=E4=B8=8D=E4=BC=9A=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/basic/corpMaintain/corpMaintain.vue |  2 +-
 .../inout/InvoiceRegistrationDetermine.vue    |  2 +-
 .../company/basicCompanyProductsImport.vue    | 33 +++++++++++--------
 .../company/basicCompanyproductDetail.vue     |  2 +-
 4 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/src/views/basic/corpMaintain/corpMaintain.vue b/src/views/basic/corpMaintain/corpMaintain.vue
index b17c3b4..74f3344 100644
--- a/src/views/basic/corpMaintain/corpMaintain.vue
+++ b/src/views/basic/corpMaintain/corpMaintain.vue
@@ -108,7 +108,7 @@
           <el-table-column label="第三方往来单位名称" prop="thirdName" show-overflow-tooltip></el-table-column>
           <el-table-column label="操作">
             <template slot-scope="scope">
-              <el-button type="text" size="small" @click="intentSelect(scope.row)" :disabled="!configParms.basicCorp">
+              <el-button type="text" size="small" @click.native.stop="intentSelect(scope.row)" :disabled="scope.row.thirdId=='' ||scope.row.thirdId!=null || !configParms.basicCorp">
                 关联
               </el-button>
               <el-button type="text" size="small" @click.native.stop="removeErp(scope.row)"
diff --git a/src/views/inout/InvoiceRegistrationDetermine.vue b/src/views/inout/InvoiceRegistrationDetermine.vue
index 1fc32ff..3e5e786 100644
--- a/src/views/inout/InvoiceRegistrationDetermine.vue
+++ b/src/views/inout/InvoiceRegistrationDetermine.vue
@@ -195,11 +195,11 @@
               <el-button
                 type="text"
                 size="small"
+                :disabled="!scope.row.licenseUrl"
                 @click.native.stop="showImgViewer(scope.row)"
               >预览
               </el-button
               >
-
             </template>
           </el-table-column>
         </el-table>
diff --git a/src/views/supplier/company/basicCompanyProductsImport.vue b/src/views/supplier/company/basicCompanyProductsImport.vue
index 4f9ec79..c58b753 100644
--- a/src/views/supplier/company/basicCompanyProductsImport.vue
+++ b/src/views/supplier/company/basicCompanyProductsImport.vue
@@ -206,12 +206,12 @@
           </el-row>
 
           <el-row>
-            <el-col :span="12" class="el-col">
-              <el-form-item label="包装级别" prop="bzcj">
-                <el-input style="width: 90%" size="small" splaceholder="请输入包装级别" v-model="editQuery.bzcj"
-                          :disabled="true"></el-input>
-              </el-form-item>
-            </el-col>
+<!--            <el-col :span="12" class="el-col">-->
+<!--              <el-form-item label="包装级别" prop="bzcj">-->
+<!--                <el-input style="width: 90%" size="small" splaceholder="请输入包装级别" v-model="editQuery.bzcj"-->
+<!--                          :disabled="true"></el-input>-->
+<!--              </el-form-item>-->
+<!--            </el-col>-->
 
             <el-col :span="12" class="el-col">
               <el-form-item label="包含下级包装数量" prop="bhxjsl">
@@ -219,6 +219,12 @@
                           v-model="editQuery.bhxjsl"></el-input>
               </el-form-item>
             </el-col>
+            <el-col :span="12" class="el-col">
+              <el-form-item label="计量单位" prop="measname">
+                <el-input style="width: 90%" size="small" :disabled="true" splaceholder="请输入内容"
+                          v-model="editQuery.measname"></el-input>
+              </el-form-item>
+            </el-col>
           </el-row>
 
           <el-row>
@@ -270,14 +276,12 @@
                 <el-input style="width: 90%" :disabled="true" size="small" v-model="editQuery.cpms"></el-input>
               </el-form-item>
             </el-col>
-            <el-col :span="12" class="el-col">
-              <el-form-item label="计量单位" prop="measname">
-                <el-input style="width: 90%" size="small" :disabled="true" splaceholder="请输入内容"
-                          v-model="editQuery.measname"></el-input>
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row>
+<!--            <el-col :span="12" class="el-col">-->
+<!--              <el-form-item label="计量单位" prop="measname">-->
+<!--                <el-input style="width: 90%" size="small" :disabled="true" splaceholder="请输入内容"-->
+<!--                          v-model="editQuery.measname"></el-input>-->
+<!--              </el-form-item>-->
+<!--            </el-col>-->
             <el-col :span="12" class="el-col">
               <el-form-item label="最小包装单元内包含使用单元数量" prop="zxxsbzbhsydysl">
                 <el-input style="width: 90%" :disabled="!checked" size="small" splaceholder="请输入内容"
@@ -285,6 +289,7 @@
               </el-form-item>
             </el-col>
           </el-row>
+
         </el-form>
 
       </el-dialog>
diff --git a/src/views/supplier/company/basicCompanyproductDetail.vue b/src/views/supplier/company/basicCompanyproductDetail.vue
index 170e6e2..67689b6 100644
--- a/src/views/supplier/company/basicCompanyproductDetail.vue
+++ b/src/views/supplier/company/basicCompanyproductDetail.vue
@@ -40,7 +40,7 @@
         <el-table-column label="产品最小销售标识" prop="nameCode" show-overflow-tooltip></el-table-column>
         <el-table-column label="物资名称" prop="cpmctymc" show-overflow-tooltip></el-table-column>
         <el-table-column label="包装级别" prop="packLevel" show-overflow-tooltip></el-table-column>
-        <el-table-column label="包装单位" prop="bzcj" show-overflow-tooltip></el-table-column>
+        <el-table-column label="包装单位" prop="packUnit" show-overflow-tooltip></el-table-column>
         <!--      <el-table-column label="操作" width="180px">-->
         <!--        <template slot-scope="scope">-->
         <!--          <el-button type="text" @click.native.stop="singleDiEdit">编辑</el-button>-->