Merge remote-tracking branch 'origin/develop' into develop

src/components/CustomFormComponents/Input.vue

@@ -62,6 +62,9 @@ export default {
       const value = event
       this.$emit('input', value)
     }
+  },
+  mounted() {
+    console.log(this.config);
   }
 }
 </script>

src/pages/details/otherStandardDetails/index.vue

@@ -65,26 +65,26 @@
                       }}</span></p>
                     <!--发布稿（必读）-->
                     <template v-for="(child, childIndex) in item.child1">
-                      <div class="files-title" style="border-bottom: 1px solid #E5E5E5">
+                      <div class="files-titles" style="border-bottom: 1px solid #E5E5E5">
                         <label style="margin-right: 164px;">{{ child.attrName }}</label>
-                        <template v-if="child.value && child.value.length > 0"
+                        <template v-if="child.value && child.value.length > 0">
-                                  v-for="(file, fileIndex) in child1Func(child.value)">
                           <!--                          单个文件时-->
+                          <div v-for="(file, fileIndex) in child1Func(child.value)">
                           <span v-if="child.value && child.value.length > 0 && child.value.length === 1" style="display: flex; align-items: center;">
-                          <a style="font-size: 16px;color: #409EFF;cursor: pointer;"
+                            <a style="font-size: 16px;color: #409EFF;cursor: pointer;"
-                             @click="openFileInPdf(file.id, file.oldFileName)" target="_blank"
+                                @click="openFileInPdf(file.id, file.oldFileName)" target="_blank"
-                             :title="file.oldFileName">{{ file.oldFileName }}</a>
+                                :title="file.oldFileName">{{ file.oldFileName }}</a>
-                          <i
+                            <i
-                            title="下载"
+                                  title="下载"
-                            @click="downloadFile(file.id)"
+                                  @click="downloadFile(file.id)"
-                            class="icon-download"
+                                  class="icon-download"
-                            v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'd5b28957b5105c805e90a16fd5056a45' : 'a772afab2a6708883335500f3f86e771'"
+                                  v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'd5b28957b5105c805e90a16fd5056a45' : 'a772afab2a6708883335500f3f86e771'"
                           />
-                          <i
+                            <i
-                            title="下载带水印"
+                                  title="下载带水印"
-                            @click="downloadFileByWater(file.id, file.fileSuffix)"
+                                  @click="downloadFileByWater(file.id, file.fileSuffix)"
-                            class="icon-download2"
+                                  class="icon-download2"
-                            v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '02fd6eff0537c283dd071683de10689f' : '824f3bf9edef83fc7488917136167232'"
+                                  v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '02fd6eff0537c283dd071683de10689f' : '824f3bf9edef83fc7488917136167232'"
                           />
                             <!--                      <span class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span>-->
                           </span>
@@ -116,10 +116,9 @@
                               @click="showItemsModel(child.attrField)"
                               class="decomposition-btn"
                               style="right:62px"
-                              icon="icon-separate"
                             >标准分解单
                           </el-button>
-
+                          </div>
                           <!--                          <el-button v-if="child.value && child.value.length > 1"-->
                           <!--                                     style="color:#409EFF;border: 1px solid #409EFF;background: rgba(64, 158, 255, 0.1);"-->
                           <!--                                     class="decomposition-btn" icon="icon-relation" @click="relateEvent1(child.value)">-->
@@ -158,7 +157,6 @@
                                 @click="showItemsModel(child.attrField)"
                                 class="decomposition-btn"
                                 style="right:62px"
-                                icon="icon-separate"
                               >标准分解单
                               </el-button>
                               <el-button v-if="child.value && child.value.length > 1"
@@ -201,7 +199,6 @@
                                 @click="showItemsModel(child.attrField)"
                                 class="decomposition-btn"
                                 style="right:62px"
-                                icon="icon-separate"
                               >标准分解单
                               </el-button>
                               <el-button v-if="child.value && child.value.length > 1"
@@ -244,7 +241,6 @@
                                 @click="showItemsModel(child.attrField)"
                                 class="decomposition-btn"
                                 style="right:62px"
-                                icon="icon-separate"
                               >标准分解单
                               </el-button>
                               <el-button v-if="child.value && child.value.length > 1"
@@ -620,7 +616,6 @@
                       :key="index"
                       @click="showItemsModel(child.attrField)"
                       class="decomposition-btn"
-                      icon="icon-separate"
                     >标准分解单
                     </el-button>
 
@@ -726,7 +721,6 @@
                       :key="index"
                       @click="showItemsModel(child.attrField)"
                       class="decomposition-btn"
-                      icon="icon-separate"
                     >标准分解单
                     </el-button>
 
@@ -3889,6 +3883,15 @@ export default {
     display: block;
   }
 }
+.files-titles {
+  a {
+    overflow: hidden;
+    text-overflow: ellipsis;
+    width: calc(~'100% - 40px');
+    white-space: nowrap;
+    display: block;
+  }
+}
 /deep/ .el-icon-circle-close:before {
   margin-left: 250px;
 }

src/pages/home2/components/todoList/index.vue

@@ -205,7 +205,7 @@ export default {
                 prcType: row.prcType
               }
             })
-          }else if (row.taskInfo === '起草单位高级经理审核'){
+          }else if (row.taskInfo === '批准'){
             this.$router.push({
               name: 'bussLibrary8',
               query: {

src/pages/processCenter/pages/creatProcess/bzdy/step1.vue

@@ -559,7 +559,7 @@ export default {
         this.saveLoading = false
       })
     },
-    handleSubmit() {
+    handleSubmit(username) {
       this.$refs['qbkwForm'].validate((valid) => {
         if (valid) {
           this.$refs['Form'].validate((valid) => {
@@ -611,6 +611,9 @@ export default {
           return this.$message.warning('请完善基础信息')
         }
       })
+    },
+    aa () {
+      return 11111
     }
   },
   mounted () {

src/pages/processCenter/pages/creatProcess/bzdy/step7.vue

@@ -201,7 +201,6 @@
                 approval
                 @back="handleSubmitNo"
                 :submitLoading="isSubmit"
-                :saveLoading="saveLoading"
                 show-transfer
                 @transfer="handleTransfer"
                 @submit="handleSubmit"
@@ -375,7 +374,6 @@
             handleTabs(name) {
                 this.active = name
             },
-            handleSave() {},
             handleSubmit() {
                 this.isSubmit = true
                 var json = this.json

src/pages/processCenter/pages/creatProcess/bzdy/step8.vue

@@ -375,7 +375,6 @@
             handleTabs(name) {
                 this.active = name
             },
-            handleSave() {},
             handleSubmit() {
                 this.isSubmit = true
                 var json = this.json

src/pages/processCenter/pages/creatProcess/bzjd/step1-6.vue

@@ -3,7 +3,7 @@
     <!--    标准调研流程-->
     <ProcessHeader toggle>
       <template slot="proName">标准解读流程</template>
-      <template slot="proNode"></template>
+      <template slot="proNode">批准</template>
     </ProcessHeader>
     <div class="headerTabs">
       <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>

src/pages/processCenter/pages/creatProcess/bzjd/step4.vue

@@ -158,7 +158,7 @@
                 <el-table-column
                         prop="changePoint"
                         width="150"
-                        v-show="form.itemsNum1"
+                        v-if="form.itemsNum1"
                         label="基于上一版本差异"
                         show-overflow-tooltip
                         align="center">
@@ -191,7 +191,7 @@
                 <el-table-column
                         label="操作"
                         width="140"
-                        v-show="form.itemsNum1"
+                        v-if="form.itemsNum1"
                         align="center">
                     <template slot-scope="scope">
                         <el-button class="common-button-primary" size="mini" type="primary" @click="checkBD(scope.row.itemsId, scope.row.itemsId2, scope.row.itemsNum)">查看比对</el-button>

src/pages/processCenter/pages/creatProcess/bzjd/step5.vue

@@ -158,7 +158,7 @@
                 <el-table-column
                         prop="changePoint"
                         width="150"
-                        v-show="form.itemsNum1"
+                        v-if="form.itemsNum1"
                         label="基于上一版本差异"
                         show-overflow-tooltip
                         align="center">
@@ -191,7 +191,7 @@
                 <el-table-column
                         label="操作"
                         width="140"
-                        v-show="form.itemsNum1"
+                        v-if="form.itemsNum1"
                         align="center">
                     <template slot-scope="scope">
                         <el-button class="common-button-primary" size="mini" type="primary" @click="checkBD(scope.row.itemsId, scope.row.itemsId2, scope.row.itemsNum)">查看比对</el-button>

src/pages/processCenter/pages/creatProcess/bzjd/step6.vue

@@ -158,7 +158,7 @@
                 <el-table-column
                         prop="changePoint"
                         width="150"
-                        v-show="form.itemsNum1"
+                        v-if="form.itemsNum1"
                         label="基于上一版本差异"
                         show-overflow-tooltip
                         align="center">
@@ -191,7 +191,7 @@
                 <el-table-column
                         label="操作"
                         width="140"
-                        v-show="form.itemsNum1"
+                        v-if="form.itemsNum1"
                         align="center">
                     <template slot-scope="scope">
                         <el-button class="common-button-primary" size="mini" type="primary" @click="checkBD(scope.row.itemsId, scope.row.itemsId2, scope.row.itemsNum)">查看比对</el-button>

src/pages/processCenter/pages/creatProcess/bzpg/step1.vue

@@ -1058,11 +1058,15 @@ export default {
       this.projectList = data;
     },
     choiceZRR(scope, type, title, id) {
+      console.log(scope);
       if (scope != null) {
         this.currentIndex = scope.$index;
+        this.nodeList = [];
+        this.nodeList.push(scope.row.distributePersonId);
+      }else{
+        this.nodeList = [];
+        this.nodeList.push(id);
       }
-      this.nodeList = [];
-      this.nodeList.push(id);
       this.type = type;
       this.drawerTitle = title;
       this.modalshowflag = true;

src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="bzdyStep4">
-    <!--    标准调研流程-->
+    <!--    标准征求意见流程-->
     <ProcessHeader toggle>
       <template slot="proName">标准征求意见流程</template>
       <template slot="proNode">意见汇总报批</template>

src/pages/processCenter/pages/creatProcess/qbrk-product/step10.vue

@@ -2,7 +2,7 @@
     <!--        标准入库流程-->
     <ProcessHeader toggle>
         <template slot="proName">企标制修订-产品标准</template>
-        <template slot="proNode">审核</template>
+        <template slot="proNode">审定</template>
     </ProcessHeader>
     <div class="headerTabs">
         <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>

src/pages/processCenter/pages/creatProcess/qbrk/step8.vue

@@ -592,7 +592,7 @@
                 loading: false,
                 dataLoading: true,
                 drawerModal: false,
-                taskInfo:'起草单位高级经理审核',
+                taskInfo:'批准',
                 assigneeNewLoading: false,
                 disabledState: true,
                 userId:this.$store.getters.userInfo.userId,

src/pages/processCenter/pages/creatProcess/xmpg/step1.vue

@@ -648,6 +648,7 @@ export default {
         this.$message.warning("请选择一条数据进行带入");
       } else {
         this.addShow = false
+        this.dataList = []
         this.projectId = this.selectedList[0].id;
         this.listForm.projectId = this.selectedList[0].id;
         this.listForm.projectNumber = this.selectedList[0].projectNumber;

src/pages/processCenter/pages/phone/bzdy/step2.vue

@@ -67,7 +67,7 @@
                 <el-collapse-item title="回执说明">
                     <div style="margin: 10px 0;">
                         <van-cell-group>
-                            <van-field value="请输入意见" v-model="commentText" />
+                            <van-field value="请输入意见" v-model="commentText2" />
                         </van-cell-group>
                     </div>
                 </el-collapse-item>
@@ -116,7 +116,7 @@
                 drawerModal: false,
                 foldFormFlag: false,
                 histortData: [],
-                commentText: '',
+                commentText2: '',
                 taskIds: this.$route.query.taskIds,
                 pId: this.$route.query.prcId,
                 nodeList2: [],
@@ -232,7 +232,7 @@
                 _formData.append('taskIds', this.taskIds)
                 _formData.append('json', JSON.stringify({
                     form: this.form,
-                    commentText: this.commentText,
+                    commentText2: this.commentText2,
                 }))
                 saveTaskForPub(_formData).then(res => {
                     this.saveLoading = false
@@ -246,7 +246,7 @@
                     if (valid) {
                         this.isSubmit = true
                         var json = this.json
-                        json.commentText = this.commentText
+                        json.commentText = this.commentText2
                         json.responUserList = this.form.responUserList
                         json.responUserListName = this.form.responUserListName
                         this.$http.post('lawss/activiti/completeTask', {
@@ -279,6 +279,7 @@
                         this.json = data || data.form
                         this.form.responUserList = data.form?  data.form.responUserList : ''
                         this.form.responUserListName = data.form?  data.form.responUserListName : ''
+                        this.commentText2 = data.commentText2 || ''
                     }).catch(e => {
                     })
                 })

src/pages/processCenter/pages/phone/bzdy/step4.vue

@@ -81,7 +81,7 @@
                 <el-collapse-item title="审批意见">
                     <div style="margin: 10px 0;">
                         <van-cell-group>
-                            <van-field value="请输入意见" v-model="commentText" />
+                            <van-field value="请输入意见" v-model="commentText4" />
                         </van-cell-group>
                     </div>
                 </el-collapse-item>
@@ -132,7 +132,7 @@
                 drawerModal: false,
                 foldFormFlag: false,
                 histortData: [],
-                commentText: '',
+                commentText4: '',
                 taskIds: this.$route.query.taskIds,
                 pId: this.$route.query.prcId,
                 active: '1', // 默认显示
@@ -223,12 +223,11 @@
             handleTabs(name) {
                 this.active = name
             },
-            handleSave() {},
             handleSubmit() { // 同意
                 this.isSubmit = true
                 var json = this.json
                 json.actionFlag = 0
-                json.commentText = this.commentText
+                json.commentText = this.commentText4
                 this.$http.post('lawss/activiti/completeTask', {
                     json: JSON.stringify(json),
                     taskIds: this.taskIds,
@@ -242,11 +241,11 @@
                 })
             },
             handleSubmitNo() {
-                if (this.commentText) {
+                if (this.commentText4) {
                     this.isSubmit = true
                     var json = this.json
                     json.actionFlag = 1
-                    json.commentText = this.commentText
+                    json.commentText = this.commentText4
                     this.$http.post('lawss/activiti/completeTask', {
                         json: JSON.stringify(json),
                         taskIds: this.taskIds,
@@ -278,6 +277,7 @@
                         this.form.fileId = data.form ? data.form.fileId : data.fileId
                         this.form.modelList = data.form ? data.form.modelList : data.modelList
                         this.form.fjList = data.fjList || data.form.fjList
+                        this.commentText4 = data.commentText4 || ''
                     }).catch(e => {
                     })
                 })

src/pages/processCenter/pages/phone/bzdy/step6.vue

@@ -86,7 +86,7 @@
                     <el-collapse-item title="审批意见">
                         <div style="margin: 10px 0;">
                             <van-cell-group>
-                                <van-field value="请输入意见" v-model="commentText" />
+                                <van-field value="请输入意见" v-model="commentText6" />
                             </van-cell-group>
                         </div>
                     </el-collapse-item>
@@ -155,7 +155,7 @@
                 drawerModal: false,
                 foldFormFlag: false,
                 histortData: [],
-                commentText: '',
+                commentText6: '',
                 tableData: [],
                 taskIds: this.$route.query.taskIds,
                 pId: this.$route.query.prcId,
@@ -279,12 +279,11 @@
             handleTabs(name) {
                 this.active = name
             },
-            handleSave() {},
             handleSubmit() {
                 this.isSubmit = true
                 var json = this.json
                 json.actionFlag = 0
-                json.commentText = this.commentText
+                json.commentText = this.commentText6
                 this.$http.post('lawss/activiti/completeTask', {
                     json: JSON.stringify(json),
                     taskId: this.taskIds,
@@ -298,11 +297,11 @@
                 })
             },
             handleSubmitNo() {
-                if (this.commentText) {
+                if (this.commentText6) {
                     this.isSubmit = true
                     var json = this.json
                     json.actionFlag = 1
-                    json.commentText = this.commentText
+                    json.commentText = this.commentText6
                     this.$http.post('lawss/activiti/completeTask', {
                         json: JSON.stringify(json),
                         taskId: this.taskIds,
@@ -331,6 +330,7 @@
                         this.tableData = data.responUserList || data.form.responUserList
                         this.form.hzfileId = data.hzfileId || data.form.hzfileId
                         this.form.hzfileName = data.hzfileName || data.form.hzfileName
+                        this.commentText6 = data.commentText6 || ''
                     }).catch(e => {
                     })
                 })

src/pages/processCenter/pages/phone/bzdy/step7.vue

@@ -78,7 +78,7 @@
                 <el-collapse-item title="审批意见">
                     <div style="margin: 10px 0;">
                         <van-cell-group>
-                            <van-field value="请输入意见" v-model="commentText" />
+                            <van-field value="请输入意见" v-model="commentText7" />
                         </van-cell-group>
                     </div>
                 </el-collapse-item>
@@ -90,8 +90,6 @@
         <ProcessFooter
                 show-submit
                 :submitLoading="isSubmit"
-                :saveLoading="saveLoading"
-                @save="handleSave"
                 @submit="handleSubmit"
                 show-back
                 @back="handleSubmitNo"
@@ -122,7 +120,7 @@
                 drawerModal: false,
                 foldFormFlag: false,
                 histortData: [],
-                commentText: '',
+                commentText7: '',
                 tableData: [],
                 taskIds: this.$route.query.taskIds,
                 pId: this.$route.query.prcId,
@@ -243,12 +241,11 @@
             handleTabs(name) {
                 this.active = name
             },
-            handleSave() {},
             handleSubmit() {
                 this.isSubmit = true
                 var json = this.json
                 json.actionFlag = 0
-                json.commentText = this.commentText
+                json.commentText = this.commentText7
                 this.$http.post('lawss/activiti/completeTask', {
                     json: JSON.stringify(json),
                     taskIds: this.taskIds,
@@ -262,10 +259,10 @@
                 })
             },
             handleSubmitNo() {
-                if (this.commentText) {
+                if (this.commentText7) {
                     this.isSubmit = true
                     var json = this.json
-                    json.commentText = this.commentText
+                    json.commentText = this.commentText7
                     json.actionFlag = 1
                     this.$http.post('lawss/activiti/completeTask', {
                         json: JSON.stringify(json),
@@ -295,6 +292,7 @@
                         this.tableData = data.responUserList || data.form.responUserList
                         this.form.hzfileId = data.hzfileId || data.form.hzfileId
                         this.form.hzfileName = data.hzfileName || data.form.hzfileName
+                        this.commentText7 = data.commentText7 || ''
                     }).catch(e => {
                     })
                 })

src/pages/processCenter/pages/phone/bzdy/step8.vue

@@ -78,7 +78,7 @@
                 <el-collapse-item title="审批意见">
                     <div style="margin: 10px 0;">
                         <van-cell-group>
-                            <van-field value="请输入意见" v-model="commentText" />
+                            <van-field value="请输入意见" v-model="commentText8" />
                         </van-cell-group>
                     </div>
                 </el-collapse-item>
@@ -90,8 +90,6 @@
         <ProcessFooter
                 show-submit
                 :submitLoading="isSubmit"
-                :saveLoading="saveLoading"
-                @save="handleSave"
                 @submit="handleSubmit"
                 show-back
                 @back="handleSubmitNo"
@@ -122,7 +120,7 @@
                 drawerModal: false,
                 foldFormFlag: false,
                 histortData: [],
-                commentText: '',
+                commentText8: '',
                 tableData: [],
                 taskIds: this.$route.query.taskIds,
                 pId: this.$route.query.prcId,
@@ -247,10 +245,10 @@
                 this.isSubmit = true
                 var json = this.json
                 json.actionFlag = 0
-                json.commentText = this.commentText
+                json.commentText = this.commentText8
                 this.$http.post('lawss/activiti/completeTask', {
                     json: JSON.stringify(json),
-                    taskIds: this.taskIds,
+                    taskId: this.taskIds,
                     userId: this.$store.getters.userInfo.userId
                 }, {}, res => {
                     if (res.success) {
@@ -261,14 +259,14 @@
                 })
             },
             handleSubmitNo() {
-                if (this.commentText) {
+                if (this.commentText8) {
                     this.isSubmit = true
                     var json = this.json
-                    json.commentText = this.commentText
+                    json.commentText = this.commentText8
                     json.actionFlag = 1
                     this.$http.post('lawss/activiti/completeTask', {
                         json: JSON.stringify(json),
-                        taskIds: this.taskIds,
+                        taskId: this.taskIds,
                         userId: this.$store.getters.userInfo.userId
                     }, {}, res => {
                         if (res.success) {
@@ -291,6 +289,7 @@
                         this.form.title = data.title || data.form.title
                         this.form.date = data.date || data.form.date
                         this.json = data || data.form
+                        this.commentText8 = data.commentText8 || ''
                         this.tableData = data.responUserList || data.form.responUserList
                         this.form.hzfileId = data.hzfileId || data.form.hzfileId
                         this.form.hzfileName = data.hzfileName || data.form.hzfileName

src/pages/processCenter/pages/phone/bzdy/step9.vue

@@ -2,7 +2,7 @@
     <div class="phoneBzdyStep9 phoneBox">
         <ProcessHeaderPhone toggle>
             <template slot="proName">标准调研流程</template>
-            <template slot="proNode">责任部门对接人及标准法规部部长审核</template>
+            <template slot="proNode">批准</template>
         </ProcessHeaderPhone>
         <div class="headerTabs">
             <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
@@ -78,7 +78,7 @@
                 <el-collapse-item title="审批意见">
                     <div style="margin: 10px 0;">
                         <van-cell-group>
-                            <van-field value="请输入意见" v-model="commentText" />
+                            <van-field value="请输入意见" v-model="commentText9" />
                         </van-cell-group>
                     </div>
                 </el-collapse-item>
@@ -122,7 +122,7 @@
                 drawerModal: false,
                 foldFormFlag: false,
                 histortData: [],
-                commentText: '',
+                commentText9: '',
                 tableData: [],
                 taskIds: this.$route.query.taskIds,
                 pId: this.$route.query.prcId,
@@ -242,15 +242,14 @@
             handleTabs(name) {
                 this.active = name
             },
-            handleSave() {},
             handleSubmit() {
                 this.isSubmit = true
                 var json = this.json
                 json.actionFlag = 0
-                json.commentText = this.commentText
+                json.commentText = this.commentText9
                 this.$http.post('lawss/activiti/completeTask', {
                     json: JSON.stringify(json),
-                    taskIds: this.taskIds,
+                    taskId: this.taskIds,
                     userId: this.$store.getters.userInfo.userId
                 }, {}, res => {
                     if (res.success) {
@@ -261,14 +260,14 @@
                 })
             },
             handleSubmitNo() {
-                if (this.commentText) {
+                if (this.commentText9) {
                     this.isSubmit = true
                     var json = this.json
-                    json.commentText = this.commentText
+                    json.commentText = this.commentText9
                     json.actionFlag = 1
                     this.$http.post('lawss/activiti/completeTask', {
                         json: JSON.stringify(json),
-                        taskIds: this.taskIds,
+                        taskId: this.taskIds,
                         userId: this.$store.getters.userInfo.userId
                     }, {}, res => {
                         if (res.success) {
@@ -288,6 +287,7 @@
                         pId: this.pId
                     }).then(res => {
                         let data = JSON.parse(res.mesg)
+                        this.commentText9 = data.commentText9 || ''
                         this.form.title = data.title || data.form.title
                         this.form.date = data.date || data.form.date
                         this.json = data || data.form

src/pages/processCenter/pages/phone/bzjd/step4.vue

@@ -206,7 +206,7 @@
                                 :rows="3"
                                 resize="none"
                                 placeholder="请输入意见"
-                                v-model="commentText">
+                                v-model="commentText4">
                         </el-input>
                     </div>
                 </el-collapse-item>
@@ -256,7 +256,7 @@
                 sarType: '',
                 itemList: [],
                 loading: true,
-                commentText: '',
+                commentText4: '',
                 taskIds: this.$route.query.taskIds,
                 pId: this.$route.query.prcId,
                 textarea: '', // 意见
@@ -346,12 +346,11 @@
             handleTabs(name) {
                 this.active = name
             },
-            handleSave() {},
             handleSubmit() {
                 this.isSubmit = true
                 var json = this.json
                 json.resolveFlag = 1
-                json.commentText = this.commentText
+                json.commentText = this.commentText4
                 this.$http.post('lawss/activiti/completeTask', {
                     json: JSON.stringify(json),
                     taskId: this.taskIds,
@@ -365,11 +364,11 @@
                 })
             },
             handleSubmitNo () {
-                if (this.commentText) {
+                if (this.commentText4) {
                     this.isSubmit = true
                     var json = this.json
                     json.resolveFlag = 2
-                    json.commentText = this.commentText
+                    json.commentText = this.commentText4
                     this.$http.post('lawss/activiti/completeTask', {
                         json: JSON.stringify(json),
                         taskId: this.taskIds,
@@ -394,6 +393,7 @@
                         let data = JSON.parse(res.mesg)
                         this.form.itemsNum = data.itemsNum || data.form.itemsNum
                         this.form.itemsName = data.itemsName || data.form.itemsName
+                        this.commentText4 = data.commentText4 || ''
                         if (data.form) {
                             this.form.itemsName1 = data.form.itemsName1 || ''
                             this.form.itemsNum1 = data.form.itemsNum1 || ''

src/pages/processCenter/pages/phone/bzjd/step5.vue

@@ -204,7 +204,7 @@
                                 :rows="3"
                                 resize="none"
                                 placeholder="请输入意见"
-                                v-model="commentText">
+                                v-model="commentText5">
                         </el-input>
                     </div>
                 </el-collapse-item>
@@ -242,6 +242,7 @@
         name: "phoneBzjdStep5",
         data() {
             return {
+                commentText5: '',
                 tableIndex: 0,
                 itemLists: [],
                 dialogMadal: false,
@@ -254,7 +255,6 @@
                 sarType: '',
                 itemList: [],
                 loading: true,
-                commentText: '',
                 taskIds: this.$route.query.taskIds,
                 pId: this.$route.query.prcId,
                 textarea: '', // 意见
@@ -344,12 +344,11 @@
             handleTabs(name) {
                 this.active = name
             },
-            handleSave() {},
             handleSubmit() {
                 this.isSubmit = true
                 var json = this.json
-                json.resolveFlag = 1
+                json.zrApplyFlag = 1
-                json.commentText = this.commentText
+                json.commentText = this.commentText5
                 this.$http.post('lawss/activiti/completeTask', {
                     json: JSON.stringify(json),
                     taskId: this.taskIds,
@@ -363,11 +362,11 @@
                 })
             },
             handleSubmitNo () {
-                if (this.commentText) {
+                if (this.commentText5) {
                     this.isSubmit = true
                     var json = this.json
-                    json.resolveFlag = 2
+                    json.zrApplyFlag = 2
-                    json.commentText = this.commentText
+                    json.commentText = this.commentText5
                     this.$http.post('lawss/activiti/completeTask', {
                         json: JSON.stringify(json),
                         taskId: this.taskIds,
@@ -392,6 +391,7 @@
                         let data = JSON.parse(res.mesg)
                         this.form.itemsNum = data.itemsNum || data.form.itemsNum
                         this.form.itemsName = data.itemsName || data.form.itemsName
+                        this.commentText5 = data.commentText5 || ''
                         if (data.form) {
                             this.form.itemsName1 = data.form.itemsName1 || ''
                             this.form.itemsNum1 = data.form.itemsNum1 || ''

src/pages/processCenter/pages/phone/bzjd/step6.vue

@@ -204,7 +204,7 @@
                                 :rows="3"
                                 resize="none"
                                 placeholder="请输入意见"
-                                v-model="commentText">
+                                v-model="commentText6">
                         </el-input>
                     </div>
                 </el-collapse-item>
@@ -242,6 +242,7 @@
         name: "phoneBzjdStep6",
         data() {
             return {
+                commentText6: '',
                 tableIndex: 0,
                 itemLists: [],
                 dialogMadal: false,
@@ -254,7 +255,6 @@
                 sarType: '',
                 itemList: [],
                 loading: true,
-                commentText: '',
                 taskIds: this.$route.query.taskIds,
                 pId: this.$route.query.prcId,
                 textarea: '', // 意见
@@ -344,12 +344,11 @@
             handleTabs(name) {
                 this.active = name
             },
-            handleSave() {},
             handleSubmit() {
                 this.isSubmit = true
                 var json = this.json
-                json.resolveFlag = 1
+                json.gcApplyFlag = 1
-                json.commentText = this.commentText
+                json.commentText = this.commentText6
                 this.$http.post('lawss/activiti/completeTask', {
                     json: JSON.stringify(json),
                     taskId: this.taskIds,
@@ -363,11 +362,11 @@
                 })
             },
             handleSubmitNo () {
-                if (this.commentText) {
+                if (this.commentText6) {
                     this.isSubmit = true
                     var json = this.json
-                    json.resolveFlag = 2
+                    json.gcApplyFlag = 2
-                    json.commentText = this.commentText
+                    json.commentText = this.commentText6
                     this.$http.post('lawss/activiti/completeTask', {
                         json: JSON.stringify(json),
                         taskId: this.taskIds,
@@ -392,6 +391,7 @@
                         let data = JSON.parse(res.mesg)
                         this.form.itemsNum = data.itemsNum || data.form.itemsNum
                         this.form.itemsName = data.itemsName || data.form.itemsName
+                        this.commentText6 = data.commentText6 || ''
                         if (data.form) {
                             this.form.itemsName1 = data.form.itemsName1 || ''
                             this.form.itemsNum1 = data.form.itemsNum1 || ''

src/pages/processCenter/pages/phone/bzzqyj/step2.vue

@@ -67,7 +67,7 @@
                 <el-collapse-item title="回执说明">
                     <div style="margin: 10px 0;">
                         <van-cell-group>
-                            <van-field value="请输入意见" v-model="commentText" />
+                            <van-field value="请输入意见" v-model="commentText2" />
                         </van-cell-group>
                     </div>
                 </el-collapse-item>
@@ -170,7 +170,7 @@
             return {
                 drawerModal: false,
                 histortData: [],
-                commentText: "",
+                commentText2: "",
                 taskIds: this.$route.query.taskIds,
                 pId: this.$route.query.prcId,
                 nodeList: [],
@@ -299,7 +299,7 @@
                 _formData.append("taskIds", this.taskIds);
                 _formData.append("json", JSON.stringify({
                     form: this.form,
-                    commentText: this.commentText
+                    commentText2: this.commentText2
                 }));
                 saveTaskForPub(_formData).then(res => {
                     this.saveLoading = false;
@@ -314,7 +314,7 @@
                     if (valid) {
                         this.isSubmit = true;
                         var json = this.json;
-                        json.commentText = this.commentText;
+                        json.commentText = this.commentText2;
                         json.responUserList = this.form.responUserList;
                         json.responUserListName = this.form.responUserListName;
                         json.introduce = false;
@@ -341,19 +341,14 @@
                         pId: this.pId
                     }).then(res => {
                         let data = JSON.parse(res.mesg)
-                        this.form.cid = data.cid
+                        this.commentText2 = data.commentText2 || ''
-                        this.form.endTime = data.endTime
+                        this.form.cid = data.form ? data.form.cid : data.cid
-                        this.form.cname = data.cname
+                        this.form.endTime = data.form ? data.form.endTime : data.endTime
-                        this.form.fjList = data.fjList
+                        this.form.fjList = data.form ? data.form.fjList : data.fjList
-                        // this.form.fjListId = data.fjListId
+                        this.form.textType = data.form ? data.form.textType : data.textType
-                        this.form.textType = data.textType
+                        this.form.modelList = data.form ? data.form.modelList : data.modelList
-                        this.form.modelList = data.modelList
+                        this.form.responUserListName = data.form ? data.form.responUserListName : (data.responUserListName ? data.responUserListName :  '')
-                        this.form.modelNameList = data.modelNameList
+                        this.form.responUserList = data.form ? data.form.responUserList : (data.responUserList ? data.responUserList :  '')
-                        if (data.fjListId === '') {
-                            this.form.fjListId = ''
-                        } else {
-                            this.form.fjListId = data.fjListId || data.form.fjListId
-                        }
                         this.json = data
                     }).catch(e => {
                     });

src/pages/processCenter/pages/phone/bzzqyj/step4-1.vue

@@ -50,16 +50,19 @@
                                 - -
                             </div>
                         </el-form-item>
-                        <el-form-item label="标准法规工程师分线管理员" prop="bzfgId" class="add-form-item form-item-disabled">
+                        <van-cell-group>
-                            <el-input
+                            <van-field label="标准法规工程师分线管理员" v-model="form.bzfgName" readonly />
-                                    v-model="form.bzfgId"
+                        </van-cell-group>
-                                    style="display: none;"
+<!--                        <el-form-item label="标准法规工程师分线管理员" prop="bzfgName" class="add-form-item form-item-disabled">-->
-                                    clearable
+<!--                            <el-input-->
-                            ></el-input>
+<!--                                    v-model="form.bzfgId"-->
-                            <van-cell-group>
+<!--                                    style="display: none;"-->
-                                <van-field v-model="form.bzfgName" value="请选择标准法规工程师分线管理员" readonly  @click.native="choiceZRR(form.bzfgId)"/>
+<!--                                    clearable-->
-                            </van-cell-group>
+<!--                            ></el-input>-->
-                        </el-form-item>
+<!--                            <van-cell-group>-->
+<!--                                <van-field v-model="form.bzfgName" value="请选择标准法规工程师分线管理员" readonly  @click.native="choiceZRR(form.bzfgId)"/>-->
+<!--                            </van-cell-group>-->
+<!--                        </el-form-item>-->
                     </div>
                 </el-form>
                 <ProcessTitle>
@@ -133,7 +136,7 @@
                 <el-collapse-item title="审批意见">
                     <div style="margin: 10px 0;">
                         <van-cell-group>
-                            <van-field value="请输入意见" v-model="commentText" />
+                            <van-field value="请输入意见" v-model="commentText41" />
                         </van-cell-group>
                     </div>
                 </el-collapse-item>
@@ -245,7 +248,7 @@
                 drawerModal: false,
                 histortData: [],
                 data: [],
-                commentText: '',
+                commentText41: '',
                 taskIds: this.$route.query.taskIds,
                 pId: this.$route.query.prcId,
                 roleRow: {},
@@ -368,14 +371,12 @@
             handleTabs(name) {
                 this.active = name
             },
-            handleSave() {
-            },
             handleSubmit() {
                 this.$refs['bzzqyjForm'].validate((valid) => {
                     if (valid) {
                         this.isSubmit = true
                         var json = this.json
-                        json.commentText = this.commentText
+                        json.commentText = this.commentText41
                         json.bzfgId = this.form.bzfgId
                         json.bzfgName = this.form.bzfgName
                         json.spFlag = '0'
@@ -396,10 +397,10 @@
                 })
             },
             handleSubmitNo() {
-                if (this.commentText) {
+                if (this.commentText41) {
                     var json = this.json
                     json.spFlag = '1'
-                    json.commentText = this.commentText
+                    json.commentText = this.commentText41
                     this.$http.post('lawss/activiti/completeTask', {
                         json: JSON.stringify(json),
                         taskId: this.taskIds,
@@ -428,14 +429,15 @@
                         } else {
                             this.form.fjListId =  data.form.fjListId || data.fjListId
                         }
+                        this.commentText41 = data.commentText41 || ''
+                        this.form.bzfgId = data.startUser
+                        this.form.bzfgName = data.startUserName
                         this.form.cid = data.cid || data.form.cid
                         this.form.endTime = data.endTime || data.form.endTime
                         this.form.cname = data.cname || data.form.cname
                         this.form.textType = data.textType || data.form.textType
                         this.form.modelList = data.modelList || data.form.modelList
                         this.form.modelNameList = data.modelNameList || data.form.modelNameList
-                        this.form.bzfgId = data.bzfgId || ''
-                        this.form.bzfgName = data.bzfgName || ''
                         this.json = data
                         this.data = data.info || data.data
                     }).catch(e => {

src/pages/processCenter/pages/phone/bzzqyj/step4-2.vue

@@ -123,7 +123,7 @@
                 <el-collapse-item title="审批意见">
                     <div style="margin: 10px 0;">
                         <van-cell-group>
-                            <van-field value="请输入意见" v-model="commentText" />
+                            <van-field value="请输入意见" v-model="commentText42" />
                         </van-cell-group>
                     </div>
                 </el-collapse-item>
@@ -236,7 +236,7 @@
                 drawerModal: false,
                 histortData: [],
                 data: [],
-                commentText: '',
+                commentText42: '',
                 taskIds: this.$route.query.taskIds,
                 pId: this.$route.query.prcId,
                 roleRow: {},
@@ -362,12 +362,10 @@
             handleTabs(name) {
                 this.active = name
             },
-            handleSave() {
-            },
             handleSubmit() {
                 this.isSubmit = true
                 var json = this.json
-                json.commentText = this.commentText
+                json.commentText = this.commentText42
                 json.bzFlag = '0'
                 this.$http.post('lawss/activiti/completeTask', {
                     json: JSON.stringify(json),
@@ -382,10 +380,10 @@
                 })
             },
             handleSubmitNo() {
-                if (this.commentText) {
+                if (this.commentText42) {
                     var json = this.json
                     json.bzFlag = '1'
-                    json.commentText = this.commentText
+                    json.commentText = this.commentText42
                     this.$http.post('lawss/activiti/completeTask', {
                         json: JSON.stringify(json),
                         taskId: this.taskIds,
@@ -414,6 +412,7 @@
                         } else {
                             this.form.fjListId =  data.form.fjListId || data.fjListId
                         }
+                        this.commentText42 = data.commentText42 || ''
                         this.form.cid = data.cid || data.form.cid
                         this.form.endTime = data.endTime || data.form.endTime
                         this.form.cname = data.cname || data.form.cname

src/pages/processCenter/pages/phone/bzzqyj/step6.vue

@@ -79,7 +79,7 @@
                 </div>
                 <el-table
                         ref="multipleTable"
-                        :data="data"
+                        :data="data2"
                         tooltip-effect="dark"
                         border
                         style="width: 100%; flex: auto;"
@@ -158,7 +158,7 @@
                 <el-collapse-item title="审批意见">
                     <div style="margin: 10px 0;">
                         <van-cell-group>
-                            <van-field value="请输入意见" v-model="commentText" />
+                            <van-field value="请输入意见" v-model="commentText6" />
                         </van-cell-group>
                     </div>
                 </el-collapse-item>
@@ -211,13 +211,14 @@
         name: "phoneBzdyStep6",
         data() {
             return {
+                data2: [],
                 itermsConditionsFlag: false,
                 itermsConditionsTitle: '',
                 drawerModal: false,
                 histortData: [],
                 oldData: [],
                 data: [],
-                commentText: "",
+                commentText6: "",
                 oldText: "",
                 newText: "",
                 reason: "",
@@ -362,6 +363,8 @@
                     return "上报";
                 } else if (row === "2") {
                     return "处理后上报";
+                } else {
+                    return "不上报";
                 }
             },
             upload(row, title) {
@@ -400,33 +403,37 @@
             handleTabs(name) {
                 this.active = name;
             },
-            handleSave() {
-            },
             handleSubmit() {
-                this.isSubmit = true;
+                this.$refs['bzzqyjForm'].validate((valid) => {
-                var json = this.json;
+                    if (valid) {
-                json.hqFlag = '0';
+                        this.isSubmit = true;
-                json.user7 = this.form.user7;
+                        var json = this.json;
-                json.user7Name = this.form.user7Name;
+                        json.hqFlag = '0';
-                json.commentText = this.commentText;
+                        json.commentText = this.commentText6;
-                this.$http.post("lawss/activiti/completeTask", {
+                        json.user7 = this.form.user7;
-                    json: JSON.stringify(json),
+                        json.user7Name = this.form.user7Name;
-                    taskId: this.taskIds,
+                        this.$http.post("lawss/activiti/completeTask", {
-                    userId: this.$store.getters.userInfo.userId
+                            json: JSON.stringify(json),
-                }, {}, res => {
+                            taskId: this.taskIds,
-                    if (res.success) {
+                            userId: this.$store.getters.userInfo.userId
-                        this.$message.success("提交成功");
+                        }, {}, res => {
-                        this.$router.push("/processCenter");
+                            if (res.success) {
+                                this.$message.success("提交成功");
+                                this.$router.push("/processCenter");
+                            }
+                            this.isSubmit = false;
+                        });
+                    } else {
+                        this.$message.warning('请选择审批领导')
                     }
-                    this.isSubmit = false;
+                })
-                });
             },
             handleSubmitNo() {
-                if (this.commentText) {
+                if (this.commentText6) {
                     this.isSubmit = true;
                     var json = this.json;
                     json.hqFlag = '1';
-                    json.commentText = this.commentText;
+                    json.commentText = this.commentText6;
                     this.$http.post("lawss/activiti/completeTask", {
                         json: JSON.stringify(json),
                         taskIds: this.taskIds,
@@ -455,21 +462,24 @@
                         } else {
                             this.form.fjListId =  data.form.fjListId || data.fjListId
                         }
+                        this.commentText6 = data.commentText6 || ''
                         this.form.cid = data.cid || data.form.cid;
                         this.form.endTime = data.endTime || data.form.endTime;
                         this.form.cname = data.cname || data.form.cname;
-                        this.oldData = JSON.parse(JSON.stringify(data.info))
+                        let newArr = data.info ? data.info : data.form.data
-                        var arr = []
+                        this.oldData = JSON.parse(JSON.stringify(newArr))
-                        data.info.forEach(item => {
+                        let arr = []
+                        newArr.forEach(item => {
                             if (item.state != '3') {
                                 arr.push(item)
                             }
                         })
                         this.json = data
+                        this.data2 = newArr
+                        this.data = arr
                         this.form.textType = data.textType || data.form.textType
                         this.form.modelList = data.modelList || data.form.modelList
                         this.form.modelNameList = data.modelNameList || data.form.modelNameList
-                        this.data = arr
                     }).catch(e => {
                     });
                 });

src/pages/processCenter/pages/phone/bzzqyj/step7.vue

@@ -148,7 +148,7 @@
                 <el-collapse-item title="审批意见">
                     <div style="margin: 10px 0;">
                         <van-cell-group>
-                            <van-field value="请输入意见" v-model="commentText" />
+                            <van-field value="请输入意见" v-model="commentText7" />
                         </van-cell-group>
                     </div>
                 </el-collapse-item>
@@ -200,7 +200,7 @@
                 histortData: [],
                 oldData: [],
                 data: [],
-                commentText: "",
+                commentText7: "",
                 oldText: "",
                 newText: "",
                 reason: "",
@@ -358,44 +358,42 @@
             handleTabs(name) {
                 this.active = name;
             },
-            handleSave() {
-            },
             handleSubmit() {
-                    this.isSubmit = true;
+                this.isSubmit = true
-                    var json = this.json;
+                var json = this.json
-                    json.hqFlag = '0';
+                json.bdFlag = '0'
-                    json.commentText = this.commentText;
+                json.commentText = this.commentText7
-                    this.$http.post("lawss/activiti/completeTask", {
+                this.$http.post('lawss/activiti/completeTask', {
-                        json: JSON.stringify(json),
+                    json: JSON.stringify(json),
-                        taskId: this.taskIds,
+                    taskId: this.taskIds,
-                        userId: this.$store.getters.userInfo.userId
+                    userId: this.$store.getters.userInfo.userId
-                    }, {}, res => {
+                }, {}, res => {
-                        if (res.success) {
+                    if (res.success) {
-                            this.$message.success("提交成功");
+                        this.$message.success('提交成功')
-                            this.$router.push("/processCenter");
+                        this.$router.push('/processCenter')
-                        }
+                    }
-                        this.isSubmit = false;
+                    this.isSubmit = false
-                    });
+                })
             },
             handleSubmitNo() {
-                if (this.commentText) {
+                if (this.commentText7) {
-                    this.isSubmit = true;
+                    this.isSubmit = true
-                    var json = this.json;
+                    var json = this.json
-                    json.hqFlag = '1';
+                    json.bdFlag = '1'
-                    json.commentText = this.commentText;
+                    json.commentText = this.commentText7
-                    this.$http.post("lawss/activiti/completeTask", {
+                    this.$http.post('lawss/activiti/completeTask', {
                         json: JSON.stringify(json),
                         taskIds: this.taskIds,
                         userId: this.$store.getters.userInfo.userId
                     }, {}, res => {
                         if (res.success) {
-                            this.$message.success("驳回成功");
+                            this.$message.success('驳回成功')
-                            this.$router.push("/processCenter");
+                            this.$router.push('/processCenter')
                         }
-                        this.isSubmit = false;
+                        this.isSubmit = false
-                    });
+                    })
                 } else {
-                    this.$message.warning("请输入反馈意见");
+                    this.$message.warning('请输入反馈意见')
                 }
             },
             getData() {
@@ -411,6 +409,7 @@
                         } else {
                             this.form.fjListId =  data.form.fjListId || data.fjListId
                         }
+                        this.commentText7 = data.commentText7 || ''
                         this.form.cid = data.cid || data.form.cid;
                         this.form.endTime = data.endTime || data.form.endTime;
                         this.form.cname = data.cname || data.form.cname;

src/pages/processCenter/pages/phone/bzzqyj/step8.vue

@@ -148,7 +148,7 @@
                 <el-collapse-item title="审批意见">
                     <div style="margin: 10px 0;">
                         <van-cell-group>
-                            <van-field value="请输入意见" v-model="commentText" />
+                            <van-field value="请输入意见" v-model="commentText8" />
                         </van-cell-group>
                     </div>
                 </el-collapse-item>
@@ -200,7 +200,7 @@
                 histortData: [],
                 oldData: [],
                 data: [],
-                commentText: "",
+                commentText8: "",
                 oldText: "",
                 newText: "",
                 reason: "",
@@ -361,41 +361,41 @@
             handleSave() {
             },
             handleSubmit() {
-                    this.isSubmit = true;
+                this.isSubmit = true
-                    var json = this.json;
+                var json = this.json
-                    json.hqFlag = '0';
+                json.directorFlag = '0'
-                    json.commentText = this.commentText;
+                json.commentText = this.commentText8
-                    this.$http.post("lawss/activiti/completeTask", {
+                this.$http.post('lawss/activiti/completeTask', {
-                        json: JSON.stringify(json),
+                    json: JSON.stringify(json),
-                        taskId: this.taskIds,
+                    taskId: this.taskIds,
-                        userId: this.$store.getters.userInfo.userId
+                    userId: this.$store.getters.userInfo.userId
-                    }, {}, res => {
+                }, {}, res => {
-                        if (res.success) {
+                    if (res.success) {
-                            this.$message.success("提交成功");
+                        this.$message.success('提交成功')
-                            this.$router.push("/processCenter");
+                        this.$router.push('/processCenter')
-                        }
+                    }
-                        this.isSubmit = false;
+                    this.isSubmit = false
-                    });
+                })
             },
             handleSubmitNo() {
-                if (this.commentText) {
+                if (this.commentText8) {
-                    this.isSubmit = true;
+                    this.isSubmit = true
-                    var json = this.json;
+                    var json = this.json
-                    json.hqFlag = '1';
+                    json.directorFlag = '1'
-                    json.commentText = this.commentText;
+                    json.commentText = this.commentText8
-                    this.$http.post("lawss/activiti/completeTask", {
+                    this.$http.post('lawss/activiti/completeTask', {
                         json: JSON.stringify(json),
                         taskIds: this.taskIds,
                         userId: this.$store.getters.userInfo.userId
                     }, {}, res => {
                         if (res.success) {
-                            this.$message.success("驳回成功");
+                            this.$message.success('驳回成功')
-                            this.$router.push("/processCenter");
+                            this.$router.push('/processCenter')
                         }
-                        this.isSubmit = false;
+                        this.isSubmit = false
-                    });
+                    })
                 } else {
-                    this.$message.warning("请输入反馈意见");
+                    this.$message.warning('请输入反馈意见')
                 }
             },
             getData() {
@@ -416,6 +416,7 @@
                         this.form.cname = data.cname || data.form.cname;
                         this.oldData = JSON.parse(JSON.stringify(data.info))
                         var arr = []
+                        this.commentText8 = data.commentText8 || ''
                         data.info.forEach(item => {
                             if (item.state != '3') {
                                 arr.push(item)

src/pages/processCenter/pages/phone/bzzqyj/step9.vue

@@ -148,7 +148,7 @@
                 <el-collapse-item title="审批意见">
                     <div style="margin: 10px 0;">
                         <van-cell-group>
-                            <van-field value="请输入意见" v-model="commentText" />
+                            <van-field value="请输入意见" v-model="commentText9" />
                         </van-cell-group>
                     </div>
                 </el-collapse-item>
@@ -200,7 +200,7 @@
                 histortData: [],
                 oldData: [],
                 data: [],
-                commentText: "",
+                commentText9: "",
                 oldText: "",
                 newText: "",
                 reason: "",
@@ -373,31 +373,29 @@
             handleTabs(name) {
                 this.active = name;
             },
-            handleSave() {
-            },
             handleSubmit() {
-                    this.isSubmit = true;
+                this.isSubmit = true;
-                    var json = this.json;
+                var json = this.json;
-                    json.hqFlag = '0';
+                json.presidentFlag = '0';
-                    json.commentText = this.commentText;
+                json.commentText = this.commentText9;
-                    this.$http.post("lawss/activiti/completeTask", {
+                this.$http.post("lawss/activiti/completeTask", {
-                        json: JSON.stringify(json),
+                    json: JSON.stringify(json),
-                        taskId: this.taskIds,
+                    taskId: this.taskIds,
-                        userId: this.$store.getters.userInfo.userId
+                    userId: this.$store.getters.userInfo.userId
-                    }, {}, res => {
+                }, {}, res => {
-                        if (res.success) {
+                    if (res.success) {
-                            this.$message.success("提交成功");
+                        this.$message.success("提交成功");
-                            this.$router.push("/processCenter");
+                        this.$router.push("/processCenter");
-                        }
+                    }
-                        this.isSubmit = false;
+                    this.isSubmit = false;
-                    });
+                });
             },
             handleSubmitNo() {
-                if (this.commentText) {
+                if (this.commentText9) {
                     this.isSubmit = true;
                     var json = this.json;
-                    json.hqFlag = '1';
+                    json.presidentFlag = '1';
-                    json.commentText = this.commentText;
+                    json.commentText = this.commentText9;
                     this.$http.post("lawss/activiti/completeTask", {
                         json: JSON.stringify(json),
                         taskIds: this.taskIds,
@@ -426,6 +424,7 @@
                         } else {
                             this.form.fjListId =  data.form.fjListId || data.fjListId
                         }
+                        this.commentText9 = data.commentText9 || ''
                         this.form.cid = data.cid || data.form.cid;
                         this.form.endTime = data.endTime || data.form.endTime;
                         this.form.cname = data.cname || data.form.cname;

src/pages/processCenter/pages/phone/qbrk-product/step10.vue

@@ -3,7 +3,7 @@
     <!--        企标制修订-技术标准流程-->
     <ProcessHeaderPhone toggle>
       <template slot="proName">企标制修订-产品标准</template>
-      <template slot="proNode">审核</template>
+      <template slot="proNode">审定</template>
     </ProcessHeaderPhone>
     <div class="headerTabs">
       <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>

src/pages/processCenter/pages/phone/qbrk/step8.vue

@@ -275,7 +275,7 @@ export default {
       loading: false,
       dataLoading: true,
       drawerModal: false,
-      taskInfo:'起草单位高级经理审核',
+      taskInfo:'批准',
       assigneeNewLoading: false,
       disabledState: true,
       userId:this.$store.getters.userInfo.userId,

src/pages/processCenter/pages/phone/wfhxzg/step2.vue

@@ -288,6 +288,7 @@ export default {
       let json = {
         dockUserList: list,
         passInfo: this.passInfo,
+        passFlag: '0',
         commentText: this.commentInfo
       }
       let flag=false

src/pages/processCenter/pages/phone/wfhxzg/step3.vue

@@ -2,7 +2,7 @@
   <div class="phoneWfhxStep3 phoneBox">
     <ProcessHeaderPhone toggle>
       <template slot="proName">未符合项整改流程</template>
-      <template slot="proNode">确认负责人流程</template>
+      <template slot="proNode">合规排查(上传合规举证材料)</template>
     </ProcessHeaderPhone>
     <div class="headerTabs">
       <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>

src/pages/processCenter/pages/phone/xmpg/step4.vue

@@ -466,7 +466,7 @@ export default {
       if (!this.commentText) {
         this.$message.warning("请填写审批意见");
       } else {
-        this.listForm.dlFlag = "2";
+        this.listForm.passFlag = "1";
         this.listForm.commentText = this.commentText;
         const json = JSON.stringify(this.listForm);
         this.$http.post("lawss/activiti/completeTask", {
@@ -487,7 +487,7 @@ export default {
     //提交事件
     handleSubmit() {
       this.isSubmit = true;
-      this.listForm.dlFlag = "1";
+      this.listForm.passFlag = "0";
       this.listForm.commentText = this.commentText;
       const json = JSON.stringify(this.listForm);
       this.$http.post("lawss/activiti/completeTask", {

src/pages/processCenter/pages/phone/xmpg/step5.vue

@@ -485,7 +485,7 @@ export default {
     //提交事件
     handleSubmit() {
       this.isSubmit = true;
-      this.listForm.dlFlag = "1";
+      this.listForm.dataList = this.dataList
       this.listForm.commentText = this.commentText;
       const json = JSON.stringify(this.listForm);
       this.$http.post("lawss/activiti/completeTask", {

src/pages/processCenter/pages/processList/tabComponents/newProcess/index.vue

@@ -678,7 +678,7 @@ export default {
     padding: 0;
   }
   .el-card {
-    margin: 25px;
+    margin: 15px;
     border-radius: 10px;
   }
   .card-box {
@@ -697,7 +697,7 @@ export default {
         }
       }
       .card-top-right {
-        width: 250px;
+        width: 200px;
         .card-top-right-text {
           margin: 40px 0 5px 0;
           color: #e6e6e6;

src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue

@@ -419,7 +419,7 @@ export default {
                 prcType: row.prcType
               }
             })
-          }else if (row.taskInfo === '起草单位高级经理审核'){
+          }else if (row.taskInfo === '批准'){
             this.$router.push({
               name: 'bussLibrary8',
               query: {

src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue

@@ -389,7 +389,7 @@ export default {
                   verifySarStandard: true,
                 }
               })
-            }else if (mes.taskInfo === '起草单位高级经理审核'){
+            }else if (mes.taskInfo === '批准'){
               this.$router.push({
                 name: 'bussLibrary8',
                 query: {

src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue

@@ -204,6 +204,7 @@
             @pageSizeChange="pageProStateSizeChange"></pagination>
         </div>
       </div>
+      <loading :loading="loading2">数据处理中</loading>
     </el-drawer>
   </div>
 </template>
@@ -213,6 +214,7 @@ export default {
   name: "standInvolveProjectDetail",
   data() {
     return {
+      loading2: false,
       sarProject: {
         standName: "", // 标准政策名称
         standNumber: "", // 标准/政策号
@@ -310,7 +312,8 @@ export default {
       form.current = this.sarProStateTotalPage;
       form.size = this.sarProStatePageSize;
       this.$http.get("sarStandardComplianceAssessResult/productNew", form, {
-        _this: this
+        _this: this,
+        loading: 'loading2'
       }, res => {
         if (res.ok) {
           // res.data.records.forEach((item)=>{

src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/technologyInvolveProject.vue

@@ -239,6 +239,7 @@
                   @pageSizeChange="pageProStateSizeChange"></pagination>
         </div>
       </div>
+      <loading :loading="loading2">数据处理中</loading>
     </el-drawer>
     <el-dialog width='400px' :visible.sync="riskDegreeModal" title="修改技术储备情况">
       <el-select v-model="riskDegree" placeholder="请选择">
@@ -260,6 +261,7 @@
     name: "technologyInvolveProject",
     data () {
       return {
+        loading2: false,
         itemType: false,
         interpretationTime: '',
         riskDegreeModal: false,
@@ -413,7 +415,7 @@
         form.interpretationTime = this.interpretationTime
         this.$http.get('sarStandardComplianceAssessResult/interpretation', form, {
           _this: this,
-          loading: 'loading'
+          loading: 'loading2'
         }, res => {
           if (res.ok) {
             this.sarProStateListDatas = res.data.records