bug修改，到账开票审核按钮判断条件修改

src/views/contractManagement/expenditureContract/modules/ExpenditureContractModule.vue

@@ -246,7 +246,7 @@
           </div>
           <!--        /分期信息-->
           <a-form-item class="table-operator">
-            <a-button type="primary" @click="save" v-preventclick>保存</a-button>
+            <a-button type="primary" @click="save" v-preventclick>提交</a-button>
             <a-button @click="handleCancle">取消</a-button>
           </a-form-item>
         </a-form>
@@ -442,39 +442,46 @@ export default {
       if (this.confirmLoading) {
         return
       }
-      this.confirmLoading = true
       this.form.validateFields((err, values) => {
         if (!err) {
-          if (this.installmentList && this.installmentList.length > 0) {
+          const that = this
-            let formData = {}
+          this.$confirm({
-            formData.installment = this.installmentList
+            title: '确认提交？',
-            formData.contract = Object.assign(this.model, values)
+            content: '提交后将给存档人发送提醒消息',
-            console.log('表单提交数据', formData)
+            onOk: function () {
-            let url = ''
+              that.confirmLoading = true
-            if (!this.model.id) {
+              if (that.installmentList && that.installmentList.length > 0) {
-              url = this.url.add
+                let formData = {}
-            } else {
+                formData.installment = that.installmentList
-              url = this.url.edit
+                formData.contract = Object.assign(that.model, values)
-            }
+                console.log('表单提交数据', formData)
-            postAction(url, formData).then(res => {
+                let url = ''
-              if (res.success) {
+                if (!that.model.id) {
-                this.contractId = res.result.id
+                  url = that.url.add
-                this.$message.success(res.message)
+                } else {
-                // 跳转至支出合同list页面
+                  url = that.url.edit
-                this.$router.push({
+                }
-                  path: '/contractManagement/ExpenditureContract'
+                postAction(url, formData).then(res => {
+                  if (res.success) {
+                    that.contractId = res.result.id
+                    that.$message.success(res.message)
+                    // 跳转至支出合同list页面
+                    that.$router.push({
+                      path: '/contractManagement/ExpenditureContract'
+                    })
+                  } else {
+                    that.$message.warning(res.message)
+                  }
+                }).finally(() => {
+                  setTimeout(() => {
+                    that.confirmLoading = false
+                  }, 1000)
                 })
               } else {
-                this.$message.warning(res.message)
+                that.confirmLoading = false
               }
-            }).finally(() => {
+            }
-              setTimeout(() => {
+          })
-                this.confirmLoading = false
-              }, 1000)
-            })
-          } else {
-            this.confirmLoading = false
-          }
         } else {
           this.confirmLoading = false
         }

src/views/contractManagement/revenueContract/modules/AssociatedProject.vue

@@ -192,22 +192,29 @@ export default {
         this.$message.warn('请至少关联一个项目')
         return
       }
-      this.confirmLoading = true
+      const that = this
-      this.associatedProjectLoading = true
+      this.$confirm({
-      const param = {
+        title: '确认提交？',
-        id: this.contractId,
+        content: '提交后将给存档人发送提醒消息',
-        status: 3
+        onOk: function () {
-      }
+          that.confirmLoading = true
-      submitAudit(param).then(res => {
+          that.associatedProjectLoading = true
-        if (res.success) {
+          const param = {
-          this.$message.success(res.message)
+            id: that.contractId,
-          this.$router.go(-1)
+            status: 3
-        } else {
+          }
-          this.$message.warn(res.message)
+          submitAudit(param).then(res => {
+            if (res.success) {
+              that.$message.success(res.message)
+              that.$router.go(-1)
+            } else {
+              that.$message.warn(res.message)
+            }
+          }).finally(() => {
+            that.confirmLoading = false
+            that.associatedProjectLoading = false
+          })
         }
-      }).finally(() => {
-        this.confirmLoading = false
-        this.associatedProjectLoading = false
       })
     }
   }

src/views/dataNetworkDiskManagement/committee/CommitteeMaintenance.vue

@@ -147,7 +147,7 @@ export default {
           title: '操作',
           dataIndex: 'operation',
           align: 'center',
-          width: 300,
+          width: 520,
           scopedSlots: { customRender: 'operation' }
         }
       ],
@@ -176,6 +176,7 @@ export default {
           title: '职务',
           align: 'center',
           dataIndex: 'post',
+          width: 220,
           scopedSlots: { customRender: 'textRow' }
         }, {
           title: '手机号',

src/views/financialManagement/arriveAndInvoicing/ArriveAndInvoivingList.vue

@@ -116,7 +116,7 @@
             <!--            待审核状态显示审核按钮-->
             <a @click="auditProof(record)"
                class="audit-btn"
-               v-if="record.paymentStatus === 'toBeReviewed'"
+               v-if="record.checkPaymentStatus === 'toBeReviewed'"
                v-has="'incomePaymentAndInvoiving:audit'">审核</a>
             <!--            未审核通过的会议项目不允许在这里来款-->
             <a @click="incomePayment(record)"

src/views/projectManagement/WorkingGroupProjectManagement.vue

@@ -171,7 +171,7 @@ export default {
           dataIndex: 'action',
           align: 'center',
           fixed: 'right',
-          width: 280,
+          width: 500,
           scopedSlots: { customRender: 'action' }
         }
       ],

src/views/projectManagement/WorkingGroupUnderStudyProject.vue

@@ -8,7 +8,7 @@
           <a-row>
             <a-col :xl="6" :lg="7" :md="8" :sm="24">
               <a-form-item label="项目名称" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                <a-input placeholder="请输入项目名称" v-model="queryParam.companyName" :maxLength='50'></a-input>
+                <a-input placeholder="请输入项目名称" v-model="queryParam.projectName" :maxLength='50'></a-input>
               </a-form-item>
             </a-col>
             <a-col :xl="6" :lg="7" :md="8" :sm="24">