合并分支 'dev_20230216' 到 'master'

Dev 20230216

查看合并请求 laws-foton-slrs/foton-laws-system-front!74

src/pages/localTool/standAutoSplit/index.vue

@@ -464,7 +464,7 @@
           style="width: 100%;"
         >
           <el-form-item label="标准号/政策号" prop="standNumSplit" class="search-item btn-box widthLimit">
-            <el-input v-model="uploadFilesplitEo.standNumSplit" :maxlength="100" :disabled="importSplitResultLoading" placeholder="请输入标准号/政策号"></el-input>
+            <el-input v-model="uploadFilesplitEo.standNumSplit" :maxlength="100" :disabled="importSplitResultLoading" placeholder="请输入标准号/政策号" :readOnly="!(uploadFilesplitEo && uploadFilesplitEo.standId)"></el-input>
             <el-button
               type="primary"
               class="common-button-primary"
@@ -474,7 +474,7 @@
             >手动查找</el-button>
           </el-form-item>
           <el-form-item label="标准名称/政策名称" prop="standNameSplit"class="search-item btn-box">
-            <el-input v-model="uploadFilesplitEo.standNameSplit" :maxlength="100" :disabled="importSplitResultLoading" placeholder="请输入标准名称/政策名称"></el-input>
+            <el-input v-model="uploadFilesplitEo.standNameSplit" :maxlength="100" :disabled="importSplitResultLoading" placeholder="请输入标准名称/政策名称" :readOnly="!(uploadFilesplitEo && uploadFilesplitEo.standId)"></el-input>
           </el-form-item>
           <el-form-item label="文本状态" prop="fileType"class="search-item btn-box">
             <el-select v-model="uploadFilesplitEo.fileType" :disabled="importSplitResultLoading">

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

@@ -524,21 +524,48 @@ export default {
       }
       this.qbfsForm.commentText = this.commentText
       let json = JSON.stringify(this.qbfsForm);
-            this.$http.post('lawss/activiti/completeTask', {
+      if(this.type !== '5'){
-              taskIds: this.$route.query.taskIds,
+        let params = {
-              userId: this.$store.getters.userInfo.userId,
+          json,
-              json: json,
+          sort:this.qbfsForm.bussSort[0],
-            }, {
+          prcName:this.qbfsForm.esName
-              _this: this
+
-            }, res => {
+        }
-              if (res.success) {
+          this.endPrcName(params).then((res)=>{
-                this.addLog(this.qbfsForm)
+            if(res){
-                this.$message.success(res.message)
+              this.completeTask()
-                this.$router.push('/processCenter')
+            }
-              }
+          })
-              this.isSubmit = false
+      }else{
-            }, e => {
+        this.completeTask()
-            });
+      }
+
+    },
+    completeTask(){
+      this.$http.post('lawss/activiti/completeTask', {
+        taskIds: this.$route.query.taskIds,
+        userId: this.$store.getters.userInfo.userId,
+        json: json,
+      }, {
+        _this: this
+      }, res => {
+        if (res.success) {
+          this.addLog(this.qbfsForm)
+          this.$message.success(res.message)
+          this.$router.push('/processCenter')
+        }
+        this.isSubmit = false
+      }, e => {
+      });
+    },
+    endPrcName(params){
+      return new Promise((resolve, reject)=>{
+        this.$http._getData('lawss/activiti/endPrcName',params,{}).then(res => {
+          resolve(res)
+        }).catch(e=>{
+          reject(e)
+        })
+      })
     },
     addLog(qbzxdFrom){
       let json = Object.assign(qbzxdFrom);

src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue

@@ -1261,6 +1261,9 @@
                             if (res.ok) {
                                 if (res.message === '操作成功') {
                                     this.$message.success(tips + '成功')
+                                    if(this.DrawerType === 'add'){
+                                        this.addForm.esId = res.data
+                                    }
                                     this.getData()
                                   if(this.DrawerType === 'add'){
                                     this.addForm.addFlag = '1'