新增耗材分类

.env.production

@@ -33,7 +33,7 @@ ENV = 'production'
 
 # VUE_APP_BASE_API = 'http://dm.xmglxp.com:8081/UDI_SPMS_SERVER/'
 
-VUE_APP_BASE_API = 'http://dm.xmglxp.com:81/UDI_SPMS_SERVER/'
+# VUE_APP_BASE_API = 'http://dm.xmglxp.com:81/UDI_SPMS_SERVER/'
 
 #诏安医院
 # VUE_APP_BASE_API = 'http://139.9.174.242:9150/UDI_SPMS_SERVER/'
@@ -45,7 +45,7 @@ VUE_APP_BASE_API = 'http://dm.xmglxp.com:81/UDI_SPMS_SERVER/'
 # VUE_APP_BASE_API = 'http://192.168.0.72:9150/UDI_SPMS_SERVER/'
 
 # 南靖
-# VUE_APP_BASE_API = 'http://183.250.74.182:9150/UDI_SPMS_SERVER/'
+VUE_APP_BASE_API = 'http://183.250.74.182:9150/UDI_SPMS_SERVER/'
 
 # 东山
 # VUE_APP_BASE_API = 'http://116.204.108.228:9150/UDI_SPMS_SERVER/'

src/views/basic/product/productEdit.vue

@@ -385,6 +385,23 @@
               </el-col>
             </el-row>
             <el-divider></el-divider>
+            <el-row>
+              <el-col span="5">
+                <span class="sptext">耗材类别</span>
+              </el-col>
+              <el-divider direction="vertical"></el-divider>
+              <el-col span="5">
+                <el-select v-model="editQuery.attributeType" style="width: 65%" placeholder="选择耗材类别" clearable>
+                  <el-option label="高值耗材" :value="1"></el-option>
+                  <el-option label="普通耗材" :value="2"></el-option>
+                </el-select>
+              </el-col>
+              <el-divider direction="vertical"></el-divider>
+              <el-col span="13">
+                <span class="sptext">耗材类别</span>
+              </el-col>
+            </el-row>
+            <el-divider></el-divider>
             <el-row>
               <el-col span="5">
                 <span class="sptext">最小包装可使用次数</span>

src/views/myLogin.vue

@@ -7,7 +7,7 @@
         <h3 class="toptitle">{{ title }}</h3>
       </el-row>
       <el-row>
-        <h3 class="topSubtitle">医院UDI管理系统</h3>
+        <h3 class="topSubtitle">{{ subTitle }}</h3>
       </el-row>
     </div>
     <el-form
@@ -161,7 +161,8 @@ export default {
       showDialog: false, // 显示dialog
       redirect: null, // 回调地址
       hospName: "",
-      title: "福建省XXX医院"
+      title: "福建省XXX医院",
+      subTitle: "医院UDI管理系统",
     };
   },
   methods: {
@@ -274,6 +275,7 @@ export default {
     getTitleConfig() {
       getTitleConfig().then(res => {
         this.title = res.data.title;
+        this.subTitle = res.data.subTitle;
       });
     },
   },

src/views/supplier/company/basicCompanyproductEdit.vue

@@ -346,6 +346,7 @@ export default {
         ybbm: this.editQuery.ybbm,
         purType: this.editQuery.purType,
         attributeType: this.editQuery.attributeType,
+        hcType: this.editQuery.hcType,
         overStockNum: this.editQuery.overStockNum,
         lowStockNum: this.editQuery.lowStockNum,
         recentDateTime: this.editQuery.recentDateTime,

src/views/supplier/products/selectDIDetailDialog.vue

@@ -108,6 +108,20 @@
               </el-select>
             </el-form-item>
           </el-col>
+          <el-col :span="12">
+            <el-form-item label="耗材类别">
+              <el-select
+                v-model="editQuery.hcType"
+                placeholder="请选择"
+                clearable
+                :disabled="true"
+                style="width: 65%"
+              >
+                <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 ">
               <el-input style="width: 65%" size="small" splaceholder="请输入内容" :disabled="true"

src/views/supplier/products/supAddDiProductSelectUdi.vue

@@ -225,6 +225,19 @@
               </el-select>
             </el-form-item>
           </el-col>
+          <el-col :span="12">
+            <el-form-item label="耗材类别">
+              <el-select
+                v-model="editQuery.hcType"
+                placeholder="请选择"
+                clearable
+                style="width: 65%"
+              >
+                <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">
             <el-form-item
               label="是否可集采:"

src/views/supplier/products/supDiProductsCheck.vue

@@ -1,7 +1,8 @@
 <template>
   <div>
     <el-card class="el-card">
-      <el-form v-if="queryList && queryList.length > 0" :model="filterQuery" class="query-form" label-width="100px" v-show="showSearch">
+      <el-form v-if="queryList && queryList.length > 0" :model="filterQuery" class="query-form" label-width="100px"
+               v-show="showSearch">
         <!--        <el-row>-->
         <!--          <el-col :span="6">-->
         <!--            <el-form-item label="物资编码:">-->
@@ -59,7 +60,8 @@
         <!--        </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' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`" :key="item.id">
+            <el-form-item v-if="item.columnType == 'input' && executeEval(row,item.expression,true)"
+                          :label="item.columnDesc+`:`" :key="item.id">
               <el-input
                 v-model="filterQuery[item.columnName]"
                 :placeholder="item.columnDesc"
@@ -68,7 +70,8 @@
                 clearable
               ></el-input>
             </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"
                          :disabled="executeEval(null,item.disabledFuc,false)"
@@ -80,10 +83,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"
@@ -99,10 +105,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"
@@ -114,7 +123,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'}`"
@@ -196,7 +206,9 @@
             :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>
+              <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
@@ -209,8 +221,11 @@
             :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])">
+              <el-tag
-                <span>{{ item.lableRuleObj?item.lableRuleObj[scope.row[item.columnName]]:scope.row[item.columnName] }}</span>
+                :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>
@@ -245,7 +260,9 @@
             :key="item.columnName"
           >
             <template slot-scope="scope">
-              <span :style="{color: executeFuc(scope.row,'4',item,scope.row[item.columnName])}">{{ scope.row[item.columnName] }}</span>
+              <span :style="{color: executeFuc(scope.row,'4',item,scope.row[item.columnName])}">{{
+                  scope.row[item.columnName]
+                }}</span>
             </template>
           </el-table-column>
         </template>
@@ -469,7 +486,7 @@ export default {
           if (res.code === 20000) {
             _this.thisData = res.data
             _this.editDate = row
-            _this.thisData.isAudit = type
+            _this.thisData.isAudit = 1
             _this.thrProductsDiDetailVisible = true
           } else {
             _this.$message.error('参数错误')
@@ -489,7 +506,7 @@ export default {
           if (res.code === 20000) {
             _this.thisData = res.data
             _this.editDate = row
-            _this.thisData.isAudit = type
+            _this.thisData.isAudit = 2
             _this.thrProductsDiDetailVisible = true
           } else {
             _this.$message.error('参数错误')