Merge remote-tracking branch 'origin/master'

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

@@ -286,7 +286,7 @@
                     @row-click="handleSelectionChange"
                     highlight-current-row border>
             <el-table-column label="序号" type="index"></el-table-column>
-            <el-table-column label="记录号" prop="recordCode" width="180"show-overflow-tooltip></el-table-column>
+<!--            <el-table-column label="记录号" prop="recordCode" width="180"show-overflow-tooltip></el-table-column>-->
             <el-table-column label="生产订单号" prop="billNo" width="220"show-overflow-tooltip></el-table-column>
             <el-table-column label="订单日期" prop="billDate" width="180"show-overflow-tooltip></el-table-column>
             <el-table-column label="DI标识" prop="nameCode" width="180"show-overflow-tooltip></el-table-column>
@@ -313,7 +313,7 @@
                         highlight-current-row border>
                 <el-table-column label="序号" type="index"></el-table-column>
                 <el-table-column label="UDI码" prop="code" width="180"show-overflow-tooltip></el-table-column>
-                <el-table-column label="父码" prop="pcode" width="180"show-overflow-tooltip></el-table-column>
+<!--                <el-table-column label="父码" prop="pcode" width="180"show-overflow-tooltip></el-table-column>-->
                 <el-table-column label="产品通用名称" prop="cpmctymc" width="160"show-overflow-tooltip></el-table-column>
                 <el-table-column label="DI标识" prop="nameCode" width="160"show-overflow-tooltip></el-table-column>
                 <el-table-column label="规格型号" prop="ggxh" width="180"show-overflow-tooltip></el-table-column>
@@ -746,7 +746,7 @@
         </el-row>
         <el-row type="flex">
           <el-col :span="11" type="flex">
-            <el-form-item label="单据源头类型" prop="sourceType"show-overflow-tooltip>
+            <el-form-item label="查询方式" prop="sourceType"show-overflow-tooltip>
               <el-input v-model="this.formateSourceType" size="small" style="width: 90%" :disabled="true"
               ></el-input>
             </el-form-item>
@@ -839,7 +839,7 @@
 
 <script>
 
-import {getTraceRecordList,getTraceOrder,getManuOrder,getManuCodeRelList} from "@/api/udi/udiTrace";
+import {getTraceRecordList,getTraceOrder,getManuOrder,getManuCodeRelList,getRecordResult} from "@/api/udi/udiTrace";
 
 
 export default {
@@ -977,10 +977,12 @@ export default {
         this.codeRelTotal = 0;
       })
     },
+
     recordhandleSelectionChange(val){
       this.currentRow = val;
-      this.getTraceOrder();
+      //this.getTraceOrder();
-      this.getManuOrder();
+      //this.getManuOrder();
+      this.getRecordResult();
     },
     getTraceOrder() {
       if (this.currentRow.id == null) {
@@ -1032,6 +1034,33 @@ export default {
         this.manuOrderTotal = 0;
       })
     },
+    getRecordResult() {
+      if (this.currentRow.id == null) {
+        this.$message.error("请先选择需要查询的单据！")
+        return;
+      }
+      this.orderLoading = true;
+      this.traceOrderQuery.recordCode = this.currentRow.recordCode;
+      getRecordResult(this.traceOrderQuery).then((res) => {
+        this.orderLoading = false;
+        if (res.code === 20000) {
+          this.traceOrderList = res.data.traceOrderEntities || [];
+          this.manuOrderList = res.data.traceManuOrderEntities || [];
+          //this.traceOrderTotal = res.data.total || 0;
+          console.log(this.traceOrderList)
+          console.log(this.manuOrderList)
+        } else {
+          this.$message.error(res.message);
+          this.traceOrderList = [];
+          this.traceOrderTotal = 0;
+        }
+      }).catch((error) => {
+        this.orderLoading = false;
+        this.$message.error(error.message);
+        this.traceOrderList = [];
+        this.traceOrderTotal = 0;
+      })
+    },
     //隐藏搜索
     hideSearch() {
       this.showSearch = !this.showSearch;

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

@@ -630,7 +630,7 @@
         </el-row>
         <el-row type="flex">
           <el-col :span="11" type="flex">
-            <el-form-item label="单据源头类型" prop="sourceType"show-overflow-tooltip>
+            <el-form-item label="查询方式" prop="sourceType"show-overflow-tooltip>
               <el-input v-model="this.formateSourceType" size="small" style="width: 90%" :disabled="true"
               ></el-input>
             </el-form-item>

src/views/userManage/registerManage.vue

@@ -17,8 +17,8 @@
             <el-form-item label="审核状态" class="query-form-item">
               <el-select v-model="filterQuery.checkStatus" style="width: 90%" placeholder="请选择审核状态" clearable>
                 <el-option label="未审核" value="3"></el-option>
-                <el-option label="已审核" value="1"></el-option>
+                <el-option label="已通过" value="1"></el-option>
-                <el-option label="未通过" value="2"></el-option>
+                <el-option label="已拒绝" value="2"></el-option>
               </el-select>
             </el-form-item>
           </el-col>
@@ -68,9 +68,13 @@
           width="230"
         ></el-table-column>
         <el-table-column label="审核状态" prop="checkType" width="80">
-          <template slot-scope="scope">
+          <template slot-scope="scope" >
-            <span>{{ checkFlag[scope.row.checkStatus] }}</span>
+<!--            <span>{{ checkFlag[scope.row.checkStatus] }}</span>-->
+            <el-tag :type="(scope.row.checkStatus) | statusFilterType">
+              {{ checkFlag[scope.row.checkStatus] }}
+            </el-tag>
           </template>
+
         </el-table-column>
         <el-table-column label="企业类型" prop="bussinessStatus">
           <template slot-scope="scope">
@@ -116,14 +120,28 @@
 
         <el-table-column label="操作" width="60px" fixed="right">
           <template slot-scope="scope">
+<!--            <el-button-->
+<!--              type="text"-->
+<!--              size="small"-->
+<!--              :disabled="scope.row.checkType == 1"-->
+<!--              @click.native.stop="checkDialog(scope.row)"-->
+<!--            >审核-->
+<!--            </el-button>-->
             <el-button
               type="text"
               size="small"
-              :disabled="scope.row.checkType == 1"
+              v-if="scope.row.checkStatus == 0 || scope.row.checkStatus == 3"
               @click.native.stop="checkDialog(scope.row)"
             >审核
-            </el-button
+            </el-button>
-            >
+
+            <el-button
+              type="text"
+              size="small"
+              v-if="scope.row.checkStatus == 1 || scope.row.checkStatus == 2"
+              @click.native.stop="checkDialog(scope.row)"
+            >详情
+            </el-button>
 
             <!-- <el-button
               type="text"
@@ -265,7 +283,8 @@
       </el-dialog>
 
       <el-dialog
-        title="新企业审核"
+
+        :title="formMap[formName]"
         :visible.sync="centerDialogVisible"
         :close-on-click-modal="false"
         :close-on-press-escape="false"
@@ -523,6 +542,13 @@ import draggable from "vuedraggable";
 export default {
   data() {
     return {
+      formName: 1,
+      formMap: {
+        1: "注册企业详情",
+        2: "注册企业审核",
+      },
+      editType: 0,
+      editProductType: 0,
       certTotal: 0,
       details:false,
       imgList:[],
@@ -800,6 +826,11 @@ export default {
         });
     },
     checkDialog(row) {
+      if (row.checkStatus == 1) {
+        this.formName = 1;
+      } else {
+        this.formName = 2;
+      }
       this.check=row.checkStatus;
       this.rId=row.id;
       this.rowData=row;
@@ -865,7 +896,7 @@ export default {
               type: "success",
               message: "审核成功！",
             });
-            this.centerDialogVisible = false;
+            this.Refresh();
           }
         })
       }).catch(() => {