bug

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

@@ -1130,7 +1130,7 @@
     import ProcessHeader from '../../components/ProcessHeader'
     import ProcessFooter from '../../components/ProcessFooter'
     import ProcessTitle from '../../components/ProcessTitle'
-    import {saveTaskFirst} from "api/process";
+    import {saveTaskFirst, queryTaskFirst} from "api/process";
     import TreeSelect from '@/components/treeSelect/treeSelect.vue';
     import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue';
 
@@ -1444,6 +1444,18 @@
             },
         },
         methods: {
+          getTaskId () {
+            queryTaskFirst({
+              bpnId: this.$route.query.bpnId
+            }).then(res => {
+              this.verifySarStandard = this.$route.query.verifySarStandard
+              let mes = JSON.parse(res.mes)
+              mes.form.date = new Date(this.$moment(mes.form.date).format('YYYY-MM-DD'))
+              this.form = mes.form
+              this.roleForm = mes.roleForm
+              this.commentText = mes.commentText
+            })
+          },
           // 将文本状态的id与name对应
           setMap(data){
             data.forEach(item => {
@@ -2036,15 +2048,20 @@
                 // _formData.append('id', this.bpnId)
                 _formData.append('createUser', this.$store.getters.userInfo.userId)
                 _formData.append('createUserName', this.$store.getters.userInfo.uName)
-                _formData.append('prcType', this.$route.query.type)
+                _formData.append('prcType', '1')
                 _formData.append('json', JSON.stringify({
-                    prcForm: this.prcForm,
+                    // prcForm: this.prcForm,
-                    sarAccessInfoList: this.sarAccessInfoList,
+                    // sarAccessInfoList: this.sarAccessInfoList,
-                    sarAccessInfoListADMIN: this.sarAccessInfoListADMIN,
+                    // sarAccessInfoListADMIN: this.sarAccessInfoListADMIN,
-                    bzqdForm: this.bzqdForm,
+                    // bzqdForm: this.bzqdForm,
-                    listInfo: this.listInfo,
+                    // listInfo: this.listInfo,
-                    id: this.id
+                    // id: this.id
+                  taskInfo: '申请人发起',
+                  form: this.form,
+                  roleForm: this.roleForm,
+                  commentText: this.commentText
                 }))
+              console.log(_formData, '参数')
                 saveTaskFirst(_formData).then(res => {
                     this.saveLoading = false
                     this.$message.success('保存成功')
@@ -2123,6 +2140,7 @@
             },
         },
         mounted () {
+          this.getTaskId()
             this.getTree()
             this.$http.get('sys/dictype/getDicTypeListCode', '', {
                 _this: this

src/pages/processCenter/pages/creatProcess/bzrk/step2.vue

@@ -514,25 +514,38 @@
                     </div>
                 </el-form>
             </div>
-            <div>
+          <div>
-                <el-collapse accordion v-model="activeName">
+            <el-collapse accordion v-model="activeName">
-                    <el-collapse-item title="意见填写" name = "1">
+              <el-collapse-item title="意见填写" name = "1">
-                        <div style="margin: 10px 0;">
+                <div style="margin: 10px 0;">
-                            <el-select v-model="approvalOpinion" placeholder="请审批" style="margin-bottom: 20px;">
+                  <el-form
-                                <el-option label="驳回" value="1"></el-option>
+                      ref="formTongGuo"
-                                <el-option label="通过" value="0"></el-option>
+                      :model="formTongGuo"
-                            </el-select>
+                      :rules="rules">
-                            <el-input
+                    <el-form-item
-                                    type="textarea"
+                        prop="approvalOpinion"
-                                    :rows="3"
+                    >
-                                    resize="none"
+                      <el-select @change="getRule" v-model="formTongGuo.approvalOpinion" placeholder="请审批" style="margin-bottom: 20px;">
-                                    placeholder="请输入意见"
+                        <el-option label="驳回" value="1"></el-option>
-                                    v-model="commentText">
+                        <el-option label="通过" value="0"></el-option>
-                            </el-input>
+                      </el-select>
-                        </div>
+                    </el-form-item>
-                    </el-collapse-item>
+                    <el-form-item
-                </el-collapse>
+                        prop="commentText"
-            </div>
+                    >
+                      <el-input
+                          type="textarea"
+                          :rows="3"
+                          resize="none"
+                          placeholder="请输入意见"
+                          v-model="formTongGuo.commentText">
+                      </el-input>
+                    </el-form-item>
+                  </el-form>
+                </div>
+              </el-collapse-item>
+            </el-collapse>
+          </div>
         </div>
         <div class="content" v-if="active === '2'">
             <div class="block" style="padding-top: 20px;">
@@ -650,7 +663,7 @@
           </div>
         </div>
         <ProcessFooter
-                show-save
+                :show-save="false"
                 show-submit
                 :submitLoading="isSubmit"
                 :saveLoading="saveLoading"
@@ -672,6 +685,10 @@
         name: "bzrkStep2",
         data () {
             return {
+              rules: {
+                commentText: [{ required: true, message: '请输入意见', trigger: 'blur' }],
+                approvalOpinion: [{ required: true, message: '请选择审批意见', trigger: 'change' }]
+              },
               activeName:'1',
               // 当前流程类型(1待办/2已办)
               processType: 1,
@@ -679,8 +696,10 @@
                 userId:this.$store.getters.userInfo.userId,
                 taskIds: this.$route.query.taskIds,
                 pId: this.$route.query.prcId,
+              formTongGuo: {
                 approvalOpinion: '', // 通过/驳回
                 commentText: '', // 意见
+              },
                 title: '', // 新增编辑抽屉标题
                 ListModel: false, // 新增编辑抽屉开关
                 active: '1', // 默认显示
@@ -825,6 +844,11 @@
         },
       },
         methods: {
+          getRule(){
+            if (this.formTongGuo.approvalOpinion !== '1') {
+              this.$refs.formTongGuo.clearValidate('commentText')
+            }
+          },
             popoverHide (checkedIds, checkedData) {
                 if(checkedData) {
                     this.form.standSystem = checkedData.id
@@ -927,51 +951,34 @@
             handleTabs(name) {
                 this.active = name
             },
-            handleSave() {
+            handleSave() {},
-              this.saveLoading = true
-              let _formData = new FormData()
-              // _formData.append('id', this.bpnId)
-              _formData.append('createUser', this.$store.getters.userInfo.userId)
-              _formData.append('createUserName', this.$store.getters.userInfo.uName)
-              _formData.append('prcType', this.$route.query.type)
-              _formData.append('json', JSON.stringify({
-                prcForm: this.prcForm,
-                sarAccessInfoList: this.sarAccessInfoList,
-                sarAccessInfoListADMIN: this.sarAccessInfoListADMIN,
-                bzqdForm: this.bzqdForm,
-                listInfo: this.listInfo,
-                id: this.id
-              }))
-              saveTaskFirst(_formData).then(res => {
-                this.saveLoading = false
-                this.$message.success('保存成功')
-                // this.bpnId = res.result
-              }).catch(e => {
-                this.saveLoading = false
-              })
-            },
             handleSubmit() {
-                this.isSubmit = true
+              this.$refs['formTongGuo'].validate((valid) => {
-                this.form.commentText = this.commentText
+                    if (valid) {
-                this.form.approvalOpinion = this.approvalOpinion
+                      this.isSubmit = true
-                const json = JSON.stringify(this.form);
+                      this.form.commentText = this.formTongGuo.commentText
-                this.$http.post('lawss/activiti/completeTask', {
+                      this.form.approvalOpinion = this.formTongGuo.approvalOpinion
-                    taskIds: this.taskIds,
+                      const json = JSON.stringify(this.form);
-                    userId : this.userId,
+                      this.$http.post('lawss/activiti/completeTask', {
-                    json: json
+                        taskIds: this.taskIds,
-                }, {
+                        userId : this.userId,
-                    _this: this
+                        json: json
-                }, res => {
+                      }, {
-                    console.log(res);
+                        _this: this
-                    if (res.success) {
+                      }, res => {
-                        if(this.approvalOpinion === '1'){
+                        console.log(res);
+                        if (res.success) {
+                          if(this.formTongGuo.approvalOpinion === '1'){
                             this.$message.warning("驳回成功")
                             this.isSubmit = false
-                        }else{
+                            // 流程提交之后，应该流转至待办任务页面
+                            this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
+                          }else{
                             this.processCreateStand(json)
+                          }
                         }
-                    }
+                      })
-                })
+                    }})
             },
 
             /**

src/pages/processCenter/pages/creatProcess/bzrk/step3.vue

@@ -643,7 +643,7 @@
       </div>
     </div>
     <ProcessFooter
-        show-save
+        :show-save="false"
         show-submit
         :submitLoading="isSubmit"
         :saveLoading="saveLoading"

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

@@ -1009,6 +1009,7 @@
 </template>
 
 <script>
+import {saveTaskFirst, queryTaskFirst} from "api/process";
 import ProcessHeader from '../../components/ProcessHeader'
 import ProcessFooter from '../../components/ProcessFooter'
 import ProcessTitle from '../../components/ProcessTitle'
@@ -1243,6 +1244,17 @@ export default {
     },
   },
   methods: {
+    getTaskId () {
+      queryTaskFirst({
+        bpnId: this.$route.query.bpnId
+      }).then(res => {
+        let mes = JSON.parse(res.mes)
+        mes.form.date = new Date(this.$moment(mes.form.date).format('YYYY-MM-DD'))
+        this.form = mes.form
+        this.roleForm = mes.roleForm
+        this.commentText = mes.commentText
+      })
+    },
     choiceZRR1 (type, title, id) {
       this.drawerTitle = title
       this.modalShowFlag1 = true
@@ -1634,7 +1646,27 @@ export default {
     handleTabs(name) {
       this.active = name
     },
-    handleSave() {},
+    handleSave() {
+      this.saveLoading = true
+      let _formData = new FormData()
+      // _formData.append('id', this.bpnId)
+      _formData.append('createUser', this.$store.getters.userInfo.userId)
+      _formData.append('createUserName', this.$store.getters.userInfo.uName)
+      _formData.append('prcType', '1')
+      _formData.append('json', JSON.stringify({
+        form: this.form,
+        roleForm: this.roleForm,
+        commentText: this.commentText,
+        taskInfo: '申请人修订',
+      }))
+      saveTaskFirst(_formData).then(res => {
+        this.saveLoading = false
+        this.$message.success('保存成功')
+        // this.bpnId = res.result
+      }).catch(e => {
+        this.saveLoading = false
+      })
+    },
     handleSubmit() {
       this.$refs['form'].validate((valid) => {
           if (valid) {
@@ -1688,6 +1720,7 @@ export default {
     this.getData()
   },
   mounted () {
+    this.getTaskId()
     this.processTable()
     this.$http.get('sys/dictype/getDicTypeListCode', '', {
       _this: this

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

@@ -212,9 +212,34 @@ export default {
       this.queryProcess()
     },
     dealWith (row) { // 办理
+      debugger
       //草稿办理待开发
       const { prcType, id } = row
+      const mes = JSON.parse(row.mes)
       switch (prcType) {
+        // 标准入库、
+        case '1':
+          if (mes.taskInfo === '申请人发起') {
+            this.$router.push({
+              name: 'bzrkStep1',
+              query: {
+                type: '1',
+                processName: '申请人发起流程',
+                bpnId: id,
+                verifySarStandard: true,
+              }
+            })
+          } else if (mes.taskInfo === '申请人修订') {
+            this.$router.push({
+              name: 'bzrkStep4',
+              query: {
+                type: '1',
+                processName: '申请人修订流程',
+                bpnId: id
+              }
+            })
+          }
+          break
               // 法规入库及评估流程
         case '2':
           this.$router.push({

src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue

@@ -865,6 +865,9 @@
                 label="标准号"
                 align="center"
               >
+                <template slot-scope="scope">
+                  <span>{{ scope.row.standSortShow }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</span>
+                </template>
               </el-table-column>
               <el-table-column
                 prop="standName"
@@ -3534,11 +3537,11 @@ export default {
           loading: 'isSubmit'
         }, res => {
           this.configStandFlag = false
-          this.$message({
+          // this.$message({
-            showClose: true,
+          //   showClose: true,
-            message: '配置标准成功!',
+          //   message: '配置标准成功!',
-            type: 'success'
+          //   type: 'success'
-          })
+          // })
           this.getDomesticStandardTable()
         }, e => {
         })