From 653903b46bec4844c1d8e5b0ece1ed69a8fca175 Mon Sep 17 00:00:00 2001
From: anthonywj <yewenjie20@vip.qq.com>
Date: Sun, 31 Mar 2024 22:13:55 +0800
Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E8=B5=84=E5=85=A5=E9=99=A2=E7=94=B3?=
 =?UTF-8?q?=E8=AF=B7=E6=96=B0=E5=A2=9E=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.production                               |   9 +-
 .../supplier/company/basicCompanyProducts.vue | 664 +++++++++---------
 .../supplier/products/supProductsAdd.vue      |  62 +-
 3 files changed, 401 insertions(+), 334 deletions(-)

diff --git a/.env.production b/.env.production
index 74829df..4ff92e4 100644
--- a/.env.production
+++ b/.env.production
@@ -23,7 +23,7 @@ ENV = 'production'
 # VUE_APP_BASE_API = 'http://121.36.152.129:9150/UDI_SPMS_SERVER/'
 
 # 长泰医院
-VUE_APP_BASE_API = 'http://139.159.247.26:9150/UDI_SPMS_SERVER/'
+# VUE_APP_BASE_API = 'http://139.159.247.26:9150/UDI_SPMS_SERVER/'
 
 # VUE_APP_BASE_API = 'http://dm.xmglxp.com:8081/UDI_SPMS_SERVER/'
 
@@ -33,8 +33,7 @@ VUE_APP_BASE_API = 'http://139.159.247.26:9150/UDI_SPMS_SERVER/'
 # VUE_APP_BASE_API = 'http://139.9.174.242:9150/UDI_SPMS_SERVER/'
 # VUE_APP_BASE_API = 'http://192.168.0.17:9150/UDI_SPMS_SERVER/'
 # 大田
-# VUE_APP_BASE_API = 'http://110.83.220.178:9150/UDI_SPMS_SERVER/'
-# VUE_APP_BASE_API = 'http://122.112.160.36:9160/UDI_SPMS_SERVER/
+VUE_APP_BASE_API = 'http://110.83.220.178:9150/UDI_SPMS_SERVER/'
 # 云霄妇幼
 # VUE_APP_BASE_API = 'http://192.168.0.72:9150/UDI_SPMS_SERVER/'
 
@@ -52,10 +51,10 @@ VUE_APP_BASE_API = 'http://139.159.247.26:9150/UDI_SPMS_SERVER/'
 # 应用访问路径 例如使用前缀 /admin/
 
 # 域名
-VUE_APP_CONTEXT_PATH = '/'
+# VUE_APP_CONTEXT_PATH = '/'
 
 # 其他
-# VUE_APP_CONTEXT_PATH = '/UDI_SPMS_CLIENT/'
+VUE_APP_CONTEXT_PATH = '/UDI_SPMS_CLIENT/'
 
 # 监控地址
 VUE_APP_MONITRO_ADMIN = '/admin/login'
diff --git a/src/views/supplier/company/basicCompanyProducts.vue b/src/views/supplier/company/basicCompanyProducts.vue
index 6c9534a..222af10 100644
--- a/src/views/supplier/company/basicCompanyProducts.vue
+++ b/src/views/supplier/company/basicCompanyProducts.vue
@@ -1,7 +1,8 @@
 <template>
   <div>
     <el-card>
-      <el-form v-if="queryList && queryList.length > 0" :model="filterQuery" size="mini" label-width="120px" v-show="showSearch">
+      <el-form v-if="queryList && queryList.length > 0" :model="filterQuery" size="mini" label-width="120px"
+               v-show="showSearch">
         <!--        <el-row>-->
         <!--          <el-col :span="6">-->
         <!--            <el-form-item label="物资编码:">-->
@@ -59,8 +60,10 @@
         <!--          </el-col>-->
         <!--        </el-row>-->
         <el-row style=" display:flex;  flex-wrap: wrap; ">
-          <template v-for="(item, index) in queryList" >
-            <el-form-item v-if="item.columnType == 'input' && item.columnName !='queryName' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`" :key="item.id">
+          <template v-for="(item, index) in queryList">
+            <el-form-item
+              v-if="item.columnType == 'input' && item.columnName !='queryName' && executeEval(row,item.expression,true)"
+              :label="item.columnDesc+`:`" :key="item.id">
               <el-input
                 v-model="filterQuery[item.columnName]"
                 :placeholder="item.columnDesc"
@@ -69,7 +72,9 @@
                 clearable
               ></el-input>
             </el-form-item>
-            <el-form-item v-if="item.columnType == 'input' && item.columnName =='queryName' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`" :key="item.id">
+            <el-form-item
+              v-if="item.columnType == 'input' && item.columnName =='queryName' && executeEval(row,item.expression,true)"
+              :label="item.columnDesc+`:`" :key="item.id">
               <el-autocomplete
                 class="inline-input"
                 style="width: 90%"
@@ -81,7 +86,8 @@
                 @clear="clearQueryProduct"
               ></el-autocomplete>
             </el-form-item>
-            <el-form-item v-if="item.columnType == 'select' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
+            <el-form-item v-if="item.columnType == 'select' && executeEval(row,item.expression,true)"
+                          :label="item.columnDesc+`:`">
               <el-select v-model="filterQuery[item.columnName]"
                          :placeholder="item.columnDesc"
                          @change="executeFuc($event,'5',item.checkRules)"
@@ -94,10 +100,13 @@
                   :value="dict.value"
                 />
                 <span style="float: left">{{ item.name }}</span>
-                <span v-if="item.isShowXx == '1'" style="float: right; color: #8492a6; font-size: 13px">{{ item.code }}</span>
+                <span v-if="item.isShowXx == '1'" style="float: right; color: #8492a6; font-size: 13px">{{
+                    item.code
+                  }}</span>
               </el-select>
             </el-form-item>
-            <el-form-item v-if="item.columnType == 'selectServer' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
+            <el-form-item v-if="item.columnType == 'selectServer' && executeEval(row,item.expression,true)"
+                          :label="item.columnDesc+`:`">
               <el-select
                 v-model="filterQuery[item.columnName]"
                 :placeholder="item.columnDesc"
@@ -114,10 +123,13 @@
                   :value="item.code"
                 />
                 <span style="float: left">{{ item.name }}</span>
-                <span v-if="item.isShowXx == '1'" style="float: right; color: #8492a6; font-size: 13px">{{ item.code }}</span>
+                <span v-if="item.isShowXx == '1'" style="float: right; color: #8492a6; font-size: 13px">{{
+                    item.code
+                  }}</span>
               </el-select>
             </el-form-item>
-            <el-form-item v-if="item.columnType == 'datePicker' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
+            <el-form-item v-if="item.columnType == 'datePicker' && executeEval(row,item.expression,true)"
+                          :label="item.columnDesc+`:`">
               <el-date-picker
                 :picker-options="pickerOptions"
                 v-model="actDateRange"
@@ -129,7 +141,8 @@
                 end-placeholder="结束日期"
               ></el-date-picker>
             </el-form-item>
-            <el-form-item v-if="item.columnType == 'date' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
+            <el-form-item v-if="item.columnType == 'date' && executeEval(row,item.expression,true)"
+                          :label="item.columnDesc+`:`">
               <el-date-picker
                 v-model="filterQuery[item.columnName]"
                 :style="`width:${item.width+'px'}`"
@@ -139,323 +152,330 @@
                 :placeholder="item.columnDesc"
               ></el-date-picker>
             </el-form-item>
-</template>
-</el-row>
-</el-form>
-<div class="top-right-btn">
-<el-button-group style="display:flex;">
-  <el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏</el-button>
-  <el-button type="primary" icon="el-icon-refresh" @click="onReset">重置</el-button>
-  <el-button type="primary" icon="el-icon-search" @click="search">查询</el-button>
-  <el-button type="primary" icon="el-icon-bottom-right" @click="selectProduct()">选入</el-button>
-</el-button-group>
-</div>
-<el-divider style="margin: 15px"></el-divider>
+          </template>
+        </el-row>
+      </el-form>
+      <div class="top-right-btn">
+        <el-button-group style="display:flex;">
+          <el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏</el-button>
+          <el-button type="primary" icon="el-icon-refresh" @click="onReset">重置</el-button>
+          <el-button type="primary" icon="el-icon-search" @click="search">查询</el-button>
+          <el-button type="primary" icon="el-icon-bottom-right" @click="selectProduct()">选入</el-button>
+        </el-button-group>
+      </div>
+      <el-divider style="margin: 15px"></el-divider>
 
-<el-table v-loading="loading" :data="list" style="width: 100%" @selection-change="handleSelectionChange" border
-          highlight-current-row>
-<!--        <el-table-column label="序号" type="index"></el-table-column>-->
-<!--        <el-table-column label="最小销售产品标识" prop="nameCode" width="140" show-overflow-tooltip></el-table-column>-->
-<!--        <el-table-column label="物资编码" prop="thirdId" show-overflow-tooltip></el-table-column>-->
-<!--        <el-table-column label="物资名称" prop="cpmctymc" show-overflow-tooltip></el-table-column>-->
-<!--        <el-table-column label="规格型号" prop="ggxh" show-overflow-tooltip></el-table-column>-->
-<!--        <el-table-column label="价格" prop="price" show-overflow-tooltip></el-table-column>-->
-<!--        <el-table-column label="生产企业" prop="ylqxzcrbarmc" show-overflow-tooltip></el-table-column>-->
-<!--        <el-table-column label="注册/备案号" prop="zczbhhzbapzbh" show-overflow-tooltip></el-table-column>-->
-<!--        <el-table-column label="物资分类" prop="classifyName" show-overflow-tooltip></el-table-column>-->
-<!--        <el-table-column v-if="isSpCombine" label="锁定状态" prop="lockStatus" show-overflow-tooltip>-->
-<!--          <template slot-scope="scope">-->
-<!--            {{ lockStatusMap[scope.row.lockStatus] }}-->
-<!--          </template>-->
-<!--        </el-table-column>-->
-<!--        <el-table-column width="180" label="操作" fixed="right">-->
-<!--          <template slot-scope="scope">-->
-<!--            <el-button v-if="isSpCombine" type="text" size="small"-->
-<!--                       :disabled="scope.row.originUuid!=null || scope.row.lockStatus===3"-->
-<!--                       @click.native.stop="intentSelectUdi(scope.row)">关联DI-->
-<!--            </el-button>-->
-<!--            <el-button type="text" size="small" :disabled="scope.row.lockStatus==3"-->
-<!--                       @click.native.stop="handleModifyClick(scope.row)">编辑-->
-<!--            </el-button>-->
-<!--            <el-button type="text" size="small"-->
-<!--                       @click.native.stop="handleDetailClick(scope.row)">详情-->
-<!--            </el-button>-->
+      <el-table v-loading="loading" :data="list" style="width: 100%" @selection-change="handleSelectionChange" border
+                highlight-current-row>
+        <!--        <el-table-column label="序号" type="index"></el-table-column>-->
+        <!--        <el-table-column label="最小销售产品标识" prop="nameCode" width="140" show-overflow-tooltip></el-table-column>-->
+        <!--        <el-table-column label="物资编码" prop="thirdId" show-overflow-tooltip></el-table-column>-->
+        <!--        <el-table-column label="物资名称" prop="cpmctymc" show-overflow-tooltip></el-table-column>-->
+        <!--        <el-table-column label="规格型号" prop="ggxh" show-overflow-tooltip></el-table-column>-->
+        <!--        <el-table-column label="价格" prop="price" show-overflow-tooltip></el-table-column>-->
+        <!--        <el-table-column label="生产企业" prop="ylqxzcrbarmc" show-overflow-tooltip></el-table-column>-->
+        <!--        <el-table-column label="注册/备案号" prop="zczbhhzbapzbh" show-overflow-tooltip></el-table-column>-->
+        <!--        <el-table-column label="物资分类" prop="classifyName" show-overflow-tooltip></el-table-column>-->
+        <!--        <el-table-column v-if="isSpCombine" label="锁定状态" prop="lockStatus" show-overflow-tooltip>-->
+        <!--          <template slot-scope="scope">-->
+        <!--            {{ lockStatusMap[scope.row.lockStatus] }}-->
+        <!--          </template>-->
+        <!--        </el-table-column>-->
+        <!--        <el-table-column width="180" label="操作" fixed="right">-->
+        <!--          <template slot-scope="scope">-->
+        <!--            <el-button v-if="isSpCombine" type="text" size="small"-->
+        <!--                       :disabled="scope.row.originUuid!=null || scope.row.lockStatus===3"-->
+        <!--                       @click.native.stop="intentSelectUdi(scope.row)">关联DI-->
+        <!--            </el-button>-->
+        <!--            <el-button type="text" size="small" :disabled="scope.row.lockStatus==3"-->
+        <!--                       @click.native.stop="handleModifyClick(scope.row)">编辑-->
+        <!--            </el-button>-->
+        <!--            <el-button type="text" size="small"-->
+        <!--                       @click.native.stop="handleDetailClick(scope.row)">详情-->
+        <!--            </el-button>-->
 
-<!--            <el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)"-->
-<!--            >-->
-<!--                <span class="el-dropdown-link">-->
-<!--                  <i class="el-icon-d-arrow-right el-icon&#45;&#45;right"></i>更多-->
-<!--                </span>-->
-<!--              <el-dropdown-menu slot="dropdown">-->
-<!--                &lt;!&ndash;                <el-dropdown-item command="handleDetailClick" v-if=" scope.row.lockStatus!=3">详情</el-dropdown-item>&ndash;&gt;-->
-<!--                <el-dropdown-item command="sumitLockStatus" v-if="isSpCombine" :disabled="scope.row.lockStatus===3">-->
-<!--                  提交审核-->
-<!--                </el-dropdown-item>-->
-<!--                <el-dropdown-item command="splitSelectUdi" v-if="isSpCombine" type="text" size="small"-->
-<!--                                  :disabled="scope.row.thirdId===scope.row.nameCode  || scope.row.thirdId==null || scope.row.nameCode==null || scope.row.lockStatus===3">-->
-<!--                  拆分产品-->
-<!--                </el-dropdown-item>-->
-<!--                <el-dropdown-item command="deleteCompanyProductRelevance">移除</el-dropdown-item>-->
-<!--              </el-dropdown-menu>-->
-<!--            </el-dropdown>-->
+        <!--            <el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)"-->
+        <!--            >-->
+        <!--                <span class="el-dropdown-link">-->
+        <!--                  <i class="el-icon-d-arrow-right el-icon&#45;&#45;right"></i>更多-->
+        <!--                </span>-->
+        <!--              <el-dropdown-menu slot="dropdown">-->
+        <!--                &lt;!&ndash;                <el-dropdown-item command="handleDetailClick" v-if=" scope.row.lockStatus!=3">详情</el-dropdown-item>&ndash;&gt;-->
+        <!--                <el-dropdown-item command="sumitLockStatus" v-if="isSpCombine" :disabled="scope.row.lockStatus===3">-->
+        <!--                  提交审核-->
+        <!--                </el-dropdown-item>-->
+        <!--                <el-dropdown-item command="splitSelectUdi" v-if="isSpCombine" type="text" size="small"-->
+        <!--                                  :disabled="scope.row.thirdId===scope.row.nameCode  || scope.row.thirdId==null || scope.row.nameCode==null || scope.row.lockStatus===3">-->
+        <!--                  拆分产品-->
+        <!--                </el-dropdown-item>-->
+        <!--                <el-dropdown-item command="deleteCompanyProductRelevance">移除</el-dropdown-item>-->
+        <!--              </el-dropdown-menu>-->
+        <!--            </el-dropdown>-->
 
 
-<!--            &lt;!&ndash;            <el-button v-if=" scope.row.lockStatus!=3" type="text" size="small"&ndash;&gt;-->
-<!--            &lt;!&ndash;                       @click.native.stop="handleDetailClick(scope.row)">详情&ndash;&gt;-->
-<!--            &lt;!&ndash;            </el-button>&ndash;&gt;-->
-<!--            &lt;!&ndash;            <el-button v-if="isSpCombine" type="text" size="small" :disabled="scope.row.lockStatus===3"&ndash;&gt;-->
-<!--            &lt;!&ndash;                       @click.native.stop="sumitLockStatus(scope.row)">提交审核&ndash;&gt;-->
-<!--            &lt;!&ndash;            </el-button>&ndash;&gt;-->
-<!--            &lt;!&ndash;            <el-button v-if="isSpCombine" type="text" size="small" @click.native.stop="splitSelectUdi(scope.row)"&ndash;&gt;-->
-<!--            &lt;!&ndash;                       :disabled="scope.row.thirdId===scope.row.nameCode  || scope.row.thirdId==null || scope.row.nameCode==null || scope.row.lockStatus===3">&ndash;&gt;-->
-<!--            &lt;!&ndash;              拆分产品&ndash;&gt;-->
-<!--            &lt;!&ndash;            </el-button>&ndash;&gt;-->
-<!--            &lt;!&ndash;            <el-button type="text" size="small" @click.native.stop="deleteCompanyProductRelevance(scope.row)">移除&ndash;&gt;-->
-<!--            &lt;!&ndash;            </el-button>&ndash;&gt;-->
-<!--          </template>-->
-<!--        </el-table-column>-->
-<template v-for="(item, index) in tableHeader">
-  <el-table-column
-    v-if="item.columnType == 'id' && executeEval(row,item.expression,true)"
-    type="index" :label="item.columnDesc"></el-table-column>
-  <el-table-column
-    v-if="item.columnType == 'selection'"
-    type="selection"
-    :width="item.width"
-    :selectable="(row,number) => executeFuc(row,'3',item.clickFuc)"
-  ></el-table-column>
+        <!--            &lt;!&ndash;            <el-button v-if=" scope.row.lockStatus!=3" type="text" size="small"&ndash;&gt;-->
+        <!--            &lt;!&ndash;                       @click.native.stop="handleDetailClick(scope.row)">详情&ndash;&gt;-->
+        <!--            &lt;!&ndash;            </el-button>&ndash;&gt;-->
+        <!--            &lt;!&ndash;            <el-button v-if="isSpCombine" type="text" size="small" :disabled="scope.row.lockStatus===3"&ndash;&gt;-->
+        <!--            &lt;!&ndash;                       @click.native.stop="sumitLockStatus(scope.row)">提交审核&ndash;&gt;-->
+        <!--            &lt;!&ndash;            </el-button>&ndash;&gt;-->
+        <!--            &lt;!&ndash;            <el-button v-if="isSpCombine" type="text" size="small" @click.native.stop="splitSelectUdi(scope.row)"&ndash;&gt;-->
+        <!--            &lt;!&ndash;                       :disabled="scope.row.thirdId===scope.row.nameCode  || scope.row.thirdId==null || scope.row.nameCode==null || scope.row.lockStatus===3">&ndash;&gt;-->
+        <!--            &lt;!&ndash;              拆分产品&ndash;&gt;-->
+        <!--            &lt;!&ndash;            </el-button>&ndash;&gt;-->
+        <!--            &lt;!&ndash;            <el-button type="text" size="small" @click.native.stop="deleteCompanyProductRelevance(scope.row)">移除&ndash;&gt;-->
+        <!--            &lt;!&ndash;            </el-button>&ndash;&gt;-->
+        <!--          </template>-->
+        <!--        </el-table-column>-->
+        <template v-for="(item, index) in tableHeader">
+          <el-table-column
+            v-if="item.columnType == 'id' && executeEval(row,item.expression,true)"
+            type="index" :label="item.columnDesc"></el-table-column>
+          <el-table-column
+            v-if="item.columnType == 'selection'"
+            type="selection"
+            :width="item.width"
+            :selectable="(row,number) => executeFuc(row,'3',item.clickFuc)"
+          ></el-table-column>
 
-  <el-table-column
-    v-if="item.columnType == 'radio' && executeEval(row,item.expression,true)"
-    :prop="item.columnName"
-    :label="item.columnDesc"
-    :sortable="item.sort"
-    :width="item.width"
-    :show-overflow-tooltip="item.tooltip"
-    :key="item.columnName"
-  >
-    <template  slot-scope="scope">
-      <el-radio :label="scope.row.id" v-model="radioCheck"><span></span></el-radio>
-    </template>
-  </el-table-column>
-  <el-table-column
-    v-if="item.columnType == 'laber' && executeEval(row,item.expression,true)"
-    :prop="item.columnName"
-    :label="item.columnDesc"
-    :sortable="item.sort"
-    :width="item.width"
-    :show-overflow-tooltip="item.tooltip"
-    :key="item.columnName"
-  >
-    <template   slot-scope="scope">
-      <span :style="{color: executeFuc(scope.row,'4',item.lableRuleObj[scope.row[item.columnName]])}">{{ item.lableRuleObj[scope.row[item.columnName]] }}</span>
-    </template>
-  </el-table-column>
-  <el-table-column
-    v-if="item.columnType == 'eltag' && executeEval(row,item.expression,true)"
-    :prop="item.columnName"
-    :label="item.columnDesc"
-    :sortable="item.sort"
-    :width="item.width"
-    :show-overflow-tooltip="item.tooltip"
-    :key="item.columnName"
-  >
-    <template   slot-scope="scope">
-      <el-tag :type="executeFuc(scope.row,'4',item,item.lableRuleObj?item.lableRuleObj[scope.row[item.columnName]]:scope.row[item.columnName])">
-        <span>{{ item.lableRuleObj?item.lableRuleObj[scope.row[item.columnName]]:scope.row[item.columnName] }}</span>
-      </el-tag>
-    </template>
-  </el-table-column>
-  <el-table-column
-    v-if="item.columnType == 'button' && executeEval(row,item.expression,true)"
-    :prop="item.columnName"
-    :label="item.columnDesc"
-    :width="item.width"
-    :key="item.columnName"
-    fixed="right"
-  >
-    <template slot-scope="scope">
-      <el-button v-if="isSpCombine" type="text" size="small"
-                 :disabled="scope.row.originUuid!=null || scope.row.lockStatus===3"
-                 @click.native.stop="intentSelectUdi(scope.row)">关联DI
-      </el-button>
-      <el-button type="text" size="small" :disabled="scope.row.lockStatus==3"
-                 @click.native.stop="handleModifyClick(scope.row)">编辑
-      </el-button>
-      <el-button type="text" size="small"
-                 @click.native.stop="handleDetailClick(scope.row)">详情
-      </el-button>
+          <el-table-column
+            v-if="item.columnType == 'radio' && executeEval(row,item.expression,true)"
+            :prop="item.columnName"
+            :label="item.columnDesc"
+            :sortable="item.sort"
+            :width="item.width"
+            :show-overflow-tooltip="item.tooltip"
+            :key="item.columnName"
+          >
+            <template slot-scope="scope">
+              <el-radio :label="scope.row.id" v-model="radioCheck"><span></span></el-radio>
+            </template>
+          </el-table-column>
+          <el-table-column
+            v-if="item.columnType == 'laber' && executeEval(row,item.expression,true)"
+            :prop="item.columnName"
+            :label="item.columnDesc"
+            :sortable="item.sort"
+            :width="item.width"
+            :show-overflow-tooltip="item.tooltip"
+            :key="item.columnName"
+          >
+            <template slot-scope="scope">
+              <span :style="{color: executeFuc(scope.row,'4',item.lableRuleObj[scope.row[item.columnName]])}">{{
+                  item.lableRuleObj[scope.row[item.columnName]]
+                }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            v-if="item.columnType == 'eltag' && executeEval(row,item.expression,true)"
+            :prop="item.columnName"
+            :label="item.columnDesc"
+            :sortable="item.sort"
+            :width="item.width"
+            :show-overflow-tooltip="item.tooltip"
+            :key="item.columnName"
+          >
+            <template slot-scope="scope">
+              <el-tag
+                :type="executeFuc(scope.row,'4',item,item.lableRuleObj?item.lableRuleObj[scope.row[item.columnName]]:scope.row[item.columnName])">
+                <span>{{
+                    item.lableRuleObj ? item.lableRuleObj[scope.row[item.columnName]] : scope.row[item.columnName]
+                  }}</span>
+              </el-tag>
+            </template>
+          </el-table-column>
+          <el-table-column
+            v-if="item.columnType == 'button' && executeEval(row,item.expression,true)"
+            :prop="item.columnName"
+            :label="item.columnDesc"
+            :width="item.width"
+            :key="item.columnName"
+            fixed="right"
+          >
+            <template slot-scope="scope">
+              <el-button v-if="isSpCombine" type="text" size="small"
+                         :disabled="scope.row.originUuid!=null || scope.row.lockStatus===3"
+                         @click.native.stop="intentSelectUdi(scope.row)">关联DI
+              </el-button>
+              <el-button type="text" size="small" :disabled="scope.row.lockStatus==3"
+                         @click.native.stop="handleModifyClick(scope.row)">编辑
+              </el-button>
+              <el-button type="text" size="small"
+                         @click.native.stop="handleDetailClick(scope.row)">详情
+              </el-button>
 
-      <el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)"
-      >
+              <el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)"
+              >
                       <span class="el-dropdown-link">
                         <i class="el-icon-d-arrow-right el-icon--right"></i>更多
                       </span>
-        <el-dropdown-menu slot="dropdown">
-          <!--                <el-dropdown-item command="handleDetailClick" v-if=" scope.row.lockStatus!=3">详情</el-dropdown-item>-->
-          <el-dropdown-item command="sumitLockStatus" v-if="isSpCombine" :disabled="scope.row.lockStatus===3">
-            提交审核
-          </el-dropdown-item>
-          <el-dropdown-item command="splitSelectUdi" v-if="isSpCombine" type="text" size="small"
-                            :disabled="scope.row.thirdId===scope.row.nameCode  || scope.row.thirdId==null || scope.row.nameCode==null || scope.row.lockStatus===3">
-            拆分产品
-          </el-dropdown-item>
-          <el-dropdown-item command="deleteCompanyProductRelevance">移除</el-dropdown-item>
-        </el-dropdown-menu>
-      </el-dropdown>
-    </template>
-  </el-table-column>
-  <el-table-column
-    v-if="item.columnType == 'text' && executeEval(row,item.expression,true)"
-    :prop="item.columnName"
-    :label="item.columnDesc"
-    :sortable="item.sort"
-    :width="item.width"
-    :show-overflow-tooltip="item.tooltip"
-    :key="item.columnName"
-  >
-    <template slot-scope="scope">
-      <span :style="{color: executeFuc(scope.row,'4',item,scope.row[item.columnName])}">{{ scope.row[item.columnName] }}</span>
-    </template>
-  </el-table-column>
-</template>
-</el-table>
+                <el-dropdown-menu slot="dropdown">
+                  <!--                <el-dropdown-item command="handleDetailClick" v-if=" scope.row.lockStatus!=3">详情</el-dropdown-item>-->
+                  <el-dropdown-item command="sumitLockStatus" v-if="isSpCombine" :disabled="scope.row.lockStatus===3">
+                    提交审核
+                  </el-dropdown-item>
+                  <el-dropdown-item command="splitSelectUdi" v-if="isSpCombine" type="text" size="small"
+                                    :disabled="scope.row.thirdId===scope.row.nameCode  || scope.row.thirdId==null || scope.row.nameCode==null || scope.row.lockStatus===3">
+                    拆分产品
+                  </el-dropdown-item>
+                  <el-dropdown-item command="deleteCompanyProductRelevance">移除</el-dropdown-item>
+                </el-dropdown-menu>
+              </el-dropdown>
+            </template>
+          </el-table-column>
+          <el-table-column
+            v-if="item.columnType == 'text' && executeEval(row,item.expression,true)"
+            :prop="item.columnName"
+            :label="item.columnDesc"
+            :sortable="item.sort"
+            :width="item.width"
+            :show-overflow-tooltip="item.tooltip"
+            :key="item.columnName"
+          >
+            <template slot-scope="scope">
+              <span :style="{color: executeFuc(scope.row,'4',item,scope.row[item.columnName])}">{{
+                  scope.row[item.columnName]
+                }}</span>
+            </template>
+          </el-table-column>
+        </template>
+      </el-table>
 
 
-<pagination
-  v-show="total>0"
-  :total="total"
-  :limit.sync="filterQuery.limit"
-  :page.sync="filterQuery.page"
-  @pagination="handleCurrentChange"
-></pagination>
+      <pagination
+        v-show="total>0"
+        :total="total"
+        :limit.sync="filterQuery.limit"
+        :page.sync="filterQuery.page"
+        @pagination="handleCurrentChange"
+      ></pagination>
 
 
-<el-dialog
-  title="产品信息编辑"
-  :visible.sync="editDialogVisible"
-  width="80%"
-  :close-on-click-modal="false"
-  :close-on-press-escape="false"
-  v-if="editDialogVisible"
-  :before-close="refresh"
->
-<basicProductEdit
-  :productRemarkSet="productRemarkSet"
-  :editQuery="editQuery"
-  :closeDialog="closeDialog">
-</basicProductEdit>
+      <el-dialog
+        title="产品信息编辑"
+        :visible.sync="editDialogVisible"
+        width="80%"
+        :close-on-click-modal="false"
+        :close-on-press-escape="false"
+        v-if="editDialogVisible"
+        :before-close="refresh"
+      >
+        <basicProductEdit
+          :productRemarkSet="productRemarkSet"
+          :editQuery="editQuery"
+          :closeDialog="closeDialog">
+        </basicProductEdit>
 
 
-</el-dialog>
-<el-dialog
-  title="产品信息详情"
-  :visible.sync="detailDialogVisible"
-  width="70%"
-  :close-on-click-modal="false"
-  :close-on-press-escape="false"
-  v-if="detailDialogVisible"
->
-<basicProductDetail
-  :productRemarkSet="productRemarkSet"
-  :editQuery="editQuery"
-  :closeDialog="closeDialog">
-  >
-</basicProductDetail>
-</el-dialog>
-<el-dialog
-  title="关联选入耗材信息"
-  :visible.sync="selectUdiDialogVisible"
-  width="85%"
-  :close-on-click-modal="false"
-  :close-on-press-escape="false"
-  v-if="selectUdiDialogVisible"
->
-<selectUdi @closeUdi="closeUdi" :isImportUdi="isImportUdi"></selectUdi>
-</el-dialog>
-<el-dialog
-  :title="selectErpTitle"
-  :visible.sync="selectErpDialogVisible"
-  width="85%"
-  :close-on-click-modal="false"
-  :close-on-press-escape="false"
-  v-if="selectErpDialogVisible"
->
-<selectErp
-  :closeDialog="closeDialog"
-  :uuid="uuid"
-  :relId="relId"
-  :intentThirdId="intentThirdId"
-  :isImport="isImport"
-  :data="thisData"
-  :defaultSys="defaultSys"
-  @closeUdi="closeUdi"
-  :supEnable="true"
-></selectErp>
-</el-dialog>
-<el-dialog
-  title="选入DI器械信息"
-  :visible.sync="selectLocalVisible"
-  width="85%"
-  :close-on-click-modal="false"
-  :close-on-press-escape="false"
-  v-if="selectLocalVisible"
->
-<selectLocalUdi
-  :closeDialog="closeDialog"
-  :relId="relId"
-  :thirdId="thirdId"
-  :idSpliUdi="idSpliUdi"
-  :isImportUdi="isImportUdi"
-  :data="thisData"
-  @closeUdi="closeUdi"
-></selectLocalUdi>
-</el-dialog>
-<el-dialog
-  title="选入物资字典信息"
-  :visible.sync="selectProductVisible"
-  width="85%"
-  :close-on-click-modal="false"
-  :close-on-press-escape="false"
-  v-if="selectProductVisible"
->
-<selectProduct
-  :closeSelDialog="closeSelDialog"
-  :uuid="uuid"
-></selectProduct>
-</el-dialog>
+      </el-dialog>
+      <el-dialog
+        title="产品信息详情"
+        :visible.sync="detailDialogVisible"
+        width="70%"
+        :close-on-click-modal="false"
+        :close-on-press-escape="false"
+        v-if="detailDialogVisible"
+      >
+        <basicProductDetail
+          :productRemarkSet="productRemarkSet"
+          :editQuery="editQuery"
+          :closeDialog="closeDialog">
+          >
+        </basicProductDetail>
+      </el-dialog>
+      <el-dialog
+        title="关联选入耗材信息"
+        :visible.sync="selectUdiDialogVisible"
+        width="85%"
+        :close-on-click-modal="false"
+        :close-on-press-escape="false"
+        v-if="selectUdiDialogVisible"
+      >
+        <selectUdi @closeUdi="closeUdi" :isImportUdi="isImportUdi"></selectUdi>
+      </el-dialog>
+      <el-dialog
+        :title="selectErpTitle"
+        :visible.sync="selectErpDialogVisible"
+        width="85%"
+        :close-on-click-modal="false"
+        :close-on-press-escape="false"
+        v-if="selectErpDialogVisible"
+      >
+        <selectErp
+          :closeDialog="closeDialog"
+          :uuid="uuid"
+          :relId="relId"
+          :intentThirdId="intentThirdId"
+          :isImport="isImport"
+          :data="thisData"
+          :defaultSys="defaultSys"
+          @closeUdi="closeUdi"
+          :supEnable="true"
+        ></selectErp>
+      </el-dialog>
+      <el-dialog
+        title="选入DI器械信息"
+        :visible.sync="selectLocalVisible"
+        width="85%"
+        :close-on-click-modal="false"
+        :close-on-press-escape="false"
+        v-if="selectLocalVisible"
+      >
+        <selectLocalUdi
+          :closeDialog="closeDialog"
+          :relId="relId"
+          :thirdId="thirdId"
+          :idSpliUdi="idSpliUdi"
+          :isImportUdi="isImportUdi"
+          :data="thisData"
+          @closeUdi="closeUdi"
+        ></selectLocalUdi>
+      </el-dialog>
+      <el-dialog
+        title="选入物资字典信息"
+        :visible.sync="selectProductVisible"
+        width="85%"
+        :close-on-click-modal="false"
+        :close-on-press-escape="false"
+        v-if="selectProductVisible"
+      >
+        <selectProduct
+          :closeSelDialog="closeSelDialog"
+          :uuid="uuid"
+        ></selectProduct>
+      </el-dialog>
 
-<el-dialog
-  :close-on-click-modal="false"
-  :close-on-press-escape="false"
-  title="新增配送产品"
-  :visible.sync="addProductVisible"
-  width="85%"
-  v-if="addProductVisible"
-  @close="closeAddDialog"
->
-<ThrProductsAdd
-  :closeAddDialog="closeAddDialog"
-  :newType="newType"></ThrProductsAdd>
-</el-dialog>
-<el-dialog
-  title="选择DI版本"
-  :visible.sync="selectVersionVisible"
-  :close-on-click-modal="false"
-  :close-on-press-escape="false"
-  width="85%"
-  v-if="selectVersionVisible"
->
-<selectUdiVersion
-  :closeDialog="closeDialog"
-  :relId="relId"
-  :uuid="uuid"
-  :originUuid="originUuid"
-  @closeUdi="closeUdi"
-></selectUdiVersion>
-</el-dialog>
-</el-card>
-</div>
+      <el-dialog
+        :close-on-click-modal="false"
+        :close-on-press-escape="false"
+        title="新增配送产品"
+        :visible.sync="addProductVisible"
+        width="85%"
+        v-if="addProductVisible"
+        @close="closeAddDialog"
+      >
+        <ThrProductsAdd
+          :closeAddDialog="closeAddDialog"
+          :newType="newType"></ThrProductsAdd>
+      </el-dialog>
+      <el-dialog
+        title="选择DI版本"
+        :visible.sync="selectVersionVisible"
+        :close-on-click-modal="false"
+        :close-on-press-escape="false"
+        width="85%"
+        v-if="selectVersionVisible"
+      >
+        <selectUdiVersion
+          :closeDialog="closeDialog"
+          :relId="relId"
+          :uuid="uuid"
+          :originUuid="originUuid"
+          @closeUdi="closeUdi"
+        ></selectUdiVersion>
+      </el-dialog>
+    </el-card>
+  </div>
 </template>
 
 <script>
@@ -465,7 +485,7 @@ import {
   updateErpProduct,
   uploadSmp,
   thirdSysDetail,
-  removeRl, sysFilterOptimize , spcombie, lockStatus, removeDiRl
+  removeRl, sysFilterOptimize, spcombie, lockStatus, removeDiRl
 } from "../../../api/basic/udiRelevance";
 import store from "../../../store/index";
 import {
@@ -484,7 +504,7 @@ import selectUdiVersion from "@/views/basic/product/UdiinfoSelectVersion";
 import basicProductEdit from "@/views/supplier/company/basicCompanyproductEdit";
 import basicProductDetail from "@/views/supplier/company/basicCompanyproductDetail"
 import {
-  getHead,executeFuc
+  getHead, executeFuc
 } from "@/utils/customConfig";
 
 export default {
@@ -521,12 +541,12 @@ export default {
         pId: null,
       },
       pId: 0,
-      tableHeader:[],
-      queryList:[],
-      fromList:[],
+      tableHeader: [],
+      queryList: [],
+      fromList: [],
 
       options: {
-        getSysFilter:[]
+        getSysFilter: []
       },
       productType: null,
       defaultSys: null,
@@ -1079,11 +1099,11 @@ export default {
         }
       });
     },
-    executeFuc(row,type,clickFuc,value){
-      return executeFuc(this,row,type,clickFuc,value);
+    executeFuc(row, type, clickFuc, value) {
+      return executeFuc(this, row, type, clickFuc, value);
     },
-    executeEval(row,expression,defaultRet){
-      if(expression){
+    executeEval(row, expression, defaultRet) {
+      if (expression) {
         return eval(expression);
       }
       return defaultRet;
@@ -1107,7 +1127,7 @@ export default {
   created() {
     this.findBasicProductSet();
 
-    getHead("basicCompanyProducts","1").then((re) => {
+    getHead("basicCompanyProducts", "1").then((re) => {
       // 处理返回的数据
       this.tableObj = re.data;
       this.tableHeader = re.data.tableList;
diff --git a/src/views/supplier/products/supProductsAdd.vue b/src/views/supplier/products/supProductsAdd.vue
index 1355d07..30804be 100644
--- a/src/views/supplier/products/supProductsAdd.vue
+++ b/src/views/supplier/products/supProductsAdd.vue
@@ -1,6 +1,6 @@
 <template>
   <el-card class="el-card">
-    <el-form :model="newProductData" size="mini" label-width="150px">
+    <el-form :model="newProductData" size="mini" label-width="150px" :rules="rules">
       <div style="margin-bottom: 20px">
         <!--        <el-row>-->
         <!--          <el-col :span="12" class="el-col">-->
@@ -115,7 +115,47 @@
                         v-model.trim="newProductData.price"></el-input>
             </el-form-item>
           </el-col>
-
+          <el-col :span="12">
+            <el-form-item label="采购类型">
+              <el-select
+                v-model="newProductData.purType"
+                placeholder="请选择"
+                clearable
+                style="width: 90%"
+              >
+                <el-option label="普通入账产品" :value="1"></el-option>
+                <el-option label="预验收产品" :value="2"></el-option>
+                <el-option label="寄售产品" :value="3"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="产品属性">
+              <el-select
+                v-model="newProductData.attributeType"
+                placeholder="请选择"
+                clearable
+                style="width: 90%"
+              >
+                <el-option label="设备" :value="1"></el-option>
+                <el-option label="耗材" :value="2"></el-option>
+                <el-option label="伴随服务费" :value="3"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="耗材类别">
+              <el-select
+                v-model="newProductData.hcType"
+                placeholder="请选择"
+                clearable
+                style="width: 90%"
+              >
+                <el-option label="高值耗材" :value="1"></el-option>
+                <el-option label="普通耗材" :value="2"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
 
           <el-col :span="12" v-if="productRemarkSet.remarkEnable1">
             <el-form-item :label="productRemarkSet.remarkTitle1+':'">
@@ -238,7 +278,6 @@
           </el-col>
         </el-row>
       </div>
-
       <div style='text-align: center; margin-bottom: 10px;'>
         <el-button type="primary" @click="saveNewProduct">提交</el-button>
         <el-button type="primary" @click="closeAddDialog">取消</el-button>
@@ -303,6 +342,15 @@ export default {
         remarkTitle7: "备注字段7",
         remarkTitle8: "备注字段8",
       },
+      rules: {
+        customerId: [
+          {
+            required: true,
+            message: "请选择供应商",
+            trigger: "change"
+          }
+        ],
+      }
     }
 
   },
@@ -334,10 +382,10 @@ export default {
         this.$message.warning("生产企业不能为空！");
         return;
       }
-      if (this.$isBlank(this.newProductData.registerNo)) {
-        this.$message.warning("注册证号不能为空！");
-        return;
-      }
+      // if (this.$isBlank(this.newProductData.registerNo)) {
+      //   this.$message.warning("注册证号不能为空！");
+      //   return;
+      // }
 
 
       if (this.newType == 1) {