流程提交

.env.development

@@ -10,7 +10,7 @@ VITE_APP_BASE_API = '/dev-api'
 # 上传文件接口地址.
 VITE_APP_UPLOAD_URL = 'http://139.155.176.112:19000'
 # 测试开发接口地址
-VITE_APP_API_URL = 'http://192.168.1.69:7104'
+VITE_APP_API_URL = 'http://127.0.0.1:7104'
 
 #VITE_APP_API_URL = 'http://127.0.0.1:7104'
 

docker/Dockerfile

@@ -5,16 +5,21 @@ VOLUME /tmp
 ENV LANG en_US.UTF-8
 RUN echo "server {  \
                       listen       80; \
+                      gzip          on; \
+                      gzip_static on; \
+                      gzip_types text/plain text/css application/json application/javascript;\
+                      gzip_min_length 1024;\
+                      gzip_vary on;\
                       client_max_body_size 100m;\
                       location   /mes-server/ { \
-                      proxy_pass              http://139.155.176.112:7100/; \
+                      proxy_pass              http://192.168.1.4:8190/; \
                       proxy_redirect          off; \
                       proxy_set_header        Host mes-server; \
                       proxy_set_header        X-Real-IP \$remote_addr; \
                       proxy_set_header        X-Forwarded-For \$proxy_add_x_forwarded_for; \
                   } \
                   location  /jgfile/ { \
-                              proxy_pass          http://139.155.176.112:19000/jgfile/; \
+                              proxy_pass          http://192.168.1.4:9000/jgfile/; \
                               proxy_redirect      off; \
                               proxy_set_header    Host jgfile; \
                               proxy_set_header    X-Real-IP \$remote_addr; \

pnpm-lock.yaml

@@ -7784,7 +7784,7 @@ snapshots:
       - '@vue/composition-api'
       - vue
 
-  '@wangeditor/basic-modules@1.1.7(@wangeditor/core@1.1.19(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.isequal@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@3.3.8)(slate@0.72.8)(snabbdom@3.6.2))(dom7@3.0.0)(lodash.throttle@4.1.1)(nanoid@5.0.7)(slate@0.72.8)(snabbdom@3.6.2)':
+  '@wangeditor/basic-modules@1.1.7(@wangeditor/core@1.1.19(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.isequal@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@5.0.7)(slate@0.72.8)(snabbdom@3.6.2))(dom7@3.0.0)(lodash.throttle@4.1.1)(nanoid@5.0.7)(slate@0.72.8)(snabbdom@3.6.2)':
     dependencies:
       '@wangeditor/core': 1.1.19(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.isequal@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@5.0.7)(slate@0.72.8)(snabbdom@3.6.2)
       dom7: 3.0.0
@@ -7834,7 +7834,7 @@ snapshots:
     dependencies:
       '@uppy/core': 2.3.4
       '@uppy/xhr-upload': 2.1.3(@uppy/core@2.3.4)
-      '@wangeditor/basic-modules': 1.1.7(@wangeditor/core@1.1.19(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.isequal@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@3.3.8)(slate@0.72.8)(snabbdom@3.6.2))(dom7@3.0.0)(lodash.throttle@4.1.1)(nanoid@5.0.7)(slate@0.72.8)(snabbdom@3.6.2)
+      '@wangeditor/basic-modules': 1.1.7(@wangeditor/core@1.1.19(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.isequal@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@5.0.7)(slate@0.72.8)(snabbdom@3.6.2))(dom7@3.0.0)(lodash.throttle@4.1.1)(nanoid@5.0.7)(slate@0.72.8)(snabbdom@3.6.2)
       '@wangeditor/code-highlight': 1.0.3(@wangeditor/core@1.1.19(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.isequal@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@3.3.8)(slate@0.72.8)(snabbdom@3.6.2))(dom7@3.0.0)(slate@0.72.8)(snabbdom@3.6.2)
       '@wangeditor/core': 1.1.19(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.isequal@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@5.0.7)(slate@0.72.8)(snabbdom@3.6.2)
       '@wangeditor/list-module': 1.0.5(@wangeditor/core@1.1.19(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.isequal@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@3.3.8)(slate@0.72.8)(snabbdom@3.6.2))(dom7@3.0.0)(slate@0.72.8)(snabbdom@3.6.2)
@@ -7875,7 +7875,7 @@ snapshots:
     dependencies:
       '@uppy/core': 2.3.4
       '@uppy/xhr-upload': 2.1.3(@uppy/core@2.3.4)
-      '@wangeditor/basic-modules': 1.1.7(@wangeditor/core@1.1.19(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.isequal@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@3.3.8)(slate@0.72.8)(snabbdom@3.6.2))(dom7@3.0.0)(lodash.throttle@4.1.1)(nanoid@5.0.7)(slate@0.72.8)(snabbdom@3.6.2)
+      '@wangeditor/basic-modules': 1.1.7(@wangeditor/core@1.1.19(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.isequal@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@5.0.7)(slate@0.72.8)(snabbdom@3.6.2))(dom7@3.0.0)(lodash.throttle@4.1.1)(nanoid@5.0.7)(slate@0.72.8)(snabbdom@3.6.2)
       '@wangeditor/core': 1.1.19(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.isequal@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@5.0.7)(slate@0.72.8)(snabbdom@3.6.2)
       dom7: 3.0.0
       lodash.foreach: 4.5.0

public/version.json

@@ -1,3 +1,3 @@
 {
-  "version": "4.1"
+  "version": "4.4"
 }

src/views/base/craftManagement/routeCommon/index.vue

@@ -67,21 +67,21 @@
         <el-button link icon="el-icon-copy-document" @click="bindProcess(row)"
           >绑定</el-button
         >
-        <!--        <el-button-->
-        <!--          link-->
-        <!--          icon="el-icon-copy-document"-->
-        <!--          v-if="row.flowState == '0' || row.flowState == '2'"-->
-        <!--          @click="openCheckView(row)"-->
-        <!--          >提审</el-button-->
-        <!--        >-->
+                <el-button
+                  link
+                  icon="el-icon-copy-document"
+                  v-if="row.flowState == '0' || row.flowState == '2'"
+                  @click="openCheckView(row)"
+                  >提审</el-button
+                >
 
-        <!--        <el-button-->
-        <!--          link-->
-        <!--          icon="el-icon-copy-document"-->
-        <!--          v-if="row.flowState == '3'"-->
-        <!--          @click="onCancelFlow(row)"-->
-        <!--          >撤销</el-button-->
-        <!--        >-->
+                <el-button
+                  link
+                  icon="el-icon-copy-document"
+                  v-if="row.flowState == '3'"
+                  @click="onCancelFlow(row)"
+                  >撤销</el-button
+                >
       </template>
     </avue-crud>
     <CommonTable

src/views/flow/common/LookFlowStep.vue

@@ -1,9 +1,6 @@
 <script setup lang="ts">
 import {
-  getNextUser,
-  queryFlowDataList,
   queryFlowRecord,
-  submitFlow,
 } from "@/api/flow";
 
 const dialogVisible = ref(false);
@@ -45,9 +42,22 @@ defineExpose({
             <el-timeline-item
               v-for="(activity, index) in recordList"
               :key="index"
-              :timestamp="activity.timestamp"
+              :timestamp="activity.created"
             >
-              {{ activity }}
+              <el-card>
+                <h4><el-text class="mx-1">{{activity.currentStep}}</el-text>
+                  <el-tag v-if="activity.state === '0'" type="info">待审核</el-tag>
+                  <el-tag v-if="activity.state === '1'" type="success">通过</el-tag>
+                  <el-tag v-if="activity.state === '-1'" type="error">驳回</el-tag>
+                </h4>
+                <p>
+                  <el-text class="mx-1" v-if="activity.currentStep=='开始'">发起人员:{{activity.auditUser}}</el-text>
+                  <el-text class="mx-1" v-if="activity.currentStep !== '结束' && activity.currentStep !=='开始'">接收人员:{{activity.auditUser}}</el-text>
+                </p>
+                <p><el-text class="mx-1">接收时间:{{activity.created}}</el-text></p>
+                <p><el-text class="mx-1" v-if="activity.auditTime">办结时间:{{activity.auditTime}}</el-text></p>
+                <p><el-text class="mx-1" v-if="activity.auditTime">办理意见:{{activity.opinion}}</el-text></p>
+              </el-card>
             </el-timeline-item>
           </el-timeline>
         </div>

src/views/flow/todo/index.vue

@@ -73,9 +73,11 @@ option.value = Object.assign(option.value, {
   delBtn: false,
   selection: false,
   addBtn: false,
+  editBtn: false,
+  viewBtn: false,
   column: [
     {
-      label: "待办类型",
+      label: "流程类型",
       prop: "taskType",
       type: "select",
       search: true,
@@ -87,7 +89,7 @@ option.value = Object.assign(option.value, {
       },
     },
     {
-      label: "任务名称",
+      label: "流程名称",
       prop: "taskName",
       editDisabled: true,
     },