Merge remote-tracking branch 'origin/master'

src/api/udi/udiTrace.js

@@ -7,7 +7,7 @@ export function getTraceOrderList(query) {
     params: query
   })
 }
-
+//查询记录
 export function getTraceRecordList(query) {
   return axios({
     url: '/udi/trace/record/filter',

src/views/udi/trace/history/index.vue

@@ -1,9 +1,9 @@
 <template>
   <div>
     <el-card>
-      <el-form label-width="70px">
+      <el-form label-width="70px" >
           <el-row type="flex">
-            <el-col type="flex" :span="5">
+            <el-col type="flex" :span="8">
               <el-form-item label="记录号:" class="query-form-item">
                 <el-input v-model="filterQuery.recordCode"
                           style="width: 200px;"
@@ -11,7 +11,7 @@
                 ></el-input>
               </el-form-item>
             </el-col>
-            <el-col type="flex" :span="5" >
+            <el-col type="flex" :span="8" >
               <el-form-item label="产品名称:" class="query-form-item">
                 <el-input v-model="filterQuery.cpmctymc"
                           style="width: 200px;"
@@ -19,7 +19,7 @@
                 ></el-input>
               </el-form-item>
             </el-col>
-            <el-col type="flex" :span="5">
+            <el-col type="flex" :span="8">
               <el-form-item label="规格型号:" class="query-form-item">
                 <el-input v-model="filterQuery.ggxh"
                           style="width: 200px;"
@@ -27,7 +27,7 @@
                 ></el-input>
               </el-form-item>
             </el-col>
-            <el-col type="flex" :span="5">
+            <el-col type="flex" :span="8"  v-show='false'>
               <el-form-item label="批次号:" class="query-form-item">
                 <el-input v-model="filterQuery.batchNo"
                           style="width: 200px;"
@@ -35,7 +35,7 @@
                 ></el-input>
               </el-form-item>
             </el-col>
-            <el-col type="flex" :span="5">
+            <el-col type="flex" :span="8" v-show='false'>
               <el-form-item class="query-form-item">
                 <el-button-group style="display:flex;">
                   <el-button type="primary" icon="el-icon-search" @click="onSubmit">查询</el-button>
@@ -43,8 +43,28 @@
                 </el-button-group>
               </el-form-item>
             </el-col>
+          </el-row>
+        <el-row>
+          <el-col type="flex" :span="8">
+            <el-form-item label="批次号:" class="query-form-item">
+              <el-input v-model="filterQuery.batchNo"
+                        style="width: 200px;"
+                        placeholder="请输入批次号"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+
+
         </el-row>
       </el-form>
+      <div class="top-right-btn" style="display:flex;">
+        <el-button-group>
+          <el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏
+          </el-button>
+          <el-button type="primary" icon="el-icon-refresh" @click="onReset">重置</el-button>
+          <el-button type="primary" icon="el-icon-search" @click="onSubmit">查询</el-button>
+        </el-button-group>
+      </div>
       <el-divider style="margin: 15px"></el-divider>
 
       <el-table v-loading="loading" :data="list"
@@ -59,9 +79,9 @@
         <el-table-column label="注册/备案号" prop="zczbhhzbapzbh" width="180"></el-table-column>
         <el-table-column label="批次号" prop="batchNo" width="180"></el-table-column>
         <el-table-column label="查询人" prop="createUser" width="180"></el-table-column>
-        <el-table-column label="发货单位" prop="fromCorp" width="180"></el-table-column>
+<!--        <el-table-column label="发货单位" prop="fromCorp" width="180"></el-table-column>-->
-        <el-table-column label="收货单位" prop="toCorp" width="180"></el-table-column>
+<!--        <el-table-column label="收货单位" prop="toCorp" width="180"></el-table-column>-->
-        <el-table-column label="所属企业" prop="companyName" width="180"></el-table-column>
+<!--        <el-table-column label="所属企业" prop="companyName" width="180"></el-table-column>-->
         <el-table-column label="查询方式" prop="traceType" width="120"></el-table-column>
         <el-table-column label="备注" prop="remark" width="220"></el-table-column>
         <el-table-column label="操作" width="100" fixed="right">

src/views/udi/trace/search/index.vue

@@ -150,9 +150,10 @@
         <el-table-column label="单据号" prop="billNo" width="180"></el-table-column>
         <el-table-column label="单据日期" prop="billDate" width="150"></el-table-column>
         <el-table-column label="单据类型" prop="billType" width="150"></el-table-column>
+
         <el-table-column label="发货单位" prop="fromCorp" width="220"></el-table-column>
         <el-table-column label="收货单位" prop="toCorp" width="220"></el-table-column>
-        <el-table-column label="所属企业" prop="companyName" width="220"></el-table-column>
+        <el-table-column label="所属企业" prop="companyIdFk" width="220" :formatter="formatCompanyName"></el-table-column>
         <el-table-column label="上传人" prop="uploadUser" width="220"></el-table-column>
         <el-table-column label="备注" prop="remark" width="220"></el-table-column>
 
@@ -343,7 +344,7 @@
 
 <script>
 
-import {filterCpmctymc, filterGgxh, filterNameCode, sourceSearch} from "@/api/udi/udiTrace";
+import {filterCpmctymc, filterGgxh, filterNameCode, sourceSearch,filterCompanyName} from "@/api/udi/udiTrace";
 import {filterCompany} from "@/api/basic/udiInfo";
 
 export default {
@@ -369,11 +370,31 @@ export default {
       fromOptions: [],
       cpmctymcList: [],
       ggxhList: [],
-      nameCodeList: []
+      nameCodeList: [],
+      companyNameList: []
     }
   },
   methods: {
+    formatCompanyName(row){
+      let temp =  this.companyNameList.find(item=>{
+        return item.id == row.companyIdFk
+      })
+
+      return temp && temp.companyName
+    },
+    getCompanyName(){
+      let cQuery = {
+        page: 1,
+        limit: 10,
+      };
+      filterCompanyName(cQuery).then((res) => {
+        this.companyNameList = res.data.list || [];
+        console.log(this.companyNameList)
+      })
+    },
     ggxhChange() {
+      this.filterQuery.nameCode = null
+      this.filterQuery.batchNo = null
       this.getNameCodeList()
     },
     getNameCodeList(query) {
@@ -391,6 +412,9 @@ export default {
       })
     },
     cpmctymcChange() {
+      this.filterQuery.ggxh = null
+      this.filterQuery.nameCode = null
+      this.filterQuery.batchNo = null
       this.getGgxhList()
     },
     getGgxhList(query) {
@@ -407,6 +431,10 @@ export default {
       })
     },
     ylqxzcrbarmcChange() {
+      this.filterQuery.cpmctymc = null
+      this.filterQuery.ggxh = null
+      this.filterQuery.nameCode = null
+      this.filterQuery.batchNo = null
       this.getCpmctymcList()
     },
     getCpmctymcList(query) {
@@ -464,7 +492,7 @@ export default {
         page: 1,
         limit: 10,
       };
-      //this.list = null
+      this.list = null
       //this.total = 0
     },
     onSubmit() {
@@ -493,6 +521,7 @@ export default {
     },
   },
   created() {
+    this.getCompanyName()
   }
 }
 </script>

src/views/udi/trace/searchLive/index.vue

@@ -175,7 +175,7 @@
         <el-table-column label="单据类型" prop="billType" width="150"></el-table-column>
         <el-table-column label="发货单位" prop="fromCorp" width="220"></el-table-column>
         <el-table-column label="收货单位" prop="toCorp" width="220"></el-table-column>
-        <el-table-column label="所属企业" prop="companyName" width="220"></el-table-column>
+        <el-table-column label="所属企业" prop="companyIdFk" width="220" :formatter="formatCompanyName"></el-table-column>
         <el-table-column label="上传人" prop="uploadUser" width="220"></el-table-column>
         <el-table-column label="备注" prop="remark" width="220"></el-table-column>
 
@@ -397,6 +397,13 @@ export default {
     }
   },
   methods: {
+    formatCompanyName(row){
+      let temp =  this.companyNameList.find(item=>{
+        return item.id == row.companyIdFk
+      })
+
+      return temp && temp.companyName
+    },
     geCompanyNameList(query) {
       let cQuery = {
         companyName: query,
@@ -414,6 +421,8 @@ export default {
         });
     },
     ggxhChange() {
+      this.filterQuery.nameCode = null
+      this.filterQuery.batchNo = null
       this.getNameCodeList()
     },
     getNameCodeList(query) {
@@ -431,6 +440,9 @@ export default {
       })
     },
     cpmctymcChange() {
+      this.filterQuery.ggxh = null
+      this.filterQuery.nameCode = null
+      this.filterQuery.batchNo = null
       this.getGgxhList()
     },
     getGgxhList(query) {
@@ -447,6 +459,10 @@ export default {
       })
     },
     ylqxzcrbarmcChange() {
+      this.filterQuery.cpmctymc = null
+      this.filterQuery.ggxh = null
+      this.filterQuery.nameCode = null
+      this.filterQuery.batchNo = null
       this.getCpmctymcList()
     },
     getCpmctymcList(query) {
@@ -504,7 +520,7 @@ export default {
         page: 1,
         limit: 10,
       };
-      //this.list = null
+      this.list = null
       //this.total = 0
     },
     onSubmit() {
@@ -533,6 +549,7 @@ export default {
     },
   },
   created() {
+    this.geCompanyNameList()
   }
 }
 </script>

src/views/udi/trace/task/index.vue

@@ -179,7 +179,109 @@
         @pagination="getTaskList"
       ></pagination>
     </el-card>
+    <el-dialog
+      title="任务列表-详情"
+      :visible.sync="open"
+      class="dialog-two"
+      width="60%"
+      top="5vh"
+    >
+      <el-form :model="formView" :rules="formRules" ref="dataForm" label-width="100px">
+        <el-row type="flex">
+          <el-col :span="11" type="flex">
+            <el-form-item label="任务类型" prop="taskType">
+              <el-input v-model="taskTypeText" size="small" style="width: 90%" :disabled="true"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="11" class="el-col">
+            <el-form-item label="任务状态" prop="status">
+              <el-input v-model="statusText" size="small" style="width: 90%" :disabled="true"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row type="flex">
+          <el-col :span="11" type="flex">
+            <el-form-item label="医疗器械注册人" prop="ylqxzcrbarmc">
+              <el-input v-model="formView.ylqxzcrbarmc" size="small" style="width: 90%" :disabled="true"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="11" class="el-col">
+            <el-form-item label="医疗器械注册人统一社会信用号" prop="creditNum">
+              <el-input v-model="formView.creditNum" size="small"
+                        style="width: 90%" :disabled="true"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row type="flex">
+          <el-col :span="11" type="flex">
+            <el-form-item label="产品名称" prop="cpmctymc">
+              <el-input v-model="formView.cpmctymc" size="small" style="width: 90%" :disabled="true"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="11" class="el-col">
+            <el-form-item label="规格型号" prop="ggxh">
+              <el-input v-model="formView.ggxh" size="small"
+                        style="width: 90%" :disabled="true"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row type="flex">
+          <el-col :span="11" type="flex">
+            <el-form-item label="批次号" prop="batchNo">
+              <el-input v-model="formView.batchNo" size="small" style="width: 90%" :disabled="true"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="11" class="el-col">
+            <el-form-item label="序列号" prop="companyName">
+              <el-input v-model="formView.companyName" size="small"
+                        style="width: 90%" :disabled="true"
+              ></el-input>
+            </el-form-item>
+          </el-col>
 
+        </el-row>
+        <el-row type="flex">
+          <el-col :span="11" class="el-col">
+            <el-form-item label="生产日期" prop="produceDate">
+              <el-input v-model="formView.produceDate" size="small"
+                        style="width: 90%" :disabled="true"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="11" type="flex">
+            <el-form-item label="失效日期" prop="expireDate">
+              <el-input v-model="formView.expireDate" size="small" style="width: 90%" :disabled="true"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row type="flex">
+          <el-col :span="11" type="flex">
+            <el-form-item label="创建时间" prop="createTime">
+              <el-input v-model="formView.createTime" size="small" style="width: 90%" :disabled="true"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="11" class="el-col">
+            <el-form-item label="更新时间" prop="updateTime">
+              <el-input v-model="formView.updateTime" size="small"
+                        style="width: 90%" :disabled="true"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click.native="open = false" size="small">关闭</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
@@ -211,9 +313,22 @@ export default {
       manuCodeRelLoading: false,
       taskList: [],
       listCodeRel: [],
-      openManuOrder: false,
+      open: false,
       openManuCodeRel: false,
-      formView: {},
+      formView: {
+        taskType:null,
+        status: null,
+      },
+      taskTypes: [
+        { value: 1, label: '关联关系' },
+        { value: 2, label: '入库' },
+        { value: 3, label: '出库' },
+      ],
+      taskStatus: [
+        { value: 1, label: '未处理' },
+        { value: 2, label: '正在处理' },
+        { value: 3, label: '已处理' },
+      ],
       formViewCodeRel: {},
       showSearch: true,
       actDateRange: [],
@@ -252,6 +367,16 @@ export default {
 
     }
   },
+  computed: {
+    taskTypeText() {
+      const taskType = this.taskTypes.find(item => item.value === this.formView.taskType);
+      return taskType ? taskType.label : '';
+    },
+    statusText() {
+      const status = this.taskStatus.find(item => item.value === this.formView.status);
+      return status ? status.label : '';
+    },
+  },
   methods: {
     //隐藏搜索
     hideSearch() {
@@ -313,13 +438,13 @@ export default {
     // },
     //详情
     handleView(row){
-      this.taskOrder.forEach(obj => {
+      this.taskList.forEach(obj => {
         if (row.id == obj.id) {
           this.formView = obj
         }
       })
       console.log(this.formView)
-      this.openManuOrder = true
+      this.open = true
     },
     handleViewCoderel(row){
       this.listCodeRel.forEach(obj => {