报告复核修改、物资管理修改

src/views/modules/cw/reportManagement/reportReview/ReportReviewForm.vue

@@ -12,8 +12,8 @@
                             :rules="[
                    ]">
                 <!--                <el-input v-model="inputForm.projectName" placeholder="请填写项目名称" clearable></el-input>-->
-                <el-input size="medium" :disabled="true" :readonly="true" @focus="openContractForm()" v-model="inputForm.projectName" placeholder="请选择项目名称">
-                  <el-button slot="append" :disabled="true" icon="el-icon-search" @click="openContractForm()"></el-button>
+                <el-input size="medium"  @focus="openContractForm()" v-model="inputForm.projectName" placeholder="请选择项目名称">
+                  <el-button slot="append"  icon="el-icon-search" @click="openContractForm()"></el-button>
                 </el-input>
               </el-form-item>
             </el-col>
@@ -166,7 +166,7 @@
               <el-form-item label="被服务单位" prop="servedUnitName"
                             :rules="[
                    ]">
-                <el-input :disabled="true" :readonly="true" @focus="openWorkClient()" v-model="inputForm.servedUnitName" placeholder="请填写被服务单位" clearable>
+                <el-input  @focus="openWorkClient()" v-model="inputForm.servedUnitName" placeholder="请填写被服务单位" clearable>
                   <el-button slot="append" icon="el-icon-search" @click="openWorkClient()"></el-button>
                 </el-input>
               </el-form-item>
@@ -175,7 +175,7 @@
               <el-form-item label="报告类型" prop="reportType"
                             :rules="[
                    ]">
-                <el-select :disabled="true" v-model="inputForm.reportType" placeholder="请选择报告类型" style="width:100%;">
+                <el-select  v-model="inputForm.reportType" placeholder="请选择报告类型" style="width:100%;">
                   <el-option
                     v-for="item in $dictUtils.getDictList('cw_report_title_type')"
                     :key="item.value"
@@ -189,7 +189,7 @@
               <el-form-item label="业务类型" prop="businessType"
                             :rules="[
                    ]">
-                <el-select :disabled="true" @change="changeBusinessType" v-model="inputForm.businessType" placeholder="请选择业务类型" style="width:100%;">
+                <el-select @change="changeBusinessType" v-model="inputForm.businessType" placeholder="请选择业务类型" style="width:100%;">
                   <el-option
                     v-for="item in $dictUtils.getDictList('cw_business_type')"
                     :key="item.value"
@@ -203,7 +203,7 @@
               <el-form-item label="审计业务类型" prop="auditBusinessType"
                             :rules="[
                    ]">
-                <el-select :disabled="true" v-model="inputForm.auditBusinessType" placeholder="请选择审计业务类型" style="width:100%;">
+                <el-select v-model="inputForm.auditBusinessType" placeholder="请选择审计业务类型" style="width:100%;">
                   <el-option
                     v-for="item in $dictUtils.getDictList('cw_audit_business_type1')"
                     :key="item.value"
@@ -217,7 +217,7 @@
               <el-form-item label="审计业务类型" prop="auditBusinessType"
                             :rules="[
                    ]">
-                <el-select :disabled="true" v-model="inputForm.auditBusinessType" placeholder="请选择审计业务类型" style="width:100%;">
+                <el-select v-model="inputForm.auditBusinessType" placeholder="请选择审计业务类型" style="width:100%;">
                   <el-option
                     v-for="item in $dictUtils.getDictList('cw_audit_business_type2')"
                     :key="item.value"
@@ -231,7 +231,7 @@
               <el-form-item label="审计业务类型" prop="auditBusinessType"
                             :rules="[
                    ]">
-                <el-select :disabled="true" v-model="inputForm.auditBusinessType" placeholder="请选择审计业务类型" style="width:100%;">
+                <el-select v-model="inputForm.auditBusinessType" placeholder="请选择审计业务类型" style="width:100%;">
                   <el-option
                     v-for="item in $dictUtils.getDictList('cw_audit_business_type3')"
                     :key="item.value"
@@ -245,7 +245,7 @@
               <el-form-item label="审计业务类型" prop="auditBusinessType"
                             :rules="[
                    ]">
-                <el-select :disabled="true" v-model="inputForm.auditBusinessType" placeholder="请选择审计业务类型" style="width:100%;">
+                <el-select  v-model="inputForm.auditBusinessType" placeholder="请选择审计业务类型" style="width:100%;">
                   <el-option
                     v-for="item in $dictUtils.getDictList('cw_audit_business_type4')"
                     :key="item.value"
@@ -259,7 +259,7 @@
               <el-form-item label="审计业务类型" prop="auditBusinessType"
                             :rules="[
                    ]">
-                <el-select :disabled="true" v-model="inputForm.auditBusinessType" placeholder="请选择审计业务类型" style="width:100%;">
+                <el-select v-model="inputForm.auditBusinessType" placeholder="请选择审计业务类型" style="width:100%;">
                   <el-option
                     v-for="item in $dictUtils.getDictList('cw_audit_business_type5')"
                     :key="item.value"
@@ -273,7 +273,7 @@
               <el-form-item label="审计业务类型" prop="auditBusinessType"
                             :rules="[
                    ]">
-                <el-select :disabled="true" v-model="inputForm.auditBusinessType" placeholder="请选择审计业务类型" style="width:100%;">
+                <el-select v-model="inputForm.auditBusinessType" placeholder="请选择审计业务类型" style="width:100%;">
                   <el-option
                     v-for="item in $dictUtils.getDictList('cw_audit_business_type6')"
                     :key="item.value"
@@ -638,6 +638,7 @@
         loading: false,
         reviewBys: [],
         inputForm: {
+          cwFileInfoList2: [],
           sealType: '',
           reviewBy: '', // 下一个节点审核人
           reportNumber: '',
@@ -865,7 +866,12 @@
                 this.reviewBys.push(va)
               })
             }
-            this.$refs.enclosure.newUpload('view', data.cwFileInfoList2, 'cwWorkContract', null, null, null, null, false)
+            if (this.status === 'taskFormDetail' || this.status === 'audit') {
+              this.method = 'view'
+            } else {
+              this.method = 'false'
+            }
+            this.$refs.enclosure.newUpload(this.method, data.cwFileInfoList2, 'cwWorkContract', null, null, null, null, false)
             this.$refs.archiveFile.newUpload('view', data.cwFileInfoList, 'cwWorkContract', null, null, null, null, false)
             this.$refs.signatureFile.newUpload('view', data.signatureFileList, 'cwWorkContract', null, null, null, null, false)
             this.loading = false
@@ -954,6 +960,7 @@
           this.inputForm.detailFor1020.forEach(item => { this.inputForm.details.push(item) })
           this.inputForm.detailFor1030.forEach(item => { this.inputForm.details.push(item) })
           this.reportReviewService.save(this.inputForm).then(({data}) => {
+            this.inputForm.cwFileInfoList2 = this.$refs.enclosure.getDataList()
             this.projectReportService.saveForm(this.inputForm).then((da) => {
               callback(data.businessTable, data.businessId, this.inputForm)
               this.loading = false
@@ -976,6 +983,7 @@
           this.inputForm.assignee = this.inputForm.reviewBy
         } else if (status === 'agree') {
           // 审核同意
+          this.inputForm.cwFileInfoList2 = this.$refs.enclosure.getDataList()
           this.inputForm.agreeDate = this.moment(new Date()).format('YYYY-MM-DD HH:mm:ss')
           this.inputForm.agreeUserId = this.$store.state.user.id
           // this.inputForm.status = '5'
@@ -997,6 +1005,8 @@
             this.inputForm.detailFor1020.forEach(item => { this.inputForm.details.push(item) })
             this.inputForm.detailFor1030.forEach(item => { this.inputForm.details.push(item) })
             this.reportReviewService.save(this.inputForm).then(({data}) => {
+              this.inputForm.cwFileInfoList2 = this.$refs.enclosure.getDataList()
+              console.log('this.inputForm', this.inputForm)
               this.projectReportService.saveForm(this.inputForm).then((da) => {
                 callback(data.businessTable, data.businessId, this.inputForm)
                 this.loading = false

src/views/modules/materialManagement/collect/PurchasePageForm.vue

@@ -45,7 +45,7 @@
           <vxe-column type="seq" width="60" title="序号"></vxe-column>
           <vxe-column type="radio" width="40px"></vxe-column>
           <vxe-column min-width="230" align="center" title="商品名称" field="tradeName"></vxe-column>
-          <vxe-column min-width="230" align="center" title="商品数量" field="tradeNumber"></vxe-column>
+<!--          <vxe-column min-width="230" align="center" title="商品数量" field="tradeNumber"></vxe-column>-->
 
         </vxe-table>
         <vxe-pager

src/views/modules/materialManagement/purchase/PurchaseList.vue

@@ -146,8 +146,8 @@
               <el-button v-if="hasPermission('material:edit')&&scope.row.createBy === $store.state.user.id&&scope.row.status==='2'" type="text"  size="small" @click="reback(scope.row)">撤回</el-button>
               <el-button v-if="hasPermission('material:del')&&scope.row.createBy === $store.state.user.id&&(scope.row.status==='1'||scope.row.status==='3')" type="text"   size="small" @click="del(scope.row.id)">删除</el-button>
               <el-button v-else-if="hasPermission('material:del')&&isAdmin&&(scope.row.status==='1'||scope.row.status==='3'||scope.row.status==='4'||scope.row.status==='5')" type="text"   size="small" @click="del(scope.row.id)">删除</el-button>
-              <el-button v-if="hasPermission('material:list')&&scope.row.createBy === $store.state.user.id&&scope.row.status==='5'" type="text" size="small" @click="seeWareHouse(scope.row.id)">入库记录</el-button>
-              <el-button v-if="hasPermission('material:add')&&scope.row.createBy === $store.state.user.id&&scope.row.status==='5'" type="text" size="small" @click="wareHouse(scope.row.id)">入库</el-button>
+              <el-button v-if="hasPermission('material:list')&&scope.row.createBy === $store.state.user.id&&scope.row.status==='5'&&scope.row.purchaseMode==='办公室采购'" type="text" size="small" @click="seeWareHouse(scope.row.id)">入库记录</el-button>
+              <el-button v-if="hasPermission('material:add')&&scope.row.createBy === $store.state.user.id&&scope.row.status==='5'&&scope.row.purchaseMode==='办公室采购'" type="text" size="small" @click="wareHouse(scope.row.id)">入库</el-button>
             </template>
           </vxe-column>
         </vxe-table>

src/views/modules/materialManagement/purchase/SeeWareHouseList.vue

@@ -88,7 +88,9 @@
         searchForm: {
           purchaseSketch: '',
           purchaseId: '',
-          contractDates: []
+          contractDates: [],
+          // 查入库记录所需的状态数组
+          statusTwo: []
         }
       }
     },
@@ -116,6 +118,9 @@
       },
       list () {
         this.loading = true
+        // eslint-disable-next-line no-unused-vars
+        let status = ['0', '5']
+        this.searchForm.statusTwo = status
         // this.searchForm.createId = this.$store.state.user.id
         this.wareHouseService.wareHouseList({
           'current': this.tablePage.currentPage,