新增产品属性

.env.production

@@ -22,7 +22,7 @@ ENV = 'production'
 
 # 刘恩典
 # VUE_APP_BASE_API = 'http://192.168.0.117:9150/UDI_SPMS_SERVER/'
-# VUE_APP_BASE_API = 'http://192.168.0.117:9160/UDI_SPMS_SERVER/'
+# VUE_APP_BASE_API = 'http://192.168.0.117:9170/UDI_SPMS_SERVER/'
 # VUE_APP_BASE_API = 'http://192.168.0.127:9170/UDI_SPMS_SERVER/'
 
 # 漳州中医院
@@ -52,7 +52,7 @@ VUE_APP_BASE_API = 'http://dm.xmglxp.com:81/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/'
+# VUE_APP_BASE_API = 'http://116.204.108.228:9150/UDI_SPMS_SERVER/'
 
 
 # 应用访问路径 例如使用前缀 /admin/

src/views/basic/product/productEdit.vue

@@ -367,6 +367,24 @@
               </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-option label="伴随服务费" :value="3"></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/supplier/company/basicCompanyproductEdit.vue

@@ -96,6 +96,20 @@
               </el-select>
             </el-form-item>
           </el-col>
+          <el-col :span="12">
+            <el-form-item label="产品属性">
+              <el-select
+                v-model="editQuery.attributeType"
+                placeholder="请选择"
+                clearable
+                style="width: 65%"
+              >
+                <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" v-if="productRemarkSet.remarkEnable1">
             <el-form-item :label="productRemarkSet.remarkTitle1+':'">
               <el-input
@@ -331,6 +345,7 @@ export default {
         cpms: this.editQuery.cpms,
         ybbm: this.editQuery.ybbm,
         purType: this.editQuery.purType,
+        attributeType: this.editQuery.attributeType,
         overStockNum: this.editQuery.overStockNum,
         lowStockNum: this.editQuery.lowStockNum,
         recentDateTime: this.editQuery.recentDateTime,

src/views/supplier/products/selectDIDetailDialog.vue

@@ -93,6 +93,21 @@
               </el-select>
             </el-form-item>
           </el-col>
+          <el-col :span="12">
+            <el-form-item label="产品属性">
+              <el-select
+                v-model="editQuery.attributeType"
+                placeholder="请选择"
+                clearable
+                :disabled="true"
+                style="width: 65%"
+              >
+                <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" 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

@@ -211,6 +211,20 @@
               </el-select>
             </el-form-item>
           </el-col>
+          <el-col :span="12">
+            <el-form-item label="产品属性">
+              <el-select
+                v-model="editQuery.attributeType"
+                placeholder="请选择"
+                clearable
+                style="width: 65%"
+              >
+                <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="是否可集采:"