前端： 批量审批优化

src/dashoo.cn/frontend_web/src/components/oilcontract/submitPopup.vue

@@ -332,12 +332,7 @@ export default {
             type: 'success',
             message: res.data.message
           })
-          setTimeout(function () {
-            _this.$nextTick(() => {
-              _this.$emit('refreshPage', {})
-              // TODO loading
-            })
-          }, 5000)
+          _this.$emit('refreshPage', {})
           // _this.$refs['WfHistory'].getHistoryTask()
         } else {
           this.$message({
@@ -402,19 +397,24 @@ export default {
       }
       this.btnloading = true
       let _this = this
-      apiOilcontract['businessSeparateAudit'](this.eveId, params, this.$axios).then(res => {
+      let evaStr = _this.eveId.toString()
+      let evaList = evaStr.split(',')
+      apiOilcontract['businessSeparateAudit'](_this.eveId, params, this.$axios).then(res => {
         if (res.data.code === 0) {
           this.$message({
             type: 'success',
             message: res.data.message
           })
           // _this.$emit('tableLoading', {})
-          setTimeout(function () {
-            _this.$nextTick(() => {
-              _this.$emit('refreshPage', {})
-              // TODO loading
-            })
-          }, 5000)
+          if (evaList.length > 1) {
+            setTimeout(function () {
+              _this.$nextTick(() => {
+                _this.$emit('refreshPage', {})
+                // TODO loading
+              })
+            }, 5000)
+          }
+          _this.$emit('refreshPage', {})
         } else {
           this.$message({
             type: 'warning',
@@ -461,6 +461,8 @@ export default {
       console.log('审批结果提交参数：', params)
       let _this = this
       var apiName = ['contractCommonAudit', 'contractCommonAuditYear']
+      let evaStr = this.eveId.toString()
+      let evaList = evaStr.split(',')
       apiOilcontract[apiName[this.examineType]](this.eveId, params, this.$axios).then(res => {
         if (res.data.code === 0) {
           console.log('审批提交，成功返回')
@@ -469,12 +471,15 @@ export default {
             message: res.data.message
           })
           // _this.$emit('tableLoading', {})
-          setTimeout(function () {
-            _this.$nextTick(() => {
-              _this.$emit('refreshPage', {})
-              // TODO loading
-            })
-          }, 5000)
+          if (evaList.length > 1) {
+            setTimeout(function () {
+              _this.$nextTick(() => {
+                _this.$emit('refreshPage', {})
+                // TODO loading
+              })
+            }, 5000)
+          }
+          _this.$emit('refreshPage', {})
         } else {
           this.$message({
             type: 'warning',

src/dashoo.cn/frontend_web/src/pages/oilcontract/contract-basis/_opera/evaluate.vue

@@ -41,7 +41,7 @@
               <el-button type="primary" size="mini" style="margin-left: 8px" @click="commonAuditClick(1)">提交审核</el-button> -->
 
           <el-button type="primary" size="mini"
-                     v-if="((Number(formData.Status) <= 0 && saveButton) || (formData.Status == '4' && auditBtn)  || (formData.Status == '7' && auditBtn)) && formData.IsBusiness != 1"
+                     v-if="((Number(formData.Status) <= 0 && saveButton) || (formData.Status == '4' && auditBtn)  || (formData.Status == '7' && auditBtn)) && (formData.IsBusiness != 1 && byBus != 1)"
                      @click="onSeaveBigAdd(1)"><span v-if="formData.Status == '0' && serviceId == 'add'">创建日常评价</span><span v-else>保存</span></el-button>
           <el-button type="primary" size="mini"
                      v-if="((Number(formData.Status) <=0 && saveButtonForBusiness) || (formData.Status == '7' && saveButtonForBusiness)) && (formData.IsBusiness == 1 || byBus == 1)"
@@ -110,7 +110,7 @@
               <el-row>
                 <el-col :span="8">
                   <el-form-item label="合同总工期">
-                    <el-input :disabled="disabled" v-model="contractData.ContractPeriod" placeholder="请输入" @change="dateChange" style="width: 100%">
+                    <el-input :disabled="disabled" v-model="contractData.ContractPeriod" placeholder="请输入" style="width: 100%">
                       <template slot="append">(天)</template>
                     </el-input>
                   </el-form-item>
@@ -206,13 +206,13 @@
                      :ContractClass="contractData.ContractClass" :isBusiness="isBusiness" :disabledForm="auditBtnBoolean"></base-list>
         </el-tab-pane>
         <el-tab-pane label="专业处室业绩评价" name="3"
-                     v-if="(departmentBoolean||Number(formData.Status)>4||Number(formData.Status)<=-4) && formData.IsBusiness != 1">
+                     v-if="(departmentBoolean||Number(formData.Status)>4||Number(formData.Status)<=-4) && (formData.IsBusiness != 1 && byBus !=1)">
           <evaluation-list ref="evaluation_list_two" :evaluateId="formData.Id" category="1" v-if="contractData.ContractClass"
                            :ContractClass="contractData.ContractClass"
                            :disabledForm="auditBtnBooleanZhuan"></evaluation-list>
         </el-tab-pane>
         <el-tab-pane
-          v-if="(departmentBoolean||Number(formData.Status)>4||Number(formData.Status)<=-4)&&contractData.ContractClass=='02' && formData.IsBusiness != 1"
+          v-if="(departmentBoolean||Number(formData.Status)>4||Number(formData.Status)<=-4)&&contractData.ContractClass=='02' && (formData.IsBusiness != 1 && byBus != 1)"
           label="专业处室基本条件评价" name="5">
           <base-list ref="evaluation_listType_two" :evaluateId="formData.Id" category="1"
                      :ContractClass="contractData.ContractClass" :disabledForm="auditBtnBooleanZhuan"></base-list>

src/dashoo.cn/frontend_web/src/pages/oilcontract/contract-basis/index.vue

@@ -674,6 +674,7 @@ export default {
         console.log('评价接口', res)
         this.entityList = res.data.items
         this.currentItemCount = res.data.currentItemCount
+        this.selectAllButtonBoolean = false
       }).catch(err => {
         this.tableLoading = false
         console.error(err)

src/dashoo.cn/frontend_web/src/pages/oilcontract/contract-goods/_opera/evaluate.vue

@@ -41,7 +41,7 @@
               <el-button type="primary" size="mini" style="margin-left: 8px" @click="commonAuditClick(1)">提交审核</el-button> -->
 
           <el-button type="primary" size="mini"
-                     v-if="((Number(formData.Status) <= 0 && saveButton) || (formData.Status == '4' && auditBtn)  || (formData.Status == '7' && auditBtn)) && formData.IsBusiness != 1"
+                     v-if="((Number(formData.Status) <= 0 && saveButton) || (formData.Status == '4' && auditBtn)  || (formData.Status == '7' && auditBtn)) && (formData.IsBusiness != 1 && byBus != 1)"
                      @click="onSeaveBigAdd(1)"><span v-if="formData.Status == '0' && serviceId == 'add'">创建日常评价</span><span v-else>保存</span></el-button>
           <el-button type="primary" size="mini"
                      v-if="((Number(formData.Status) <=0 && saveButtonForBusiness) || (formData.Status == '7' && saveButtonForBusiness)) && (formData.IsBusiness == 1 || byBus == 1)"
@@ -110,7 +110,7 @@
               <el-row>
                 <el-col :span="8">
                   <el-form-item label="合同总工期">
-                    <el-input :disabled="disabled" v-model="contractData.ContractPeriod" placeholder="请输入" @change="dateChange" style="width: 100%">
+                    <el-input :disabled="disabled" v-model="contractData.ContractPeriod" placeholder="请输入" style="width: 100%">
                       <template slot="append">(天)</template>
                     </el-input>
                   </el-form-item>
@@ -207,13 +207,13 @@
         </el-tab-pane>
         <!-- v-if="formData.Status=='4'||Number(formData.Status)>4" -->
         <el-tab-pane label="专业处室业绩评价" name="3"
-                     v-if="(departmentBoolean||Number(formData.Status)>4||Number(formData.Status)<=-4) && formData.IsBusiness != 1">
+                     v-if="(departmentBoolean||Number(formData.Status)>4||Number(formData.Status)<=-4) && (formData.IsBusiness != 1 && byBus !=1)">
           <evaluation-list ref="evaluation_list_two" :evaluateId="formData.Id" category="1" v-if="contractData.ContractClass"
                            :ContractClass="contractData.ContractClass"
                            :disabledForm="auditBtnBooleanZhuan"></evaluation-list>
         </el-tab-pane>
         <el-tab-pane
-          v-if="((departmentBoolean||Number(formData.Status)>4||Number(formData.Status)<=-4)&&contractData.ContractClass=='02') && formData.IsBusiness != 1"
+          v-if="((departmentBoolean||Number(formData.Status)>4||Number(formData.Status)<=-4)&&contractData.ContractClass=='02') && (formData.IsBusiness != 1 && byBus != 1)"
           label="专业处室基本条件评价" name="5">
           <base-list ref="evaluation_listType_two" :evaluateId="formData.Id" category="1"
                      :ContractClass="contractData.ContractClass" :disabledForm="auditBtnBooleanZhuan"></base-list>

src/dashoo.cn/frontend_web/src/pages/oilcontract/contract-goods/index.vue

@@ -661,6 +661,7 @@ export default {
         this.tableLoading = false
         this.entityList = res.data.items
         this.currentItemCount = res.data.currentItemCount
+        this.selectAllButtonBoolean = false
       }).catch(err => {
         this.tableLoading = false
         console.error(err)

src/dashoo.cn/frontend_web/src/pages/oilcontract/contract-service/_opera/evaluate.vue

@@ -41,11 +41,11 @@
               <el-button type="primary" size="mini" style="margin-left: 8px" @click="commonAuditClick(1)">提交审核</el-button> -->
 
           <el-button type="primary" size="mini"
-                     v-if="((Number(formData.Status) <=0 && saveButton) || (formData.Status == '4' && auditBtn) || (formData.Status == '7' && auditBtn)) && formData.IsBusiness != 1"
-                     @click="onSeaveBigAdd(1)"><span v-if="formData.Status == '0' && serviceId == 'add'">创建日常评价</span><span v-else>保存</span></el-button>
+                     v-if="((Number(formData.Status) <=0 && saveButton) || (formData.Status == '4' && auditBtn) || (formData.Status == '7' && auditBtn)) && (formData.IsBusiness != 1 && byBus != 1)"
+                     @click="onSeaveBigAdd(1)"><span v-if="formData.Status == '0' && serviceId == 'add'">创建日常评价</span><span v-else>保存0</span></el-button>
           <el-button type="primary" size="mini"
                      v-if="((Number(formData.Status) <=0 && saveButtonForBusiness) || (formData.Status == '7' && saveButtonForBusiness)) && (formData.IsBusiness == 1 || byBus == 1)"
-                     @click="onSaveEvaByBusiness(1)"><span v-if="formData.Status == '0' && serviceId == 'add'">创建日常评价</span><span v-else>保存</span></el-button> <!-- 处室保存 -->
+                     @click="onSaveEvaByBusiness(1)"><span v-if="formData.Status == '0' && serviceId == 'add'">创建日常评价</span><span v-else>保存1</span></el-button> <!-- 处室保存 -->
           <el-button @click="onBack" type="primary" size="mini" style="margin-left: 8px">返回</el-button>
         </span>
       </div>
@@ -110,7 +110,7 @@
               <el-row>
                 <el-col :span="8">
                   <el-form-item label="合同总工期">
-                    <el-input :disabled="disabled" v-model="contractData.ContractPeriod" placeholder="请输入" @change="dateChange" style="width: 100%">
+                    <el-input :disabled="disabled" v-model="contractData.ContractPeriod" placeholder="请输入" style="width: 100%">
                       <template slot="append">(天)</template>
                     </el-input>
                   </el-form-item>
@@ -206,13 +206,13 @@
         </el-tab-pane>
         <!-- v-if="formData.Status=='4'||Number(formData.Status)>4" -->
         <el-tab-pane label="专业处室业绩评价" name="3"
-                     v-if="(departmentBoolean||Number(formData.Status)>4||Number(formData.Status)<=-4) && formData.IsBusiness != 1">
+                     v-if="(departmentBoolean||Number(formData.Status)>4||Number(formData.Status)<=-4) && (formData.IsBusiness != 1 && byBus != 1)">
           <evaluation-list ref="evaluation_list_two" :evaluateId="formData.Id" category="1" v-if="contractData.ContractClass"
                            :ContractClass="contractData.ContractClass"
                            :disabledForm="auditBtnBooleanZhuan"></evaluation-list>
         </el-tab-pane>
         <el-tab-pane
-          v-if="(departmentBoolean||Number(formData.Status)>4||Number(formData.Status)<=-4)&&contractData.ContractClass=='02' && formData.IsBusiness != 1"
+          v-if="(departmentBoolean||Number(formData.Status)>4||Number(formData.Status)<=-4)&&contractData.ContractClass=='02' && (formData.IsBusiness != 1 && byBus != 1)"
           label="专业处室基本条件评价" name="5">
           <base-list ref="evaluation_listType_two" :evaluateId="formData.Id" category="1"
                      :ContractClass="contractData.ContractClass" :disabledForm="auditBtnBooleanZhuan"></base-list>
@@ -522,7 +522,7 @@ export default {
     },
     // 业务处室保存评价
     onSaveEvaByBusiness (val) {
-      if (this.formData.Status <= 0) { // 业务处室保存评价
+      if (this.formData.Status <= 0 || this.formData.Status == '7') { // 业务处室保存评价
         this.evaluation_list = this.$refs.evaluation_list_one.entityListData.entityList
         if (this.contractData.ContractClass == '02') {
           this.evaluation_list = this.evaluation_list.concat(this.$refs.evaluation_listType_one.entityListData.entityList)

src/dashoo.cn/frontend_web/src/pages/oilcontract/contract-service/index.vue

@@ -668,6 +668,7 @@ export default {
         console.log('评价接口', res)
         this.entityList = res.data.items
         this.currentItemCount = res.data.currentItemCount
+        this.selectAllButtonBoolean = false
       }).catch(err => {
         this.tableLoading = false
         console.error(err)