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

src/views/ctyc/info/index.vue

@@ -71,10 +71,21 @@
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="企业名称" prop="companyName">
-          <el-input v-model="form.companyName" disabled="true" />
+          <el-input v-model="form.companyName" />
         </el-form-item>
-        <el-form-item label="监控人员名称" prop="monitorByName">
-          <el-input v-model="form.monitorByName" placeholder="请输入监控人员名称" />
+        <el-form-item label="监控人员" prop="monitorByName">
+          <ElPopoverSelectV2
+                  ref="materialPopoverSelect"
+                  title="监控人员"
+                  v-model="form.monitorByName"
+                  :source.sync="form"
+                  valueKey="name"
+                  :dataMapping="{monitorBy:'id',monitorByName: 'name'}"
+                  referName="CONTACTS_PARAM"
+                  style="width: 100%"
+                  @change="materialReferenceChange"
+                >
+                </ElPopoverSelectV2>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -92,6 +103,7 @@ export default {
   name: "Info",
   components: {
     BatchImport: () => import("@/components/BatchImport/indexa.vue"),
+    ElPopoverSelectV2: () => import("@/components/popover-select-v2/index.vue")
   },
   data() {
     return {
@@ -141,6 +153,17 @@ export default {
     this.getList();
   },
   methods: {
+    // 物料参考
+    openMaterialReference() {
+      let { open } = this.$refs.materialPopoverSelect[0];
+      open();
+    },
+    materialReferenceChange(prop, { source }) {
+      this.params.sysMaterialApply = {
+        ...this.params.sysMaterialApply,
+        ...source,
+      };
+    },
     // 确认导入
     handelImport(fileList) {
       this.$modal.loading("加载中...");

src/views/expend/expendMx.vue

@@ -2,7 +2,7 @@
   <div id="expendMx">
     <div v-if="isList">
       <el-card v-loading="loading" style="position: relative">
-        <el-form class="search_area" label-width="auto">
+        <!-- <el-form class="search_area" label-width="auto">
           <el-row :gutter="10">
             <el-col :span="1.5">
               <el-form-item label="编码">
@@ -167,8 +167,16 @@
               </el-form-item>
             </el-col>
           </el-row>
-        </el-form>
+        </el-form> -->
 
+        <el-super-search
+          v-model="params"
+          :size="size"
+          :dict="dict"
+          :columns="SearchColumns"
+          @reset="resetList"
+          @submit="useQuery(params, pageInfo)"
+        ></el-super-search>
         <div class="btn_grooup">
           <!-- <el-button type="primary" size="mini" @click="submits">提交</el-button> -->
 
@@ -245,6 +253,7 @@ export default {
   components: {
     Add: () => import("./expendMxDetail.vue"),
     ElSuperUxTable: () => import("@/components/super-ux-table/index.vue"),
+    ElSuperSearch: () => import("@/components/super-search/index.vue"),
   },
   data() {
     return {
@@ -284,7 +293,93 @@ export default {
       },
       tableData: [],
       selectData: [],
-      // SearchColumns: SearchColumns,
+      SearchColumns: [
+      {
+        item: { key: "code", title: "编码" },
+        attr: {
+          is: "el-input",
+          clearable: true,
+        }
+      },
+      {
+        item: { key: "custName", title: "医院名称" },
+        attr: {
+          is: "el-input",
+          clearable: true,
+        }
+      },
+      {
+        item: { key: "custCode", title: "医院编码" },
+        attr: {
+          is: "el-input",
+          clearable: true,
+        }
+      },
+      {
+        item: { key: "supplierName", title: "供应商名称" },
+        attr: {
+          is: "el-input",
+          clearable: true,
+        }
+      },
+      {
+        item: { key: "supplierCode", title: "供应商编码" },
+        attr: {
+          is: "el-input",
+          clearable: true,
+        }
+      },
+      {
+        item: { key: "startDate", title: "结算开始日期", span: 6 },
+        attr: {
+          is: "el-date-picker",
+          type: "date",
+          placeholder: "请选择",
+          valueFormat: "yyyy-MM-dd",
+          clearable: true,
+        }
+      },
+      {
+        item: { key: "endDate", title: "结算截止日期", span: 6 },
+        attr: {
+          is: "el-date-picker",
+          type: "date",
+          placeholder: "请选择",
+          valueFormat: "yyyy-MM-dd",
+          clearable: true,
+        }
+      },
+      {
+        item: { key: "settleNo", title: "结算单号" },
+        attr: {
+          is: "el-input",
+          clearable: true,
+        }
+      },
+      {
+        item: { key: "isSum", title: "是否汇总" },
+        attr: {
+          is: "el-select",
+          dictName: "sys_number_yes_no",
+          clearable: true,
+        }
+      },
+      {
+        item: { key: "sumCode", title: "汇总单据号" },
+        attr: {
+          is: "el-input",
+          clearable: true,
+        }
+      },
+      {
+        item: { key: "isWhether", title: "是否带量" },
+        attr: {
+          is: "el-select",
+          dictName: "carry_or_not",
+          clearable: true,
+        }
+      },
+      ],
       TableColumns: [
         { item: { key: "code", title: "编码" }, attr: {} },
         {

vue.config.js

@@ -36,8 +36,8 @@ module.exports = {
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
-        target: ` http://dev-sy.derom.com/drp-admin`, //开发
-        // target: `http://test-sy.derom.com/drp-admin`, //测试
+        // target: ` http://dev-sy.derom.com/drp-admin`, //开发
+         target: `http://test-sy.derom.com/drp-admin`, //测试
         // target: `http://release-sy.derom.com/drp-admin`, //预发
         // target: `http://sy.derom.com/drp-admin`, //生产
         // target: `http://172.16.63.202:8000/drp-admin`, // D本地
@@ -47,7 +47,7 @@ module.exports = {
         // target: `http://172.16.13.21:8000/drp-admin`, //CKF本地
         // target: `http://172.16.61.99:8000/drp-admin`, //lz's localhost
         // target: `http://172.16.13.30:8000/drp-admin`, //dz's localhost
-        //  target: `http://127.0.0.1:8000/drp-admin`,
+        // target: `http://127.0.0.1:8000/drp-admin`,
         // target: 'http://172.16.62.148:8000/drp-admin', //tkf本地
         // target: 'http://172.16.60.219:8000/drp-admin', //
         changeOrigin: true,