Merge branch 'master' of http://182.151.8.209:9010/eln_TD/eln_web

src/views/business/archive/drug/comps/ffjlList.vue

@@ -14,13 +14,11 @@
           </el-form-item>
           <!-- 目的 -->
           <el-form-item :label="$t('page.business.resource.mjy.md') + '：'">
-            <el-input v-model="queryParams.mdId" clearable :placeholder="$t('form.placeholderInput')" />
+            <el-input v-model="queryParams.mdMc" clearable :placeholder="$t('form.placeholderInput')" />
           </el-form-item>
           <!-- 记录状态 -->
           <el-form-item :label="$t('page.business.resource.mjy.jlzt') + '：'">
             <el-select v-model="queryParams.jlzt" :placeholder="$t('form.placeholderSelect')" clearable>
-              <el-option :label="$t('page.business.resource.resource.jlzt.wsd')" :value="1" />
-              <el-option :label="$t('page.business.resource.resource.jlzt.ysd')" :value="3" />
               <el-option :label="$t('page.business.resource.resource.jlzt.dgd')" :value="5" />
               <el-option :label="$t('page.business.resource.resource.jlzt.gd')" :value="7" />
               <el-option :label="$t('page.business.resource.resource.jlzt.djd')" :value="9" />
@@ -177,7 +175,7 @@ export default {
         pageNum: 1,
         pageSize: 10,
         mc: null,
-        mdId: null,
+        mdMc: null,
         jlzt: null,
         jyzt: null,
         bh: null,
@@ -269,7 +267,7 @@ export default {
     //重置
     resetQuery() {
        this.queryParams.mc = null
-      this.queryParams.mdId = null
+      this.queryParams.mdMc = null
       this.queryParams.jlzt = null
       this.queryParams.jyzt = null
       this.queryParams.bh = null

src/views/business/archive/drug/comps/mjyList.vue

@@ -24,10 +24,6 @@
           <!-- 制剂状态 -->
           <el-form-item :label="$t('page.business.resource.mjy.zjzt') + '：'">
             <el-select v-model="queryParams.zjzt" :placeholder="$t('form.placeholderSelect')" clearable>
-              <el-option :label="$t('page.business.resource.resource.zjzt.rk')" :value="1" />
-              <el-option :label="$t('page.business.resource.resource.zjzt.wrk')" :value="2" />
-              <el-option :label="$t('page.business.resource.resource.zjzt.yff')" :value="3" />
-              <el-option :label="$t('page.business.resource.resource.zjzt.ysd')" :value="5" />
               <el-option :label="$t('page.business.resource.resource.zjzt.dgd')" :value="7" />
               <el-option :label="$t('page.business.resource.resource.zjzt.gd')" :value="9" />
               <el-option :label="$t('page.business.resource.resource.zjzt.djd')" :value="11" />

src/views/business/archive/formulation/comps/ffjlList.vue

@@ -14,13 +14,11 @@
           </el-form-item>
           <!-- 目的 -->
           <el-form-item :label="$t('page.business.resource.gyzj.md') + '：'">
-            <el-input v-model="queryParams.mdId" clearable :placeholder="$t('form.placeholderInput')" />
+            <el-input v-model="queryParams.mdMc" clearable :placeholder="$t('form.placeholderInput')" />
           </el-form-item>
           <!-- 记录状态 -->
           <el-form-item :label="$t('page.business.resource.gyzj.jlzt') + '：'">
             <el-select v-model="queryParams.jlzt" :placeholder="$t('form.placeholderSelect')" clearable>
-              <el-option :label="$t('page.business.resource.resource.jlzt.wsd')" :value="1" />
-              <el-option :label="$t('page.business.resource.resource.jlzt.ysd')" :value="3" />
               <el-option :label="$t('page.business.resource.resource.jlzt.dgd')" :value="5" />
               <el-option :label="$t('page.business.resource.resource.jlzt.gd')" :value="7" />
               <el-option :label="$t('page.business.resource.resource.jlzt.djd')" :value="9" />
@@ -193,7 +191,7 @@ export default {
         pageNum: 1,
         pageSize: 10,
         mc: null,
-        mdId: null,
+        mdMc: null,
         jlzt: null,
         jyzt: null,
         bh: null,
@@ -285,7 +283,7 @@ export default {
     //重置
     resetQuery() {
        this.queryParams.mc = null
-      this.queryParams.mdId = null
+      this.queryParams.mdMc = null
       this.queryParams.jlzt = null
       this.queryParams.jyzt = null
       this.queryParams.bh = null

src/views/business/archive/formulation/comps/gyzjList.vue

@@ -24,10 +24,6 @@
           <!-- 制剂状态 -->
           <el-form-item :label="$t('page.business.resource.gyzj.zjzt') + '：'">
             <el-select v-model="queryParams.zjzt" :placeholder="$t('form.placeholderSelect')" clearable>
-              <el-option :label="$t('page.business.resource.resource.zjzt.rk')" :value="1" />
-              <el-option :label="$t('page.business.resource.resource.zjzt.wrk')" :value="2" />
-              <el-option :label="$t('page.business.resource.resource.zjzt.yff')" :value="3" />
-              <el-option :label="$t('page.business.resource.resource.zjzt.ysd')" :value="5" />
               <el-option :label="$t('page.business.resource.resource.zjzt.dgd')" :value="7" />
               <el-option :label="$t('page.business.resource.resource.zjzt.gd')" :value="9" />
               <el-option :label="$t('page.business.resource.resource.zjzt.djd')" :value="11" />

src/views/business/resource/gyzj/comps/ffjlList.vue

@@ -18,7 +18,7 @@
               </el-form-item>
               <!-- 目的 -->
               <el-form-item :label="$t('page.business.resource.gyzj.md') + '：'">
-                <el-input v-model="queryParams.mdId" clearable 
+                <el-input v-model="queryParams.mdMc" clearable 
                   :placeholder="$t('form.placeholderInput')" />
               </el-form-item>
               <!-- 记录状态 -->
@@ -229,7 +229,7 @@ export default {
         pageNum: 1,
         pageSize: 10,
         mc: null,
-        mdId: null,
+        mdMc: null,
         jlzt: null,
         jyzt: null,
         bh: null,
@@ -460,7 +460,7 @@ export default {
     //重置
     resetQuery() {
       this.queryParams.mc = null
-      this.queryParams.mdId = null
+      this.queryParams.mdMc = null
       this.queryParams.jlzt = null
       this.queryParams.jyzt = null
       this.queryParams.bh = null

src/views/business/resource/mjy/comps/ffjlList.vue

@@ -18,7 +18,7 @@
               </el-form-item>
               <!-- 目的 -->
               <el-form-item :label="$t('page.business.resource.mjy.md') + '：'">
-                <el-input v-model="queryParams.mdId" clearable
+                <el-input v-model="queryParams.mdMc" clearable
                   :placeholder="$t('form.placeholderInput')" />
               </el-form-item>
               <!-- 记录状态 -->
@@ -227,7 +227,7 @@ export default {
         pageNum: 1,
         pageSize: 10,
         mc: null,
-        mdId: null,
+        mdMc: null,
         jlzt: null,
         jyzt: null,
         bh: null,
@@ -458,7 +458,7 @@ export default {
     //重置
     resetQuery() {
       this.queryParams.mc = null
-      this.queryParams.mdId = null
+      this.queryParams.mdMc = null
       this.queryParams.jlzt = null
       this.queryParams.jyzt = null
       this.queryParams.bh = null