合并分支 'dev_third_stage' 到 'master'

Dev third stage

查看合并请求 laws-nio/laws-weilai!163

jero-web/src/views/documentManage/splitting/index.vue

@@ -244,11 +244,17 @@
 
         })
       },
-      sVisible(val) {
+      sVisible(val,num) {
         this.splitVisible = false
+        if (num == 1){
+          eventBUs.$emit('searchGetData')
+        }
       },
-      iVisible(val) {
+      iVisible(val,num) {
         this.importsVisible = val
+        if (num == 1){
+          eventBUs.$emit('searchGetData')
+        }
       },
       //查询
       searchQuery() {

jero-web/src/views/documentManage/splitting/modules/ImportResult.vue

@@ -43,6 +43,7 @@
                     @click="cancleImports">{{$t('cancel')}}
           </a-button>
           <a-button class="imports-btn imports-sub" type="primary" @click="handleSubmit"
+                    :loading="loading"
                     v-has="'split:sarFileSplitItems:importSplitResult'">{{$t('submit')}}
           </a-button>
         </div>
@@ -57,7 +58,7 @@
         <div class="err-value" v-html="errValue"></div>
         <!--        <span class="err-value">{{errValue}}</span>-->
       </a-modal>
-      <JLoading :loading="loading">{{$t('Submitting')}}</JLoading>
+<!--      <JLoading :loading="loading">{{$t('Submitting')}}</JLoading>-->
       <!--      <split-upload  ref="uploadFile" :disabled="disabled" :title="upload1" :accept="accept" @uploadSuccess="uploadSuccess"></split-upload>-->
     </a-drawer>
   </div>
@@ -290,10 +291,9 @@
               }).then(res => {
                 if (res.data.success) {
                   this.$message.success(this.$t('OperationSuccessful'))
-                  eventBUs.$emit('searchGetData')
                   this.visible = false
                   this.loading = false
-                  this.$emit('visible', false)
+                  this.$emit('visible', false,1)
                 } else {
                   this.loading = false
                   // this.$message.warning(res.data.message)

jero-web/src/views/documentManage/splitting/modules/SplitText.vue

@@ -68,12 +68,12 @@
           <a-button class="split-btn" type="primary" @click="cancelSplit"
                     style='background-color: #f5222d;border: none;margin-right: 15px'>{{$t('cancel')}}
           </a-button>
-          <a-button class="split-btn split-chai" type="primary" @click="submitSplit"
+          <a-button class="split-btn split-chai" type="primary" :loading="loading" @click="submitSplit"
                     v-has="'split:sarFileSplitInfo:add'">{{$t('submit')}}
           </a-button>
         </div>
       </div>
-      <JLoading :loading="loading">{{$t('Submitting')}}</JLoading>
+<!--      <JLoading :loading="loading">{{$t('Submitting')}}</JLoading>-->
     </a-drawer>
   </div>
 </template>
@@ -244,10 +244,9 @@
                   postAction(`split/sarFileSplitInfo/add`, params).then(res => {
                     if (res.success) {
                       this.$message.success(this.$t('OperationSuccessful'))
-                      eventBUs.$emit('searchGetData')
                       this.visible = false
                       this.loading = false
-                      this.$emit('visible', false)
+                      this.$emit('visible', false,1)
                     } else {
                       this.loading = false
                       this.$message.warning(res.message)
@@ -281,10 +280,10 @@
                   postAction(`split/sarFileSplitInfo/add`, params).then(res => {
                     if (res.success) {
                       this.$message.success(this.$t('OperationSuccessful'))
-                      eventBUs.$emit('searchGetData')
+                      // eventBUs.$emit('searchGetData')
                       this.visible = false
                       this.loading = false
-                      this.$emit('visible', false)
+                      this.$emit('visible', false,1)
                     } else {
                       this.loading = false
                       this.$message.warning(res.message)

jero-web/src/views/processCenter/processForm/handshakeProcess/index.vue

@@ -183,19 +183,34 @@
           }
         })
       },
+      rejectCauseAdd(rejectCause,ids) {
+        let rejectTime = moment(new Date()).format('YYYY-MM-DD HH:mm:ss')
+        let query = {
+          rejectUserId:this.userInfo().id,
+          rejectTime:rejectTime,
+          rejectCause:rejectCause,
+          projectLawsInventoryId:ids.join(','),
+          rejectType:'0',
+        }
+        postAction('/project/projectLawsInventoryRejectCauseEO/add', query).then((res) => {
+
+        })
+      },
       completeTask(value, handlingTime) {
         let json = Object.assign(this.queryBy, { handlingTime: handlingTime }, value)
-        let data = JSON.stringify(json).replace(/\"/g, '\'')
+        // if (json.flag == '1'){
-        Object.keys(data).forEach(res => {
+          // this.rejectCauseAdd(value.approvalOpinion,this.queryBy.id)
-          if (data[res] && typeof data[res] == 'string') {
+        // }
-            data[res] = data[res].replace(/\"/g, '“')
+        Object.keys(json).forEach(res => {
-            data[res] = data[res].replace(/\'/g, '‘')
+          if (json[res] && typeof json[res] == 'string') {
+            json[res] = json[res].replace(/\"/g, '“')
+            json[res] = json[res].replace(/\'/g, '‘')
           }
         })
         let query = {
           userid: this.userInfo().id,
           taskId: this.$route.query.taskId || this.$route.query.taskIds,
-          json: data
+          json: JSON.stringify(json).replace(/\"/g, '\'')
         }
         postAction('/workFlow/completeTask', query).then((res) => {
           if (res.success) {