增加流程描述信息

src/components/jeecg/modal/ProcessDelivery.vue

@@ -353,11 +353,7 @@
         this.close()
       },
       handleSubmit() {
-        if (this.getFileData) {
-          this.$emit('close')
-          this.visible = false
-          return
-        }
+
         if (!this.multi) {
           if (this.selectionRows && this.selectionRows.length > 1) {
             this.$message.warning('请选择一条记录')
@@ -365,6 +361,11 @@
           }
         }
         if (!this.selectionRows || this.selectionRows.length == 0) {
+          if (this.getFileData) {
+            this.$emit('close')
+            this.visible = false
+            return
+          }
           this.$message.warning('请选择一条记录')
           return false
         }

src/components/jeecg/modal/ProcessPlan.vue

@@ -381,18 +381,25 @@
         this.close()
       },
       handleSubmit() {
-        if (this.getFileData) {
+        /*if (this.getFileData) {
           this.$emit('close')
           this.visible = false
           return
-        }
+        }*/
+        console.log('//////////',this.changeData)
         if (!this.multi) {
           if (this.selectionRows && this.selectionRows.length > 1) {
+
             this.$message.warning('请选择一条记录')
             return false
           }
         }
         if (!this.selectionRows || this.selectionRows.length == 0) {
+          if (this.getFileData){
+            this.$emit('close')
+            this.visible = false
+            return
+          }
           this.$message.warning('请选择一条记录')
           return false
         }

src/defaultSettings.js

@@ -18,8 +18,8 @@ export default {
   navTheme: 'dark', // theme for nav menu
   layout: 'sidemenu', // nav menu position: sidemenu or topmenu
   contentWidth: 'Fixed', // layout of content: Fluid or Fixed, only works when layout is topmenu
-  fixedHeader: false, // sticky header
-  fixSiderbar: false, // sticky siderbar
+  fixedHeader: true, // sticky header
+  fixSiderbar: true, // sticky siderbar
   autoHideHeader: false, //  auto hide header
   colorWeak: false,
   multipage: true, //默认多页签模式

src/views/activiti/applyHome.vue

@@ -14,16 +14,16 @@
               <a-list-item slot="renderItem" slot-scope="item">
                 <a-card>
                   <div slot="title">
-                    <a-row>
-                      <a-col span="12" :title="item.name">{{item.name}} </a-col>
-                      <a-col span="12" style="text-align: right;">
-                        <a href="javascript:void (0)" @click="chooseProcess(item)">发起申请</a>
-                      </a-col>
+                    <a-row style="text-align: center;">
+                     <!-- <a-col span="12" :title="item.name">{{item.name}} </a-col>-->
+                      <!--<a-col span="12" style="text-align: center;">-->
+                        <a href="javascript:void (0)" @click="chooseProcess(item)">{{item.name}}</a>
+                      <!--</a-col>-->
                     </a-row>
                   </div>
-                  <b>版本：</b>v.{{item.version}}
+                 <!-- <b>版本：</b>v.{{item.version}}
                   <br/>
-                  <b>说明：</b>{{item.description}}
+                  <b>说明：</b>{{item.description}}-->
                 </a-card>
               </a-list-item>
             </a-list>

src/views/activiti/applyList.vue

@@ -130,7 +130,7 @@
           </template>
           <template v-else-if="r.status == 1">
 
-            <a href="javascript:void(0);" v-if="r.procInstStatus == 1" @click="cancel(r)"  style="color:#8000ff;">撤回</a>
+            <a href="javascript:void(0);" v-if="r.procInstStatus == 1" @click="handelSubmitCancel(r)"  style="color:#8000ff;">撤回</a>
             <a-divider type="vertical" v-if="r.procInstStatus == 1"/>
             <a href="javascript:void(0);" @click="history(r)" style="color:blue;">查看进度</a>
             <a-divider type="vertical" />
@@ -238,7 +238,7 @@
     </a-modal>
     <a-modal title="确认撤回" v-model="modalCancelVisible" :mask-closable="false" :width="500">
       <a-form ref="delForm" v-model="cancelForm" :label-width="70" v-if="modalCancelVisible">
-        <a-form-item label="撤回原因" prop="reason">
+        <a-form-item label="撤回原因" prop="reason" v-show="false">
           <a-input type="textarea" v-model="cancelForm.reason" :rows="4" />
         </a-form-item>
       </a-form>
@@ -553,17 +553,27 @@
         this.cancelForm.procInstId = v.procInstId;
         this.modalCancelVisible = true;
       },
-      handelSubmitCancel() {
-        this.submitLoading = true;
-        this.postFormAction(this.url.cancelApply,this.cancelForm).then(res => {
-          if (res.success) {
-            this.$message.success("操作成功");
-            this.loadData();
-            this.modalCancelVisible = false;
-          }else {
-            this.$message.error(res.message);
+      handelSubmitCancel(v) {
+        this.$confirm({
+          title: '撤回',
+          content: `您确定要撤回吗？`,
+          centered: true,
+          onOk: () => {
+            this.cancelForm.id = v.id;
+            this.cancelForm.procInstId = v.procInstId;
+            this.submitLoading = true;
+            this.postFormAction(this.url.cancelApply,this.cancelForm).then(res => {
+              if (res.success) {
+                this.$message.success("操作成功");
+                this.loadData();
+                this.modalCancelVisible = false;
+              }else {
+                this.$message.error(res.message);
+              }
+            }).finally(()=>this.submitLoading = false);
           }
-        }).finally(()=>this.submitLoading = false);
+        })
+
       },
       history(v) {
         if (!v.procInstId) {

src/views/activiti/form/ProcessUdgetPlanForm.vue

@@ -48,16 +48,17 @@
               <j-date placeholder="请选择需求时间" v-decorator="['needTime',validatorRules.needTime]"   :trigger-change="true" :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="['orderNumber']" 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>
             </a-form-item>
           </a-col>
+<!--          <a-col :span="8" >
+            <a-form-item label="流程说明" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <j-editor v-decorator="[ 'opinion', {} ]" triggerChange></j-editor>
+            </a-form-item>
+          </a-col>-->
         </a-row>
       </a-form>
     </j-form-container>
@@ -102,6 +103,11 @@
       </a-tab-pane>
 
     </a-tabs>
+    <div class="div_process">
+      <span>流程说明：</span>
+      <j-editor v-decorator="[ 'opinion', {} ]" triggerChange></j-editor>
+    </div>
+
     <div class="div_process">
       <a-form-item v-if="!disabled" :wrapperCol="{ span: 24 }" style="text-align: center">
         <a-button type="primary" :disabled="disabled||btndisabled" @click="handleSubmit">保存</a-button>
@@ -130,7 +136,7 @@
   import JSelectDepart from '@/components/jeecgbiz/JSelectDepart'
   import JSelectUserByDep from '@/components/jeecgbiz/JSelectUserByDep'
   import JDictSelectTag from '@/components/dict/JDictSelectTag'
-
+  import JEditor from '@/components/jeecg/JEditor'
 
   export default {
     name: 'ProcessUdgetPlanForm',
@@ -144,10 +150,12 @@
       JSelectUserByDep,
       JDictSelectTag,
       JSelectCompany,
+      JEditor
     },
     data() {
       return {
         bigId:[],
+        opinion:"",
         bigIdRake:[],
         materialGroups:'',
         materialId :'',
@@ -949,5 +957,6 @@
 <style scoped>
   .div_process{
     margin-top: 30px;
+
   }
 </style>

src/views/processmaterials/ProcessUdgetPlanMaterialList.vue

@@ -228,7 +228,7 @@
           {
             title:'供应商',
             align:"center",
-            dataIndex: 'supplier'
+            dataIndex: 'supplierId'
           },
           {
             title:'备注',

src/views/system/UserList.vue

@@ -137,7 +137,8 @@
         :pagination="ipagination"
         :loading="loading"
         :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
-        @change="handleTableChange">
+        @change="handleTableChange"
+      >
 
         <template slot="avatarslot" slot-scope="text, record, index">
           <div class="anty-img-wrap">