Merge branch 'master' of http://62.234.61.92:3000/wjm/mec-cloud_IntelligentManufacturing_CRM

zkqy-ui/src/views/bussiness/processMange.vue

@@ -1,12 +1,12 @@
 <template>
   <div class="process-mange-wrap">
     <!-- <el-card shadow="always" :body-style="{ padding: '20px' }"> -->
-    <el-row>
-      <el-col :xs="24" :md="8" :xl="8" class="col" v-show="false">
+    <el-row v-show="false">
+      <el-col :xs="24" :md="8" :xl="8" class="col">
         <div class="statistic-wrap">
           <div class="discription">
             <span class="title">我的处理</span>
-            <span class="sub-title">需要我处理的管道</span>
+            <span class="sub-title">需要我处理的流程</span>
           </div>
           <span class="data">{{ tableData.length }}</span>
         </div>
@@ -14,8 +14,8 @@
       <el-col :xs="24" :md="8" :xl="8" class="col">
         <div class="statistic-wrap">
           <div class="discription">
-            <span class="title">其它处理</span>
-            <span class="sub-title">需要其他人处理的管道</span>
+            <span class="title">已完成</span>
+            <span class="sub-title">已完成的</span>
           </div>
           <span class="data">0</span>
         </div>
@@ -36,7 +36,7 @@
         <h3 class="header">管道列表</h3>
         <div class="search-list">
           <div class="search-tab">
-            <el-radio-group v-model="taskType">
+            <el-radio-group v-model="taskType" v-show="false">
               <el-radio-button :label="1">我的处理</el-radio-button>
               <el-radio-button :label="2">其他处理</el-radio-button>
             </el-radio-group>
@@ -51,7 +51,11 @@
             </el-radio-group>
           </div>
           <div class="search-input">
-            <el-input placeholder="请输入..." v-model="queryString">
+            <el-input
+              placeholder="请输入..."
+              v-model="queryString"
+              @keyup.enter.native="getList"
+            >
               <el-button
                 slot="append"
                 icon="el-icon-search"
@@ -359,15 +363,17 @@ export default {
   methods: {
     // 获取列表数据
     getList() {
-      processList(this.queryParams).then((res) => {
-        if (res.code == 200) {
-          this.tableData = res.rows.map((item) => item.resultMap);
-          this.total = res.total;
-          console.log(this.tableData);
-        } else {
-          this.$message.error("网络异常,请稍后再试");
+      processList({ ...this.queryParams, taskName: this.queryString }).then(
+        (res) => {
+          if (res.code == 200) {
+            this.tableData = res.rows.map((item) => item.resultMap);
+            this.total = res.total;
+            console.log(this.tableData);
+          } else {
+            this.$message.error("网络异常,请稍后再试");
+          }
         }
-      });
+      );
     },
     // 获取表单数据
     async getFormData() {

zkqy-ui/src/views/bussiness/progressShow.vue

@@ -32,7 +32,11 @@
             </el-radio-group>
           </div>
           <div class="search-input">
-            <el-input placeholder="请输入..." v-model="queryString">
+            <el-input
+              placeholder="请输入..."
+              v-model="queryString"
+              @keyup.enter.native="getList"
+            >
               <el-button
                 slot="append"
                 @click="getList"
@@ -87,27 +91,29 @@ export default {
   methods: {
     // 获取列表数据
     getList() {
-      getListLog(this.queryParams).then((res) => {
-        if (res.code == 200) {
-          this.tableData = this.getTableData(
-            res.rows.map((item) => item.resultMap)
-          );
-          console.log(this.tableData);
-          this.total = res.total;
-        } else {
-          this.$message.error("网络异常,请稍后再试");
-        }
+      getListLog({ ...this.queryParams, taskName: this.queryString }).then(
+        (res) => {
+          if (res.code == 200) {
+            this.tableData = this.getTableData(
+              res.rows.map((item) => item.resultMap)
+            );
+            console.log(this.tableData);
+            this.total = res.total;
+          } else {
+            this.$message.error("网络异常,请稍后再试");
+          }
 
-        return;
-        if (res.code == 200) {
-          this.tableData = this.getTableData(
-            res.rows.map((item) => item.resultMap)
-          );
-          this.total = res.total;
-        } else {
-          this.$message.error("网络异常,请稍后再试");
+          return;
+          if (res.code == 200) {
+            this.tableData = this.getTableData(
+              res.rows.map((item) => item.resultMap)
+            );
+            this.total = res.total;
+          } else {
+            this.$message.error("网络异常,请稍后再试");
+          }
         }
-      });
+      );
     },
     // 获取表格展示数据
     getTableData(dataList) {

zkqy-ui/src/views/system/tenant/dict/index.vue

@@ -78,7 +78,7 @@
           >新增</el-button
         >
       </el-col>
-      <el-col :span="1.5">
+      <el-col :span="1.5" v-show="false">
         <el-button
           type="success"
           plain