Merge remote-tracking branch 'origin/dev' into dev

src/components/popover-select/components/MANUFACTURER_PARAM.js

@@ -9,7 +9,7 @@ export default [
     attr: {},
   },
   {
-    item: { key: "registrantName", title: "注册人/上市许可持有人", width: "auto" },
+    item: { key: "registrantName", title: "注册人/备案人/上市许可持有人", width: "auto" },
     attr: {
       type:'ComputedInput',
       formatter: (prop) => {

src/views/business/spd/bo/gather/index.vue

@@ -71,6 +71,7 @@
       <el-table-column label="产线" align="center" prop="productionLineName" width="150" />
       <el-table-column label="供应商名称" align="center" prop="rivalName" width="220" />
       <el-table-column label="供应商体量/年（万元）" align="center" prop="rivalBulk" width="160" />
+      <el-table-column label="耗材体量/年（万元）" align="center" prop="consumableBulk" width="160" />
       <el-table-column label="品牌" align="center" prop="brand" width="220" />
       <el-table-column label="品牌份额（万元）" align="center" prop="brandPortion" width="140" />
       <el-table-column label="合同开始时间" align="center" prop="cooperationStart" width="180">
@@ -139,6 +140,11 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="6">
+            <el-form-item label="耗材体量/年（万元）" prop="consumableBulk" label-width="160px">
+              <el-input-number v-model="form.consumableBulk" :precision="2" :step="1"></el-input-number>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
             <el-form-item label="品牌" prop="brand">
               <el-popover-select-v2 v-model="form.brand" title="品牌" valueKey="name" referName="SUPPLIER_PARAM"
                 :dataMapping="{ brandId: 'id', brand: 'name'}" :source.sync="form" placeholder="请输入品牌" />
@@ -156,6 +162,8 @@
               </el-date-picker>
             </el-form-item>
           </el-col>
+        </el-row>
+        <el-row :gutter="20">
           <el-col :span="6">
             <el-form-item label="合同结束时间" prop="cooperationEnd" label-width="100px">
               <el-date-picker clearable v-model="form.cooperationEnd" type="date" value-format="yyyy-MM-dd"
@@ -163,8 +171,6 @@
               </el-date-picker>
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row :gutter="20">
           <el-col :span="6">
             <el-form-item label="科室关键人姓名" prop="sectionKeyPsnname" label-width="110px">
               <el-input v-model="form.sectionKeyPsnname" placeholder="请输入科室关键人姓名" />
@@ -180,13 +186,13 @@
               <el-input v-model="form.hospitalKeyPsnname" placeholder="请输入院级关键人姓名" />
             </el-form-item>
           </el-col>
+        </el-row>
+        <el-row :gutter="20">
           <el-col :span="6">
             <el-form-item label="院级关键人联系电话" prop="hospitalKeyPsnphone" label-width="140px">
               <el-input v-model="form.hospitalKeyPsnphone" placeholder="请输入院级关键人联系电话" />
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row :gutter="20">
           <el-col :span="6">
             <el-form-item label="供应商关键人姓名" prop="rivalKeyPsnname" label-width="140px">
               <el-input v-model="form.rivalKeyPsnname" placeholder="请输入供应商关键人姓名" />
@@ -263,6 +269,7 @@
           rival: null,
           rivalName: null,
           rivalBulk: null,
+          consumableBulk: null,
           brand: null,
           brandPortion: null,
           cooperationStart: null,
@@ -283,7 +290,23 @@
         // 表单参数
         form: {},
         // 表单校验
-        rules: {},
+        rules: {
+          customerName: [{
+            required: true,
+            message: '医院名称不能为空',
+            trigger: 'blur'
+          }],
+          productionLineName: [{
+            required: true,
+            message: '产线不能为空',
+            trigger: 'blur'
+          }],
+          rivalName: [{
+            required: true,
+            message: '供应商名称不能为空',
+            trigger: 'blur'
+          }],
+        },
         // 页面状态
         pageState: null,
       };
@@ -317,6 +340,7 @@
           rival: null,
           rivalName: null,
           rivalBulk: null,
+          consumableBulk: null,
           brand: null,
           brandPortion: null,
           cooperationStart: null,

src/views/material/basicFile/columns.js

@@ -312,7 +312,7 @@ export const OtherDictColumns = [
   {
     item:{
       key: "registrant",
-      title: "注册人/上市许可持有人",
+      title: "注册人/备案人/上市许可持有人",
     },
     attr: {
       clearable:true,

src/views/material/changeApply/add/column.js

@@ -251,7 +251,7 @@ export default function useColumns(){
         {
           item:{
             key:'registrant',
-            title:'注册人/上市许可持有人',
+            title:'注册人/备案人/上市许可持有人',
             require: true,
           },
           attr:{

src/views/material/requisition/details/columns.js

@@ -266,7 +266,7 @@ export default function useColumns(){
         { 
           item:{
             key:'registrant',
-            title:'注册人/上市许可持有人',
+            title:'注册人/备案人/上市许可持有人',
             required: true,
           },
           attr:{

src/views/purchase/workSpace/columns.js

@@ -179,7 +179,7 @@ export default function useColumns() {
       attr: {}
     },
     {
-      item: { key: 'registrant', title: '注册人/上市许可持有人', },
+      item: { key: 'registrant', title: '注册人/备案人/上市许可持有人', },
       attr: {}
     },
     {
@@ -224,7 +224,7 @@ export default function useColumns() {
       attr: {}
     },
     {
-      item: { key:'packExplain', title: '包装说明', },
+      item: { key: 'packExplain', title: '包装说明', },
       attr: {}
     },
     {