Merge branch 'master' of http://172.16.100.139/new-business/drp-web

src/api/changeApply/basic.js

@@ -57,7 +57,7 @@ export function getMaterialDetails(id) {
 // 获取生产厂家列表信息
 export function getProductFactory(data) {
   return request({
-    url: `/system/archival/queryManufacturer`,
+    url: `/system/archival/queryManufacturer?pageSize=${data.pageSize}&pageNum=${data.pageNo}`,
     method: 'post',
     data: data
   })

src/components/PopDialog/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <el-dialog
-      title="物料选择"
+      title="物料编码选择"
       width="1000px"
       :close-on-click-modal="false"
       :append-to-body="true"
@@ -71,57 +71,31 @@
               >
               </el-table-column>
               <el-table-column
-                prop="id"
+                prop="code"
                 header-align="center"
-                align="left"
+                align="center"
                 sortable="custom"
                 min-width="90"
-                label="id"
+                label="code"
               >
               </el-table-column>
               <el-table-column
                 prop="name"
                 header-align="center"
-                align="left"
+                align="center"
                 sortable="custom"
                 min-width="90"
                 label="物料名称"
               >
               </el-table-column>
-              <!-- <el-table-column
-                prop="contractAmount"
-                header-align="center"
-                align="left"
-                sortable="custom"
-                min-width="110"
-                label="合同金额"
-              >
-              </el-table-column>
-              <el-table-column
-                prop="oppositeCompany"
-                header-align="center"
-                align="center"
-                sortable="custom"
-                min-width="110"
-                label="对方单位"
-              >
-              </el-table-column>
-              <el-table-column
-                prop="signDate"
-                header-align="center"
-                align="left"
-                sortable="custom"
-                min-width="110"
-                label="签订时间"
-              >
-              </el-table-column> -->
             </el-table>
+
             <el-pagination
               @size-change="sizeChangeHandle"
               @current-change="currentChangeHandle"
-              :current-page="pageNo"
+              :current-page="searchForm.pageNo"
               :page-sizes="[5, 10, 15, 20]"
-              :page-size="pageSize"
+              :page-size="searchForm.pageSize"
               :total="total"
               layout="total, sizes, prev, pager, next, jumper"
             >
@@ -156,13 +130,13 @@ export default {
     return {
       searchForm: {
         code: '',
-        name: ''
+        name: '',
+        pageNo: 1,
+        pageSize: 10,
       },
       dataListAllSelections: [], // 所有选中的数据包含跨页数据
       idKey: "id", // 标识列表数据中每一行的唯一键的名称(需要按自己的数据改一下)
       dataList: [],
-      pageNo: 1,
-      pageSize: 10,
       total: 0,
       orders: [],
       loading: false,
@@ -202,14 +176,10 @@ export default {
       //     // orders: this.orders,
       //     // ...this.searchForm,
       //   },
-      getMaterialList({
-        pageNo: 1,
-        size: this.pageSize
-      }).then(({ data }) => {
+      getMaterialList(this.searchForm).then(({ data }) => {
         console.log('data',data)
         this.dataList = data.tableBody.rows;
         this.total = data.tableBody.total;
-        this.pageNo = data.current;
         this.loading = false;
         this.$nextTick(() => {
           this.setSelectRow();
@@ -218,13 +188,14 @@ export default {
     },
     // 每页数
     sizeChangeHandle(val) {
-      this.pageSize = val;
-      this.pageNo = 1;
+      console.log('每页数：', val)
+      this.searchForm.pageSize = val;
       this.refreshList();
     },
     // 当前页
     currentChangeHandle(val) {
-      this.pageNo = val;
+      console.log('当前页：', val)
+      this.searchForm.pageNo = val;
       this.refreshList();
     },
     // 排序

src/components/PopDialog/productFactory.vue

@@ -20,22 +20,22 @@
               @keyup.enter.native="refreshList()"
               @submit.native.prevent
             >
-              <el-form-item prop="code">
+              <el-form-item prop="param" label="名称/编号" >
                 <el-input
                   size="small"
-                  v-model="searchForm.code"
+                  v-model="searchForm.param"
                   placeholder="编号"
                   clearable
                 ></el-input>
               </el-form-item>
-              <el-form-item prop="name">
+              <!-- <el-form-item prop="name">
                 <el-input
                   size="small"
                   v-model="searchForm.name"
                   placeholder="名称"
                   clearable
                 ></el-input>
-              </el-form-item>
+              </el-form-item> -->
               <el-form-item>
                 <el-button
                   type="primary"
@@ -71,12 +71,12 @@
               >
               </el-table-column>
               <el-table-column
-                prop="id"
+                prop="code"
                 header-align="center"
-                align="left"
+                align="center"
                 sortable="custom"
                 min-width="90"
-                label="id"
+                label="code"
               >
               </el-table-column>
               <el-table-column
@@ -88,40 +88,13 @@
                 label="名称"
               >
               </el-table-column>
-              <!-- <el-table-column
-                prop="contractAmount"
-                header-align="center"
-                align="left"
-                sortable="custom"
-                min-width="110"
-                label="合同金额"
-              >
-              </el-table-column>
-              <el-table-column
-                prop="oppositeCompany"
-                header-align="center"
-                align="center"
-                sortable="custom"
-                min-width="110"
-                label="对方单位"
-              >
-              </el-table-column>
-              <el-table-column
-                prop="signDate"
-                header-align="center"
-                align="left"
-                sortable="custom"
-                min-width="110"
-                label="签订时间"
-              >
-              </el-table-column> -->
             </el-table>
             <el-pagination
               @size-change="sizeChangeHandle"
               @current-change="currentChangeHandle"
-              :current-page="pageNo"
+              :current-page="searchForm.pageNo"
               :page-sizes="[5, 10, 15, 20]"
-              :page-size="pageSize"
+              :page-size="searchForm.pageSize"
               :total="total"
               layout="total, sizes, prev, pager, next, jumper"
             >
@@ -154,14 +127,15 @@ export default {
   data() {
     return {
       searchForm: {
-        code: '',
-        name: ''
+        // code: '',
+        // name: '',
+        param: '',
+        pageNo: 1,
+        pageSize: 10,
       },
       dataListAllSelections: [], // 所有选中的数据包含跨页数据
       idKey: "id", // 标识列表数据中每一行的唯一键的名称(需要按自己的数据改一下)
       dataList: [],
-      pageNo: 1,
-      pageSize: 10,
       total: 0,
       orders: [],
       loading: false,
@@ -201,14 +175,10 @@ export default {
       //     // orders: this.orders,
       //     // ...this.searchForm,
       //   },
-      getProductFactory({
-        pageNo: 1,
-        size: this.pageSize
-      }).then(({ data }) => {
+      getProductFactory(this.searchForm).then(({ data }) => {
         console.log('data',data)
         this.dataList = data.tableBody;
-        this.total = data.tableBody.length;
-        this.pageNo = data.current;
+        this.total = data.total;
         this.loading = false;
         this.$nextTick(() => {
           this.setSelectRow();
@@ -217,18 +187,17 @@ export default {
     },
     // 每页数
     sizeChangeHandle(val) {
-      this.pageSize = val;
-      this.pageNo = 1;
+      this.searchForm.pageSize = val;
       this.refreshList();
     },
     // 当前页
     currentChangeHandle(val) {
-      this.pageNo = val;
+      this.searchForm.pageNo = val;
       this.refreshList();
     },
     // 排序
     resetSearch() {
-      this.$refs.searchForm.resetFields();
+      this.$refs['searchForm'].resetFields();
       this.refreshList();
     },
     // 选中数据

src/views/material/changeApply/add.vue

@@ -35,6 +35,7 @@
                     placeholder="医药物料"
                     clearable
                     :disabled="disable"
+                    @change="controlMedic"
                   >
                     <el-option
                       v-for="item in options"
@@ -165,9 +166,9 @@
               <el-form-item label="药品" prop="drug">
                 <el-select
                     v-model="basicForm2.drug"
-                    placeholder="药品"
+                    placeholder="请选择"
                     clearable
-                    :disabled="disable"
+                    :disabled="disable || isControl"
                   >
                     <el-option
                       v-for="dict in dict.type.sys_medicine"
@@ -180,16 +181,16 @@
             </el-col>
             <el-col :span="8">
               <el-form-item label="注册证号/备案凭证编号" prop="registrationNo">
-                <el-input :disabled="disable" v-model="basicForm2.registrationNo"></el-input>
+                <el-input :disabled="disable || isControl" v-model="basicForm2.registrationNo"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="8">
               <el-form-item label="医疗器械" prop="medicalDevices">
                 <el-select
                     v-model="basicForm2.medicalDevices"
-                    placeholder="医疗器械"
+                    placeholder="请选择"
                     clearable
-                    :disabled="disable"
+                    :disabled="disable || isControl"
                   >
                     <el-option
                       v-for="dict in dict.type.medical_instruments"
@@ -206,9 +207,9 @@
               <el-form-item label="养护类型" prop="maintenanceType">
                 <el-select
                     v-model="basicForm2.maintenanceType"
-                    placeholder="养护类型"
+                    placeholder="请选择"
                     clearable
-                    :disabled="disable"
+                    :disabled="disable || isControl"
                   >
                     <el-option
                       v-for="dict in dict.type.curing_type"
@@ -387,6 +388,7 @@ export default {
     return{
       factoryOptions: [],
       tabValue: 'first',
+      isControl: true,
       basicForm: {
         code: '',
         orgId: '',
@@ -394,7 +396,7 @@ export default {
         materialId:'',
         materialCode: '',
         materialName: '',
-        medicineMaterial: '',
+        medicineMaterial: '2',
         oneClass: '',
         twoClass: '',
         threeClass: '',
@@ -442,7 +444,7 @@ export default {
         twoClass: [{required: true, message: '请填写二级分类', trigger: 'blur'}],
         threeClass: [{required: true, message: '请填写三级分类', trigger: 'blur'}],
         fourClass: [{required: true, message: '请填写四级分类', trigger: 'blur'}],
-        specification: [{required: true, message: '请填写四级分类', trigger: 'blur'}],
+        specification: [{required: true, message: '请填写型号分类', trigger: 'blur'}],
         model: [{required: true, message: '请填写四级分类', trigger: 'blur'}],
         factory: [{required: true, message: '请选择生产厂家/代理人', trigger: 'blur'}],
         registrant: [{required: true, message: '请填写注册人/上市许可持有人', trigger: 'blur'}],
@@ -510,6 +512,12 @@ export default {
         console.log('页面状态',this.pageStu)
         console.log('数据', this.row)
         this.getDetails(this.row)
+        // 控制医药属性是否能够填写
+        if (this.row.medicineMaterial == '0') {
+          this.isControl = false
+        } else {
+          this.isControl = true
+        }
         // 生产厂家代理人用于回显
         if (this.row.factory) {
           this.getFactoryDetails(this.row.factory)
@@ -529,6 +537,19 @@ export default {
         }
        })
     },
+    // 选择是否医药物料时控制医药属性
+    controlMedic(val) {
+      console.log('val',val)
+      if (val == '0') {
+        this.isControl = false
+      } else {
+        this.basicForm2.drug = ''
+        this.basicForm2.registrationNo = ''
+        this.basicForm2.medicalDevices = ''
+        this.basicForm2.maintenanceType = ''
+        this.isControl = true
+      }
+    },
     handleClick(tab, event) {
       console.log(tab, event);
       console.log('页面状态',this.pageStu)

src/views/material/requisition/add.vue

@@ -44,8 +44,8 @@
                 <el-select
                     v-model="basicForm.isMedicine"
                     placeholder="医药物料"
-                    clearable
                     :disabled="disable"
+                    @change="controlMedic"
                   >
                     <el-option
                       v-for="item in options"
@@ -365,7 +365,7 @@
           <el-row :gutter="20">
             <el-col :span="8">
               <el-form-item label="交货周期" prop="deliveryPeriod">
-                <el-input :disabled="disable" v-model="basicForm.deliveryPeriod"></el-input>
+                <el-input type="number" :disabled="disable" v-model="basicForm.deliveryPeriod"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="8">
@@ -538,9 +538,9 @@
               <el-form-item label="药品" prop="isDrug">
                 <el-select
                     v-model="basicForm2.isDrug"
-                    placeholder="药品"
+                    placeholder="请选择"
                     clearable
-                    :disabled="disable"
+                    :disabled="disable || isControl"
                   >
                     <el-option
                       v-for="dict in dict.type.sys_medicine"
@@ -553,16 +553,16 @@
             </el-col>
             <el-col :span="8">
               <el-form-item label="注册证号/备案凭证编号" prop="registrationNo">
-                <el-input :disabled="disable" v-model="basicForm2.registrationNo"></el-input>
+                <el-input :disabled="disable || isControl" v-model="basicForm2.registrationNo"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="8">
               <el-form-item label="医疗器械" prop="medicalInstruments">
                 <el-select
                     v-model="basicForm2.medicalInstruments"
-                    placeholder="医疗器械"
+                    placeholder="请选择"
                     clearable
-                    :disabled="disable"
+                    :disabled="disable || isControl"
                   >
                     <el-option
                       v-for="dict in dict.type.medical_instruments"
@@ -577,12 +577,12 @@
           <el-row :gutter="20">
             <el-col :span="8">
               <el-form-item label="通用名称" prop="commonName">
-                <el-input :disabled="disable" v-model="basicForm2.commonName"></el-input>
+                <el-input :disabled="disable || isControl" v-model="basicForm2.commonName"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="8">
               <el-form-item label="批准文号" prop="ratifyBatchNo">
-                <el-input :disabled="disable" v-model="basicForm2.ratifyBatchNo"></el-input>
+                <el-input :disabled="disable || isControl" v-model="basicForm2.ratifyBatchNo"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="8">
@@ -590,9 +590,9 @@
                 <el-select
                     ref="doses"
                     v-model="basicForm2.dosageFrom"
-                    placeholder="剂型"
+                    placeholder="请选择"
                     clearable
-                    :disabled="disable"
+                    :disabled="disable || isControl"
                     @focus="chooseDose"
                   >
                     <el-option
@@ -611,16 +611,16 @@
           <el-row :gutter="20">
             <el-col :span="8">
               <el-form-item label="旧注册证号" prop="oriRegistrationNo">
-                <el-input :disabled="disable" v-model="basicForm2.oriRegistrationNo"></el-input>
+                <el-input :disabled="disable || isControl" v-model="basicForm2.oriRegistrationNo"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="8">
               <el-form-item label="养护类型" prop="curingType">
                 <el-select
                     v-model="basicForm2.curingType"
-                    placeholder="养护类型"
+                    placeholder="请选择"
                     clearable
-                    :disabled="disable"
+                    :disabled="disable || isControl"
                   >
                     <el-option
                       v-for="dict in dict.type.curing_type"
@@ -874,13 +874,14 @@ export default {
       lineOptions: [],
       doseOptions: [],
       tabValue: 'first',
+      isControl: true,
       basicForm: {
         billCode: '',
         orgId: '',
         // 四级分类/物料分类
         classifyId: '',
         // 是否医药物料
-        isMedicine: '',
+        isMedicine: '2',
         // DI
         diCode: '',
         // 物料名称
@@ -1069,6 +1070,12 @@ export default {
       console.log('页面状态',this.pageStu)
       console.log('数据', this.row)
       this.getDetails(this.row)
+      // 控制医药属性是否能够填写
+      if (this.row.isMedicine == '0') {
+        this.isControl = false
+      } else {
+        this.isControl = true
+      }
       // 获取树形详情
       if (this.row.classifyId) {
         this.getTreeDetails(this.row.classifyId)
@@ -1107,6 +1114,23 @@ export default {
       console.log(tab, event);
       console.log('页面状态',this.pageStu)
     },
+    // 选择是否医药物料时控制医药属性
+    controlMedic(val) {
+      console.log('val',val)
+      if (val == '0') {
+        this.isControl = false
+      } else {
+        this.basicForm2.isDrug = ''
+        this.basicForm2.registrationNo = ''
+        this.basicForm2.medicalInstruments = ''
+        this.basicForm2.commonName = ''
+        this.basicForm2.ratifyBatchNo = ''
+        this.basicForm2.dosageFrom = ''
+        this.basicForm2.oriRegistrationNo = ''
+        this.basicForm2.curingType = ''
+        this.isControl = true
+      }
+    },
     // 用于回显四级分类树形选择
     getTreeDetails(id) {
       getDetail(id).then(res => {

vue.config.js

@@ -37,7 +37,7 @@ module.exports = {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
         // target: `http://172.16.100.107:8080/drp-admin`, //测试
-        // target: `http://test-sy.derom.com/drp-admin`, //测试
+        target: `http://test-sy.derom.com/drp-admin`, //测试
         // target: `http://172.16.63.202:8000/drp-admin`, // D本地
         // target: `http://172.16.62.241:8000/drp-admin`, //笑寒本地
         // target: `http://172.16.13.152:8000/drp-admin`, //豪哥本地