From e047da18c5013556e096c26b4439c350eb9bf4ff Mon Sep 17 00:00:00 2001
From: long <18782126717@163.com>
Date: Tue, 29 Nov 2022 18:25:17 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9D=83=E9=99=90from?=
 =?UTF-8?q?=E8=A1=A8=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/activiti/ModelList.vue                     |  4 ++--
 .../form/ProcessPermissionAuthorizationForm.vue      |  2 +-
 src/views/activiti/form/ProcessUdgetPlanForm.vue     | 12 +++++++++---
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/views/activiti/ModelList.vue b/src/views/activiti/ModelList.vue
index 0daf866..15056a1 100644
--- a/src/views/activiti/ModelList.vue
+++ b/src/views/activiti/ModelList.vue
@@ -163,7 +163,7 @@
             dataIndex: 'name',
             scopedSlots: { customRender: 'logContent' },
           },
-          {
+         /* {
             title: '模型key', width:150,
             dataIndex: 'key',
             align:"center",
@@ -173,7 +173,7 @@
             dataIndex: 'revision',
             align:"center",
             scopedSlots: { customRender: 'revision' },
-          },
+          },*/
           {
             title: '备注描述', width:150,
             dataIndex: 'metaInfo',
diff --git a/src/views/activiti/form/ProcessPermissionAuthorizationForm.vue b/src/views/activiti/form/ProcessPermissionAuthorizationForm.vue
index 5cd7977..2fb4388 100644
--- a/src/views/activiti/form/ProcessPermissionAuthorizationForm.vue
+++ b/src/views/activiti/form/ProcessPermissionAuthorizationForm.vue
@@ -30,7 +30,7 @@
           </a-col>
           <a-col :span="12">
             <a-form-item label="授权人" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <j-select-user-by-dep v-decorator="['authorizationPerson']" disabled/>
+              <j-select-user-by-dep v-decorator="['authorizationPerson']"/>
             </a-form-item>
           </a-col>
           <a-col :span="12">
diff --git a/src/views/activiti/form/ProcessUdgetPlanForm.vue b/src/views/activiti/form/ProcessUdgetPlanForm.vue
index 2d62bfe..82fa317 100644
--- a/src/views/activiti/form/ProcessUdgetPlanForm.vue
+++ b/src/views/activiti/form/ProcessUdgetPlanForm.vue
@@ -56,7 +56,12 @@
                       :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" style="width: 100%"/>
             </a-form-item>
           </a-col>
-
+          <a-col :span="8">
+            <a-form-item label="序号" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <a-input-number v-decorator="['sort',validatorRules.sort]" placeholder="请输入序号"
+                              style="width: 100%" />
+            </a-form-item>
+          </a-col>
           <a-col :span="8">
             <a-form-item label="文件" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <j-upload v-decorator="['fileId']" :trigger-change="true"></j-upload>
@@ -532,7 +537,8 @@
           // 'blur'是鼠标失去焦点的时候会触发验证
           materialType: { rules: [{ required: true, message: '请选择物资类型!' }] },
           needTime: { rules: [{ required: true, message: '请选择需求时间!' }] },
-          processPlan: { rules: [{ required: true, message: '请选择流程计划!' }] }
+          processPlan: { rules: [{ required: true, message: '请选择流程计划!' }] },
+          sort: { rules: [{ required: true, message: '请输入序号!' }] }
         },
         isBu: undefined,
         planType: ''
@@ -1230,7 +1236,7 @@
 
         }
         console.log(this.data, '数据回显')
-        let fieldval = pick(this.data, 'id', 'company', 'createTime', 'departId', 'createBy', 'materialType', 'processPlan', 'needTime', 'orderNumber', 'fileId', 'opinion')
+        let fieldval = pick(this.data, 'id','planType', 'company', 'createTime', 'departId', 'createBy', 'materialType', 'processPlan', 'needTime','sort', 'orderNumber', 'fileId', 'opinion')
         this.$nextTick(() => {
           this.form.setFieldsValue(fieldval)
         })