From ee0757659bd736da10eb796d607ce2d2e3d5d040 Mon Sep 17 00:00:00 2001
From: ZhangXianQiang <1135831638@qq.com>
Date: 星期三, 13 三月 2024 14:31:10 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/zgyw-ui

---
 src/views/system/contract/index.vue    |    4 --
 src/views/system/unit/people/index.vue |    2 
 src/views/system/region/index.vue      |    6 ---
 src/views/system/work-order/index.vue  |  107 ++++++++++++++++++++++++++++++++++++++++++-----------
 4 files changed, 86 insertions(+), 33 deletions(-)

diff --git a/src/views/system/contract/index.vue b/src/views/system/contract/index.vue
index 8ef0c84..94fed44 100644
--- a/src/views/system/contract/index.vue
+++ b/src/views/system/contract/index.vue
@@ -31,7 +31,6 @@
           icon="el-icon-plus"
           size="mini"
           @click="handleAdd"
-          v-hasPermi="['system:contract:add']"
         >鏂板</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -42,7 +41,6 @@
           size="mini"
           :disabled="single"
           @click="handleUpdate"
-          v-hasPermi="['system:contract:edit']"
         >淇敼</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -53,7 +51,6 @@
           size="mini"
           :disabled="multiple"
           @click="handleDelete"
-          v-hasPermi="['system:contract:remove']"
         >鍒犻櫎</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -63,7 +60,6 @@
           icon="el-icon-download"
           size="mini"
           @click="handleExport"
-          v-hasPermi="['system:contract:export']"
         >瀵煎嚭</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
diff --git a/src/views/system/region/index.vue b/src/views/system/region/index.vue
index 6df087a..76c643d 100644
--- a/src/views/system/region/index.vue
+++ b/src/views/system/region/index.vue
@@ -45,7 +45,6 @@
           icon="el-icon-plus"
           size="mini"
           @click="handleAdd"
-          v-hasPermi="['system:region:add']"
         >鏂板</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -56,7 +55,6 @@
           size="mini"
           :disabled="single"
           @click="handleUpdate"
-          v-hasPermi="['system:region:edit']"
         >淇敼</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -67,7 +65,6 @@
           size="mini"
           :disabled="multiple"
           @click="handleDelete"
-          v-hasPermi="['system:region:remove']"
         >鍒犻櫎</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -77,7 +74,6 @@
           icon="el-icon-download"
           size="mini"
           @click="handleExport"
-          v-hasPermi="['system:region:export']"
         >瀵煎嚭</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
@@ -107,14 +103,12 @@
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
-            v-hasPermi="['system:region:edit']"
           >淇敼</el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
-            v-hasPermi="['system:region:remove']"
           >鍒犻櫎</el-button>
         </template>
       </el-table-column>
diff --git a/src/views/system/unit/people/index.vue b/src/views/system/unit/people/index.vue
index 9c42a78..31a2fa1 100644
--- a/src/views/system/unit/people/index.vue
+++ b/src/views/system/unit/people/index.vue
@@ -82,7 +82,7 @@
       <el-table-column label="杩愮淮浜哄憳缂栧彿" align="center" prop="ywPersonCode" />
       <el-table-column label="杩愮淮浜哄憳濮撳悕" align="center" prop="ywPersonName" />
       <el-table-column label="杩愮淮浜哄憳璐﹀彿" align="center" prop="ywPersonAccount" />
-      <el-table-column label="鎵�灞炶繍缁村崟浣�" align="center" prop="belongUnit" />
+      <el-table-column label="鎵�灞炶繍缁村崟浣�" align="center" prop="belongUnitName" />
       <el-table-column label="鑱旂郴鐢佃瘽" align="center" prop="phone" />
       <el-table-column label="鎿嶄綔" fixed="right" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
diff --git a/src/views/system/work-order/index.vue b/src/views/system/work-order/index.vue
index 3153353..e1ef50b 100644
--- a/src/views/system/work-order/index.vue
+++ b/src/views/system/work-order/index.vue
@@ -82,10 +82,11 @@
       <el-table-column label="杩愮淮鍗曚綅" align="center" prop="unitName" width="150"/>
       <el-table-column label="杩愮淮浜哄憳" align="center" prop="ywPeopleName" />
       <el-table-column label="杩愮淮澶勭悊鏃堕棿" align="center" prop="ywHandleTime" width="180"/>
+      <el-table-column label="澶勭悊缁撴潫鏃堕棿" align="center" prop="ywHandleTime" width="180"/>
       <el-table-column label="杩愮淮缁撴灉" align="center" prop="ywResult" />
       <el-table-column label="杩愮淮鎯呭喌" align="center" prop="ywCondition" width="150"/>
-      <el-table-column label="杩愮淮妫�娴嬬粨鏋�" align="center" prop="ywCheckResult" width="230"/>
-
+      <el-table-column label="杩愮淮妫�娴嬬粨鏋�" align="center" prop="ywCheckResult" width="200"/>
+      <el-table-column label="瀹℃牳閫氳繃鏃堕棿" align="center" prop="ywHandleTime" width="200"/>
       <el-table-column label="鍒涘缓鏃堕棿" align="center" prop="createTime" width="180"/>
 
       <el-table-column label="鎿嶄綔" fixed="right" width="150"  align="center" class-name="small-padding fixed-width">
@@ -280,9 +281,9 @@
 
 
     <!-- 杩囩▼鍥� -->
-    <el-dialog title="杩囩▼鍥�" :visible.sync="flowOpen" width="900px" append-to-body>
+    <el-dialog title="杩囩▼鍥�" :visible.sync="flowOpen" width="1200px" :close-on-click-modal="false" append-to-body>
       <div>
-        <el-steps :active="1">
+        <el-steps :active="2" :space="500">
           <el-step title="浜х敓宸ュ崟">
             <template slot="description">
               <div>
@@ -296,6 +297,9 @@
                   杩愮淮鍗曚綅锛歿{flowForm.unitName}}
                 </div>
                 <div class="flow-item-x">
+                  鍒涘缓鏃堕棿锛歿{flowForm.createTime}}
+                </div>
+                <div class="flow-item-x">
                   澶勭悊鏈熼檺锛�<el-tag type="danger" size="small">12灏忔椂</el-tag>
                 </div>
               </div>
@@ -303,21 +307,8 @@
           </el-step>
           <el-step title="杩愮淮澶勭悊">
             <template slot="description">
-              <div style="margin-bottom: 8px;padding: 0 3px; background-color: #d9d9d9;display: flex;flex-direction: row;align-items: center">
-                <div style="flex: 2">
-                  <div class="flow-item-x">
-                    杩愮淮鐘舵�侊細<el-tag type="danger" size="small">澶勭悊涓�</el-tag>
-                  </div>
-                  <div class="flow-item-x">
-                    杩愮淮浜哄憳锛�<el-tag type="danger" size="small">{{flowForm.ywPeopleName}}</el-tag>
-                  </div>
-                </div>
-                <div style="flex: 1">
-                  {{flowForm.ywHandleTime}}
-                </div>
-              </div>
-              <div style="margin-bottom: 8px;padding: 0 3px;background-color: #d9d9d9;display: flex;flex-direction: row;align-items: center">
-                <div style="flex: 2">
+              <div class="y-item">
+                <div class="y-item-1">
                   <div class="flow-item-x">
                     杩愮淮鐘舵�侊細<el-tag type="danger" size="small">缁撴灉涓婃姤</el-tag>
                   </div>
@@ -325,8 +316,31 @@
                     杩愮淮浜哄憳锛�<el-tag type="danger" size="small">{{flowForm.ywPeopleName}}</el-tag>
                   </div>
                 </div>
-                <div style="flex: 1">
-                  {{flowForm.ywHandleTime}}
+                <div class="y-item-2">
+                  <div >
+                    {{flowForm.ywHandleTime}}
+                  </div>
+                  <div >
+                    绗嚑娆★細1
+                  </div>
+                </div>
+              </div>
+              <div class="y-item">
+                <div class="y-item-1">
+                  <div class="flow-item-x">
+                    杩愮淮鐘舵�侊細<el-tag type="danger" size="small">缁撴灉涓婃姤</el-tag>
+                  </div>
+                  <div class="flow-item-x">
+                    杩愮淮浜哄憳锛�<el-tag type="danger" size="small">{{flowForm.ywPeopleName}}</el-tag>
+                  </div>
+                </div>
+                <div class="y-item-2">
+                  <div >
+                    {{flowForm.ywHandleTime}}
+                  </div>
+                  <div >
+                    绗嚑娆★細2
+                  </div>
                 </div>
               </div>
 
@@ -334,7 +348,42 @@
           </el-step>
           <el-step title="缁撴灉瀹℃牳">
             <template slot="description">
-              鏆傛椂涓嶈兘瀹℃牳
+              <div class="y-item">
+                <div class="y-item-1">
+                  <div class="flow-item-x">
+                    瀹℃牳缁撴灉锛�<el-tag type="danger" size="small">椹冲洖</el-tag>
+                  </div>
+                  <div class="flow-item-x">
+                    瀹℃牳璇存槑锛�<el-tag type="danger" size="small">鏈垚鍔熷鐞�</el-tag>
+                  </div>
+                </div>
+                <div class="y-item-2">
+                  <div >
+                    {{flowForm.ywHandleTime}}
+                  </div>
+                  <div >
+                    绗嚑娆★細1
+                  </div>
+                </div>
+              </div>
+              <div class="y-item">
+                <div class="y-item-1">
+                  <div class="flow-item-x">
+                    瀹℃牳鐘舵�侊細<el-tag type="info" size="small">瀹℃牳涓�</el-tag>
+                  </div>
+                  <div class="flow-item-x">
+                    瀹℃牳璇存槑锛�
+                  </div>
+                </div>
+                <div class="y-item-2">
+                  <div >
+                    {{flowForm.ywHandleTime}}
+                  </div>
+                  <div >
+                    绗嚑娆★細2
+                  </div>
+                </div>
+              </div>
             </template>
           </el-step>
         </el-steps>
@@ -347,6 +396,20 @@
 .flow-item-x {
   margin: 5px 0;
 }
+.y-item {
+  margin-bottom: 8px;
+  padding: 0 3px;
+  background-color: #d9d9d9;
+  display: flex;
+  flex-direction: row;
+  align-items: center
+}
+.y-item-2 {
+  flex: 1;
+}
+.y-item-1 {
+  flex: 2;
+}
 </style>
 <script>
 import { listWorkOrder, getWorkOrder, delWorkOrder, addWorkOrder, updateWorkOrder,auditing, ywCondition } from "@/api/platform/work-order";

--
Gitblit v1.8.0