Merge remote-tracking branch 'origin/master'

src/api/materialManagement/WareHouseService.js

@@ -8,6 +8,13 @@ export default class WareHouseService {
       params: params
     })
   }
+  reimbursementList (params) {
+    return request({
+      url: '/material/management/wareHouse/reimbursementList',
+      method: 'get',
+      params: params
+    })
+  }
   wareHouseList (param) {
     return request({
       url: '/material/management/wareHouse/wareHouseList',

src/views/modules/cw/reimbursementApproval/info/InfoForm.vue

@@ -91,7 +91,7 @@
               @edit-closed=""
               highlight-current-row
             >
-              <vxe-table-column field="purchaser" title="采购人" :edit-render="{}" :rules="[{required: true, message:'请选择采购人', trigger:'blur'}]"></vxe-table-column>
+              <vxe-table-column field="purchaserAgent" title="采购人" :edit-render="{}" :rules="[{required: true, message:'请选择采购人', trigger:'blur'}]"></vxe-table-column>
               <vxe-table-column field="procurementOffice" title="采购部门" :edit-render="{}"></vxe-table-column>
               <vxe-table-column field="procurementType" title="采购类型" :edit-render="{}" :rules="[{required: true, message:'请选择采购类型', trigger:'blur'}]"></vxe-table-column>
               <vxe-table-column field="tradeName" title="商品名称" :edit-render="{}" :rules="[{required: true, message:'请填写商品名称', trigger:'blur'}]"></vxe-table-column>
@@ -382,7 +382,7 @@
                   <el-input v-model="scope.row.typeName" @focus="typePullForm4(scope.$rowIndex)"></el-input>
                 </template>
               </vxe-table-column>
-              <vxe-table-column field="projectName" title="报销项目" :edit-render="{}" :rules="[{required: true, message:'请选择报销项目', trigger:'blur'}]">
+              <vxe-table-column field="projectName" title="报销详情" :edit-render="{}" :rules="[{required: true, message:'请田小娥报销详情', trigger:'blur'}]">
                 <template v-slot:edit="scope">
                   <el-input v-model="scope.row.projectName" @focus="openProgramPageForm4(scope.$rowIndex, scope.row)"></el-input>
                 </template>
@@ -460,7 +460,7 @@
                   <el-input v-model="scope.row.typeName" @focus="typePullForm5(scope.$rowIndex)"></el-input>
                 </template>
               </vxe-table-column>
-              <vxe-table-column field="projectName" title="报销项目" :edit-render="{}" :rules="[{required: true, message:'请选择报销项目', trigger:'blur'}]">
+              <vxe-table-column field="projectName" title="报销详情" :edit-render="{}" :rules="[{required: true, message:'请填写报销详情', trigger:'blur'}]">
                 <template v-slot:edit="scope">
                   <el-input v-model="scope.row.projectName" @focus="openProgramPageForm5(scope.$rowIndex, scope.row)"></el-input>
                 </template>

src/views/modules/cw/reimbursementApproval/info/ReimbursementForm.vue

@@ -455,7 +455,7 @@
                 <el-input v-model="scope.row.typeName" @focus="typePullForm5(scope.$rowIndex, scope.row.deptId)"></el-input>
               </template>
             </vxe-table-column>
-            <vxe-table-column field="projectName" title="报销项目" :edit-render="{}" :rules="[{required: true, message:'请选择报销项目', trigger:'blur'}]">
+            <vxe-table-column field="projectName" title="报销详情" :edit-render="{}" :rules="[{required: true, message:'请填写报销详情', trigger:'blur'}]">
               <template v-slot:edit="scope">
                 <el-input v-model="scope.row.projectName" @focus="openProgramPageForm5(scope.$rowIndex, scope.row)"></el-input>
               </template>

src/views/modules/materialManagement/materialType/TypeList.vue

@@ -18,7 +18,7 @@
     <div class="bg-white top" style="">
       <vxe-toolbar :refresh="{query: refreshList}" custom>
         <template #buttons>
-          <el-button v-if="hasPermission('program:configuration:type:add')" type="primary" size="small" icon="el-icon-plus" @click="add()">新建</el-button>
+          <el-button v-if="hasPermission('material:type:add')" type="primary" size="small" icon="el-icon-plus" @click="add()">新建</el-button>
 <!--          <el-button v-if="hasPermission('program:configuration:type:del')" type="danger"   size="small" icon="el-icon-delete" @click="del()" :disabled="$refs.typeTable && $refs.typeTable.getCheckboxRecords().length === 0" plain>删除</el-button>-->
         </template>
       </vxe-toolbar>
@@ -46,9 +46,9 @@
 
           <vxe-column title="操作" width="230px" fixed="right" align="center">
             <template  slot-scope="scope">
-              <el-button v-if="hasPermission('reimbursement:type:edit')&&(scope.row.level === '1' || scope.row.level === '2')" type="text"  size="small" @click="addChild(scope.row.id,scope.row.businessType)">添加下级结构</el-button>
-              <el-button v-if="hasPermission('reimbursement:type:edit')" type="text"  size="small" @click="edit(scope.row.id)">修改</el-button>
-              <el-button v-if="hasPermission('reimbursement:type:remove')" type="text"   size="small" @click="del(scope.row.id)">删除</el-button>
+              <el-button v-if="hasPermission('material:type:edit')&&(scope.row.level === '1' || scope.row.level === '2')" type="text"  size="small" @click="addChild(scope.row.id,scope.row.businessType)">添加下级结构</el-button>
+              <el-button v-if="hasPermission('material:type:edit')" type="text"  size="small" @click="edit(scope.row.id)">修改</el-button>
+              <el-button v-if="hasPermission('material:type:remove')" type="text"   size="small" @click="del(scope.row.id)">删除</el-button>
             </template>
           </vxe-column>
         </vxe-table>

src/views/modules/materialManagement/wareHouse/PurchaseChooseForm.vue

@@ -58,7 +58,7 @@
           <vxe-column type="radio" width="40px"></vxe-column>
           <vxe-column min-width="160" align="center" title="采购编号" field="purchaseNo"></vxe-column>
           <vxe-column min-width="160" align="center" title="采购名称" field="purchaseSketch"></vxe-column>
-          <vxe-column min-width="160" align="center" title="经办人" field="handledBy"></vxe-column>
+          <vxe-column min-width="160" align="center" title="经办人" field="handledByName"></vxe-column>
           <vxe-column min-width="160" align="center" title="经办人部门" field="handledByOfficeName"></vxe-column>
           <vxe-column min-width="160" align="center" title="申请时间" field="createDate"></vxe-column>
           <vxe-column min-width="160" align="center" title="采购方式" field="purchaseMode"></vxe-column>
@@ -137,7 +137,7 @@
         this.loading = true
         // this.searchForm.createId = this.$store.state.user.id
         this.searchForm.status = '5'
-        this.wareHouseService.list({
+        this.wareHouseService.reimbursementList({
           'current': this.tablePage.currentPage,
           'size': this.tablePage.pageSize,
           'orders': this.tablePage.orders,