工单

base-vue/src/views/common/login.vue

@@ -113,18 +113,20 @@
     right: 0;
     bottom: 0;
     left: 0;
-    background-color: rgba(38, 50, 56, .6);
+    background: linear-gradient(225deg,#f9fbff,#e4e9f0);
+    // background-image: url(~@/assets/img/bg_login.jpg);
+    // background-size: cover;
     overflow: hidden;
-    &:before {
+    &:after {
       position: fixed;
-      top: 0;
+      top: 0%;
-      left: 0;
+      left: 15%;
-      z-index: -1;
+      z-index: 1;
-      width: 100%;
+      width: 30%;
       height: 100%;
+      max-width: 579px;
       content: "";
-      background-image: url(~@/assets/img/login.jpg);
+      background: center / 100% auto url(~@/assets/img/login.png) no-repeat;
-      background-size: cover;
     }
     .site-content__wrapper {
       position: absolute;
@@ -160,12 +162,15 @@
     }
     .login-main {
       position: absolute;
-      top: 0;
+      top: 50%;
-      right: 0;
+      transform: translateY(-50%);
-      padding: 150px 60px 180px;
+      right: 15%;
-      width: 470px;
+      width: 380px;
-      min-height: 100%;
+      padding: 20px 40px;
-      background-color: #fff;
+      background: #fff9;
+      border-radius: 8px;
+      -webkit-backdrop-filter: blur(10px);
+      backdrop-filter: blur(10px);
     }
     .login-title {
       font-size: 16px;

base-vue/src/views/modules/deploy/flwdeployprodef.vue

@@ -232,24 +232,24 @@
         this.flowForm.id = this.id
         // 提交表单数据
         this.$http({
-              url: this.$http.adornUrl(`/flw/instance/startFlowInstance`),
+          url: this.$http.adornUrl(`/flw/instance/startFlowInstance`),
-              method: 'get',
+          method: 'get',
-              params: this.$http.adornParams(this.flowForm)
+          params: this.$http.adornParams(this.flowForm)
-            }).then(({data}) => {
+        }).then(({data}) => {
-              if (data && data.code === 0) {
+          if (data && data.code === 0) {
-                this.$message({
+            this.$message({
-                  message: '操作成功',
+              message: '操作成功',
-                  type: 'success',
+              type: 'success',
-                  duration: 1500,
+              duration: 1500,
-                  onClose: () => {
+              onClose: () => {
-                    this.dialogFormVisible = false
+                this.dialogFormVisible = false
-                    this.flowForm = {}
+                this.flowForm = {}
-                  }
-                })
-              } else {
-                this.$message.error(data.msg)
               }
             })
+          } else {
+            this.$message.error(data.msg)
+          }
+        })
       },
       // 多选
       selectionChangeHandle (val) {
@@ -265,11 +265,11 @@
               params: this.$http.adornParams()
             }).then(({data}) => {
               if (data && data.code === 0) {
-                this.dynamiForm = data.data
+                this.dynamiForm = [...data.data]
-                this.users = data.users
+                this.users = [...data.users]
-                this.roles = data.roles
+                this.roles = [...data.roles]
                 // 需要动态的给 flowForm 绑定元素
-                // for( var item of this.dynamiForm){
+                // for( var item of data.data){
                 //   this.flowForm[item.key] = item.value
                 // }
                 this.dialogFormVisible = true

base-vue/src/views/modules/tickets/tickets.vue

@@ -122,6 +122,7 @@
         <template slot-scope="scope">
           <el-button type="text" size="small" @click="addOrUpdateHandle(scope.row.ticketsId)">修改</el-button>
           <el-button type="text" size="small" @click="deleteHandle(scope.row.ticketsId)">删除</el-button>
+          <el-button type="text" size="small" @click="startFlowHandle(scope.row.ticketsId)">指派</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -136,6 +137,48 @@
     </el-pagination>
     <!-- 弹窗, 新增 / 修改 -->
     <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" :dictData="dictData" @refreshDataList="getDataList"></add-or-update>
+    <el-dialog
+      title="发起流程"
+      :visible.sync="dialogFormVisible"
+      width="30%">
+      <el-form :model="flowForm"  label-width="100px" class="demo-dynamic">
+        <el-form-item
+          v-for="(form) in dynamiForm"
+          :label="form.name"
+          :key="form.key"
+          :prop="form.key"
+        >
+          <el-select v-if="form.type == 'assignee'" v-model="flowForm[form.key]" placeholder="请选择">
+            <el-option
+              v-for="item in users"
+              :key="item.userId"
+              :label="item.nickname+'['+item.username+']'"
+              :value="item.userId">
+            </el-option>
+          </el-select>
+          <el-select v-if="form.type == 'candidateUsers'" v-model="flowForm[form.key]" placeholder="请选择">
+            <el-option
+              v-for="item in users"
+              :key="item.userId"
+              :label="item.nickname+'['+item.username+']'"
+              :value="item.userId">
+            </el-option>
+          </el-select>
+          <el-select v-if="form.type == 'candidateGroups'" v-model="flowForm[form.key]" placeholder="请选择">
+            <el-option
+              v-for="item in roles"
+              :key="item.roleId"
+              :label="item.roleName"
+              :value="item.roleId">
+            </el-option>
+          </el-select>
+        </el-form-item>
+      </el-form>
+      <span slot="footer" class="dialog-footer">
+        <el-button size="mini" @click="dialogFormVisible = false">取消</el-button>
+        <el-button size="mini" type="primary" @click="submitStartFlow()">提交</el-button>
+      </span>
+    </el-dialog>
   </div>
 </template>
 
@@ -156,7 +199,12 @@
         dataListSelections: [],
         addOrUpdateVisible: false,
         dictConfigs: [{url: '/car/car/list', type: 'list', value: 'carId', label: 'carName'}, {type: 'dict', code: 'error_type'}, {url: '/flow/contract/list', type: 'list', value: 'contractId', label: 'contractNumber'}, {url: '/client/client/list', type: 'list', value: 'clientId', label: 'clientName'}],
-        dictData: []
+        dictData: [],
+        dialogFormVisible: false,
+        flowForm:{id: 'Process_1:2:05cb9af4-03a2-11f0-8846-e40d36456f42', ticketsId: null},
+        dynamiForm:[],
+        users: [],
+        roles: []
       }
     },
     mixins: [apiUtils],
@@ -240,6 +288,44 @@
             }
           })
         }).catch(() => {})
+      },
+      startFlowHandle(id){
+        this.flowForm = {}
+        this.flowForm.ticketsId = id
+        this.$http({
+          url: this.$http.adornUrl(`/flow/deploy/flowDef/${id}`),
+          method: 'get',
+          params: this.$http.adornParams()
+        }).then(({data}) => {
+          if (data && data.code === 0) {
+            this.dynamiForm = [...data.data]
+            this.users = [...data.users]
+            this.roles = [...data.roles]
+            this.dialogFormVisible = true
+          }
+        })
+      },
+      submitStartFlow(){
+        // 提交表单数据
+        this.$http({
+          url: this.$http.adornUrl(`/flw/instance/startFlowInstance`),
+          method: 'get',
+          params: this.$http.adornParams(this.flowForm)
+        }).then(({data}) => {
+          if (data && data.code === 0) {
+            this.$message({
+              message: '操作成功',
+              type: 'success',
+              duration: 1500,
+              onClose: () => {
+                this.dialogFormVisible = false
+                this.flowForm = {}
+              }
+            })
+          } else {
+            this.$message.error(data.msg)
+          }
+        })
       }
     }
   }