修改bug

src/views/basic/product/UdiInfoSelectLocalUdi.vue

@@ -163,7 +163,7 @@
         />
       </div>
     </el-card>
-    <el-card class="el-card" v-if="isImport">
+    <el-card class="el-card" >
       <div>
         <el-form label-width="120px">
           <el-row :gutter="20">
@@ -383,6 +383,7 @@ export default {
         zczbhhzbapzbh: "",
         isCheck: 1
       },
+      cpmctymc1:"",
       combineLoading: false,
       combineQuery: {
         idSpliUdi: false,
@@ -525,6 +526,10 @@ export default {
       return "";
     },
     handleErpChange(val) {
+      debugger
+      console.log("+++"+ this.data.cpmctymc)
+
+      this.cpmctymc1=val.cpmctymc;
       this.currentRow = val;
     },
     intentBack() {
@@ -532,6 +537,13 @@ export default {
     },
 
     checkCombine() {
+      this.$confirm("是否确定关联DI产品名称:" + this.cpmctymc1 + ":与第三方产品名称"+this.data.cpmctymc, "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+
           let selectData = this.multipleUdiSelection;
           let selected = null;
           if (this.multipleUdiSelection.length == 0) {
@@ -576,7 +588,7 @@ export default {
                 //         this.$emit("closeUdi", false);
                 //     });
               } else if (response.code == 499) {
-            this.$confirm(response.message, {type: "warning"})
+                this.$confirm(response.message, { type: "warning" })
                   .then(_ => {
                     this.combine();
                     // combineUdi(this.combineQuery)
@@ -603,7 +615,7 @@ export default {
               this.combineLoading = false;
               this.$emit("closeUdi", false);
             });
-
+        });
 
     },
 

src/views/basic/product/product.vue

@@ -204,7 +204,7 @@
             </el-table-column>
           </el-table>
           <el-dialog
-            title="耗材字典-详情"
+            title="物资字典-详情"
             :visible.sync="editDialogVisible"
             :close-on-click-modal="false"
             :close-on-press-escape="false"

src/views/supplier/company/basicCompanyproductDetail.vue

@@ -37,10 +37,10 @@
       </div>
       <el-table v-loading="loading" :data="detailList" style="width: 100%; " border key="3" highlight-current-row
                 @current-change="handleDetail">
-        <el-table-column label="产品标识" prop="nameCode" show-overflow-tooltip></el-table-column>
+        <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="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="bzcj" 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>-->
@@ -1099,5 +1099,52 @@ export default {
 </script>
 
 <style scoped>
+.itemTag {
+  float: left;
+  text-align: right;
+  margin-top: 5px;
+  padding-right: 10px;
+  width: 35%;
+}
+
+.text {
+  font-size: 13px;
+  font-family: "Microsoft YaHei";
+}
+
+.query-form-item {
+  display: block !important;
+  margin-right: 10px;
+  margin-bottom: 5px;
+}
+
+.edit-row {
+  display: flex;
+  flex-wrap: wrap;
+  margin-bottom: 0px;
+}
 
+.el-row {
+  display: flex;
+  flex-wrap: wrap;
+  margin-bottom: 6px;
+}
+
+.el-col {
+  border-radius: 4px;
+  flex-wrap: wrap;
+}
+
+.el-table .cell.el-tooltip {
+  white-space: pre-wrap;
+}
+
+.form-title {
+  font-size: 16px;
+  font-family: Noto Sans SC;
+  font-weight: bold;
+  color: #303133;
+  padding-bottom: 17px;
+  padding-top: 17px;
+}
 </style>