Merge branch 'hjw-222' into 'master'

Hjw 222

See merge request spfm/spfm-market-front!479

src/pages/main/accountPermissions/accountApplication.vue

@@ -14,9 +14,9 @@
             v-if="dialogStatus" :destroy-on-close="true">
             <!-- 后期维护 -->
             <div style="position: fixed; z-index: 10000;top: 55px;">
-                <el-button type="primary" v-if="startStatus" @click="clickHandles">处理</el-button>
-                <el-button type="primary" v-if="closeStatus" @click="handleClose">关闭</el-button>
                 <el-button type="primary" v-if="saveStatus" @click="clickSave">保存</el-button>
+                <el-button type="primary" v-if="startStatus" @click="clickHandles">处理</el-button>
+                <el-button type="primary" v-if="closeStatus" @click="handleClose">关闭</el-button>                
             </div>
             <el-form ref="form" :model="fromList" :rules="rule" label-width="130px" style="margin-top: 30px">
                 <div style="text-align: center;    font-size: 24px;">账号申请流程</div>

src/pages/main/accountPermissions/accountPermissions.vue

@@ -14,9 +14,9 @@
             v-if="dialogStatus" :destroy-on-close="true">
             <!-- 后期维护 -->
             <div style="position: fixed; z-index: 10000;top: 55px;">
-                <el-button type="primary" v-if="startStatus" @click="clickHandles">处理</el-button>
-                <el-button type="primary" v-if="closeStatus" @click="handleClose">关闭</el-button>
                 <el-button type="primary" v-if="saveStatus" @click="clickSave">保存</el-button>
+                <el-button type="primary" v-if="startStatus" @click="clickHandles">处理</el-button>
+                <el-button type="primary" v-if="closeStatus" @click="handleClose">关闭</el-button>  
             </div>
             <el-form ref="form" :model="fromList" :rules="rule" label-width="145px" style="margin-top: 30px">
                 <div style="text-align: center;    font-size: 24px;">账号权限申请流程</div>

src/pages/main/accountPermissions/accountdel.vue

@@ -14,9 +14,9 @@
             v-if="dialogStatus" :destroy-on-close="true">
             <!-- 后期维护 -->
             <div style="position: fixed; z-index: 10000;top: 55px;">
-                <el-button type="primary" v-if="startStatus" @click="clickHandles">处理</el-button>
-                <el-button type="primary" v-if="closeStatus" @click="handleClose">关闭</el-button>
                 <el-button type="primary" v-if="saveStatus" @click="clickSave">保存</el-button>
+                <el-button type="primary" v-if="startStatus" @click="clickHandles">处理</el-button>
+                <el-button type="primary" v-if="closeStatus" @click="handleClose">关闭</el-button>  
             </div>
             <el-form ref="form" :model="fromList" :rules="rule" label-width="120px" style="margin-top: 30px">
                 <div style="text-align: center;    font-size: 24px;">账号删除流程</div>

src/pages/main/accountPermissions/aqbgsyList.vue

@@ -14,9 +14,9 @@
             v-if="dialogStatus" :destroy-on-close="true">
             <!-- 后期维护 -->
             <div style="position: fixed; z-index: 10000;top: 55px;">
-                <el-button type="primary" v-if="startStatus" @click="clickHandles">处理</el-button>
-                <el-button type="primary" v-if="closeStatus" @click="handleClose">关闭</el-button>
                 <el-button type="primary" v-if="saveStatus" @click="clickSave">保存</el-button>
+                <el-button type="primary" v-if="startStatus" @click="clickHandles">处理</el-button>
+                <el-button type="primary" v-if="closeStatus" @click="handleClose">关闭</el-button>  
             </div>
             <el-form ref="form" :model="fromList" :rules="rule" label-width="85px" style="margin-top: 30px">
                 <div style="text-align: center;    font-size: 24px;">安全报告审阅流程</div>

src/pages/main/accountPermissions/klhfsqList.vue

@@ -14,9 +14,9 @@
             v-if="dialogStatus" :destroy-on-close="true">
             <!-- 后期维护 -->
             <div style="position: fixed; z-index: 10000;top: 55px;">
-                <el-button type="primary" v-if="startStatus" @click="clickHandles">处理</el-button>
-                <el-button type="primary" v-if="closeStatus" @click="handleClose">关闭</el-button>
                 <el-button type="primary" v-if="saveStatus" @click="clickSave">保存</el-button>
+                <el-button type="primary" v-if="startStatus" @click="clickHandles">处理</el-button>
+                <el-button type="primary" v-if="closeStatus" @click="handleClose">关闭</el-button>  
             </div>
             <el-form ref="form" :model="fromList" :rules="rule" label-width="140px" style="margin-top: 30px">
                 <div style="text-align: center;    font-size: 24px;">口令恢复申请流程</div>

src/pages/main/accountPermissions/rltzjlList.vue

@@ -14,9 +14,9 @@
             v-if="dialogStatus" :destroy-on-close="true">
             <!-- 后期维护 -->
             <div style="position: fixed; z-index: 10000;top: 55px;">
-                <el-button type="primary" v-if="startStatus" @click="clickHandles">处理</el-button>
-                <el-button type="primary" v-if="closeStatus" @click="handleClose">关闭</el-button>
                 <el-button type="primary" v-if="saveStatus" @click="clickSave">保存</el-button>
+                <el-button type="primary" v-if="startStatus" @click="clickHandles">处理</el-button>
+                <el-button type="primary" v-if="closeStatus" @click="handleClose">关闭</el-button>  
             </div>
             <el-form ref="form" :model="fromList" :rules="rule" label-width="85px" style="margin-top: 30px">
                 <div style="text-align: center;    font-size: 24px;">容量调整记录流程</div>

src/pages/main/accountPermissions/sjkdbList.vue

@@ -14,9 +14,9 @@
             v-if="dialogStatus" :destroy-on-close="true">
             <!-- 后期维护 -->
             <div style="position: fixed; z-index: 10000;top: 55px;">
-                <el-button type="primary" v-if="startStatus" @click="clickHandles">处理</el-button>
-                <el-button type="primary" v-if="closeStatus" @click="handleClose">关闭</el-button>
                 <el-button type="primary" v-if="saveStatus" @click="clickSave">保存</el-button>
+                <el-button type="primary" v-if="startStatus" @click="clickHandles">处理</el-button>
+                <el-button type="primary" v-if="closeStatus" @click="handleClose">关闭</el-button>  
             </div>
             <el-form ref="form" :model="fromList" :rules="rule" label-width="140px" style="margin-top: 30px">
                 <div style="text-align: center;    font-size: 24px;">数据库导表流程</div>

src/pages/main/accountPermissions/tyshList.vue

@@ -14,9 +14,9 @@
             v-if="dialogStatus" :destroy-on-close="true">
             <!-- 后期维护 -->
             <div style="position: fixed; z-index: 10000;top: 55px;">
-                <el-button type="primary" v-if="startStatus" @click="clickHandles">处理</el-button>
-                <el-button type="primary" v-if="closeStatus" @click="handleClose">关闭</el-button>
                 <el-button type="primary" v-if="saveStatus" @click="clickSave">保存</el-button>
+                <el-button type="primary" v-if="startStatus" @click="clickHandles">处理</el-button>
+                <el-button type="primary" v-if="closeStatus" @click="handleClose">关闭</el-button>  
             </div>
             <el-form ref="form" :model="fromList" :rules="rule" label-width="150px" style="margin-top: 30px">
                 <div style="text-align: center;    font-size: 24px;">通用审核流程</div>

src/pages/main/applyFor/userChange.vue

@@ -42,9 +42,10 @@
             <el-form-item
               style="position: fixed; top: 70px; left: -60px; z-index: 1000"
             >
+              <el-button type="primary" @click="newFormgong" v-if="baocun">保存</el-button>
               <el-button type="primary" v-if="deal" @click="dealwith()">处理</el-button>
               <el-button type="primary" @click="close()">关闭</el-button>
-              <el-button type="primary" @click="newFormgong" v-if="baocun">保存</el-button>
+              
               <!-- <el-button type="primary" @click="submitForm()" v-if = "baocun">保存</el-button> -->
             </el-form-item>
             <div class="flex-header">

src/pages/main/bfsj/bfsjList.vue

@@ -14,9 +14,9 @@
             v-if="dialogStatus" :destroy-on-close="true">
             <!-- 后期维护 -->
             <div style="position: fixed; z-index: 10000;top: 55px;">
-                <el-button type="primary" v-if="startStatus" @click="clickHandles">处理</el-button>
-                <el-button type="primary" v-if="closeStatus" @click="handleClose">关闭</el-button>
                 <el-button type="primary" v-if="saveStatus" @click="clickSave">保存</el-button>
+                <el-button type="primary" v-if="startStatus" @click="clickHandles">处理</el-button>
+                <el-button type="primary" v-if="closeStatus" @click="handleClose">关闭</el-button>                
             </div>
             <el-form ref="form" :model="fromList" :rules="rule" label-width="85px" style="margin-top: 30px">
                 <div style="text-align: center;    font-size: 24px;">备份数据恢复</div>

src/pages/main/firewall/formTable.vue

@@ -436,6 +436,9 @@ export default {
         },
     },
     mounted() {
+        if (this.list.id) {
+            this.form = this.list;
+        }
         if (this.list.mkFileShareAttachList) {
             this.$refs.upload.attList = this.list.mkFileShareAttachList;
             this.list.mkFileShareAttachList.map((item) => {
@@ -447,9 +450,12 @@ export default {
         this.getPortQuery(this.form.orderNumber)
     },
     created() {
-        this.form = this.list;
-        this.form.applicant = JSON.parse(window.sessionStorage.userInfo).loginName
-        this.form.applicationTime = new Date()
+        this.form = {
+            applicant: JSON.parse(window.sessionStorage.userInfo).loginName,
+            applicationTime: new Date(),
+            taskName: this.list.taskName,
+            orderNumber: this.list.orderNumber,
+        }
         this.copyRule = this.rule;
     },
 

src/pages/main/firewall/index.vue

@@ -13,9 +13,9 @@
             width="100%" :modal="false" style="display: flex; flex-direction: column">
             <!-- 后期维护 -->
             <div style="position: fixed; z-index: 99">
+                <el-button type="primary" v-if="saveStatus" @click="clickSave">保存</el-button>
                 <el-button type="primary" v-if="startStatus" @click="clickHandles">处理</el-button>
                 <el-button type="primary" v-if="closeStatus" @click="clickClose">关闭</el-button>
-                <el-button type="primary" v-if="saveStatus" @click="clickSave">保存</el-button>
             </div>
             <FormTable :list="fromList" :disabled="disabled" class="flex-form" ref="formTable" />
             <div>

src/pages/main/opcode/formTables.vue

@@ -271,6 +271,9 @@ export default {
         },
     },
     mounted() {
+        if (this.list.id) {
+            this.form = this.list;
+        }
         if (this.list.mkFileShareAttachList) {
             this.$refs.upload.attList = this.list.mkFileShareAttachList;
             this.list.mkFileShareAttachList.map((item) => {
@@ -281,12 +284,16 @@ export default {
             this.getFromQuery(this.form.orderNumber)
         }
 
+
     },
     created() {
-        this.form = this.list;
+        this.form = {
+            applicant: JSON.parse(window.sessionStorage.userInfo).loginName,
+            applicationTime: new Date(),
+            taskName: this.list.taskName,
+            orderNumber: this.list.orderNumber,
+        }
         this.copyRule = this.rule;
-        this.form.applicant = JSON.parse(window.sessionStorage.userInfo).loginName
-        this.form.applicationTime = new Date();
         this.getcityList()
     },
 

src/pages/main/opcode/index.vue

@@ -13,9 +13,9 @@
             width="100%" :modal="false" style="display: flex; flex-direction: column">
             <!-- 后期维护 -->
             <div style="position: fixed; z-index: 99">
+                <el-button type="primary" v-if="saveStatus" @click="clickSave">保存</el-button>
                 <el-button type="primary" v-if="startStatus" @click="clickHandles">处理</el-button>
                 <el-button type="primary" v-if="closeStatus" @click="clickClose">关闭</el-button>
-                <el-button type="primary" v-if="saveStatus" @click="clickSave">保存</el-button>
             </div>
             <FormTable :list="fromList" :disabled="disabled" class="flex-form" ref="formTable" />
             <div>

src/pages/main/userList/docAppr.vue

@@ -14,9 +14,9 @@
             v-if="dialogStatus" :destroy-on-close="true">
             <!-- 后期维护 -->
             <div style="position: fixed; z-index: 10000;top: 55px;">
-                <el-button type="primary" v-if="startStatus" @click="clickHandles">处理</el-button>
-                <el-button type="primary" v-if="closeStatus" @click="handleClose">关闭</el-button>
                 <el-button type="primary" v-if="saveStatus" @click="clickSave">保存</el-button>
+                <el-button type="primary" v-if="startStatus" @click="clickHandles">处理</el-button>
+                <el-button type="primary" v-if="closeStatus" @click="handleClose">关闭</el-button>  
             </div>
             <el-form ref="form" :model="fromList" :rules="rule" label-width="85px" style="margin-top: 30px">
                 <!-- <el-form ref="form" :model="fromList" :rules="rule" label-width="85px" style="margin-top: 30px"> -->

src/pages/main/userList/userList.vue

@@ -14,9 +14,9 @@
             v-if="dialogStatus" :destroy-on-close="true">
             <!-- 后期维护 -->
             <div style="position: fixed; z-index: 10000;top: 55px;">
-                <el-button type="primary" v-if="startStatus" @click="clickHandles">处理</el-button>
-                <el-button type="primary" v-if="closeStatus" @click="handleClose">关闭</el-button>
                 <el-button type="primary" v-if="saveStatus" @click="clickSave">保存</el-button>
+                <el-button type="primary" v-if="startStatus" @click="clickHandles">处理</el-button>
+                <el-button type="primary" v-if="closeStatus" @click="handleClose">关闭</el-button>  
             </div>
             <el-form ref="form" :model="fromList" :rules="rule" label-width="85px" style="margin-top: 30px">
                 <div style="text-align: center;    font-size: 24px;">用户清单</div>