Merge remote-tracking branch 'origin/master'

src/api/cw/reimbursementApproval/ReimbursementApprovalService.js

@@ -8,6 +8,13 @@ export default class ReimbursementApprovalService {
       params: param
     })
   }
+  reportNoList (param) {
+    return request({
+      url: '/reimbursementApproval/info/reportNoList',
+      method: 'get',
+      params: param
+    })
+  }
   projectList (params) {
     return request({
       url: '/reimbursementApproval/info/projectList',

src/views/modules/cw/projectReportArchive/ProjectReportArchiveList.vue

@@ -126,13 +126,13 @@
               <span v-else>{{commonJS.isNotEmpty(scope.row.cwProjectRecordsDTO)?scope.row.cwProjectRecordsDTO.projectName:''}}</span>
             </template>
           </vxe-column>
+          <vxe-column min-width="220" align="center" title="报告文号" field="reportNo"></vxe-column>
           <vxe-column min-width="150" align="center" title="项目经理" field="cwProjectRecordsDTO.projectMasterName"></vxe-column>
           <vxe-column min-width="230" align="center" title="被审计单位" field="auditedUnitsName"></vxe-column>
           <vxe-column min-width="150" align="center" title="报告册数" field="reportNum"></vxe-column>
           <vxe-column min-width="150" align="center" title="底稿册数" field="papersNum"></vxe-column>
           <vxe-column min-width="150" align="center" title="档案年度" field="year"></vxe-column>
           <vxe-column min-width="230" align="center" title="案卷号" field="number"></vxe-column>
-          <vxe-column min-width="200" align="center" title="报告号" field="reportNo"></vxe-column>
           <vxe-column min-width="200" align="center" title="归档时间" field="auditDate"></vxe-column>
           <vxe-column min-width="150" align="center" title="创建人" field="createBy.name"></vxe-column>
           <vxe-column min-width="200" align="center" title="创建时间" field="createDate"></vxe-column>

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

@@ -17,10 +17,10 @@
         <el-form size="small" :inline="true" class="query-form" ref="searchForm" :model="searchForm" @keyup.enter.native="refreshList()" @submit.native.prevent>
           <!-- 搜索框-->
           <el-form-item label="项目名称" prop="name">
-            <el-input size="small" v-model="searchForm.name" placeholder="请输入项目名称" clearable></el-input>
+            <el-input size="small" v-model="searchForm.projectName" placeholder="请输入项目名称" clearable></el-input>
           </el-form-item>
           <el-form-item label="项目编号" prop="no">
-            <el-input size="small" v-model="searchForm.no" placeholder="请输入项目编号" clearable></el-input>
+            <el-input size="small" v-model="searchForm.projectNumber" placeholder="请输入项目编号" clearable></el-input>
           </el-form-item>
 
           <el-form-item>
@@ -47,14 +47,15 @@
           :checkbox-config="{}">
           <vxe-column type="seq" width="60" title="序号"></vxe-column>
           <vxe-column type="checkbox" width="40px"></vxe-column>
-
-          <vxe-column  title="项目名称" field="name"></vxe-column>
-          <vxe-column width="200px" title="项目编号" field="no"></vxe-column>
-<!--          <vxe-column width="150px" title="报告号" field="clientName"></vxe-column>-->
-          <vxe-column width="150px" title="登记人" field="createBy"></vxe-column>
-<!--          <vxe-column width="150px" title="责任人" field="createDate"></vxe-column>-->
-          <vxe-column width="100px" title="委托方" field="clientName"></vxe-column>
-          <vxe-column width="100px" title="是否开票" field="isInvoice"></vxe-column>
+          <vxe-column min-width="230" align="center" title="项目名称" field="projectName"></vxe-column>
+          <vxe-column min-width="160" align="center" title="项目编号" field="projectNumber"></vxe-column>
+          <vxe-column min-width="160" align="center" title="合同名称" field="contractName"></vxe-column>
+          <vxe-column min-width="160" align="center" title="创建人" field="createBy.name"></vxe-column>
+          <vxe-column min-width="160" align="center" title="创建时间" field="createDate"></vxe-column>
+<!--          <vxe-column  title="项目名称" field="name"></vxe-column>-->
+<!--          <vxe-column width="200px" title="项目编号" field="no"></vxe-column>-->
+<!--          <vxe-column width="150px" title="登记人" field="createBy"></vxe-column>-->
+<!--          <vxe-column width="100px" title="委托方" field="clientName"></vxe-column>-->
 
         </vxe-table>
         <vxe-pager
@@ -88,8 +89,9 @@
 </template>
 
 <script>
-  import ProgramProjectListInfoService from '@/api/program/ProgramProjectListInfoService'
-  import ReimbursementApprovalService from '@/api/cw/reimbursementApproval/ReimbursementApprovalService'
+  import ProjectRecordsService from '@/api/cw/projectRecords/ProjectRecordsService'
+  // import ProgramProjectListInfoService from '@/api/program/ProgramProjectListInfoService'
+  // import ReimbursementApprovalService from '@/api/cw/reimbursementApproval/ReimbursementApprovalService'
   export default {
     data () {
       return {
@@ -105,8 +107,8 @@
         },
         dataList: [],
         searchForm: {
-          name: '',
-          no: '',
+          projectName: '',
+          projectNumber: '',
           createBy: ''
         },
         checkType: '',
@@ -115,11 +117,13 @@
         num: true // num为true是多选，false是单选
       }
     },
-    programProjectListInfoService: null,
-    reimbursementApprovalService: null,
+    projectRecordsService: null,
+    // programProjectListInfoService: null,
+    // reimbursementApprovalService: null,
     created () {
-      this.programProjectListInfoService = new ProgramProjectListInfoService()
-      this.reimbursementApprovalService = new ReimbursementApprovalService()
+      this.projectRecordsService = new ProjectRecordsService()
+      // this.programProjectListInfoService = new ProgramProjectListInfoService()
+      // this.reimbursementApprovalService = new ReimbursementApprovalService()
     },
     components: {
     },
@@ -176,7 +180,8 @@
       },
       list () {
         this.loading = true
-        this.reimbursementApprovalService.projectList({
+        this.searchForm.status = '5'
+        this.projectRecordsService.list({
           'current': this.tablePage.currentPage,
           'size': this.tablePage.pageSize,
           'orders': this.tablePage.orders,
@@ -186,7 +191,7 @@
           this.tablePage.total = data.total
           this.loading = false
         })
-        // this.programProjectListInfoService.list({
+        // this.reimbursementApprovalService.projectList({
         //   'current': this.tablePage.currentPage,
         //   'size': this.tablePage.pageSize,
         //   'orders': this.tablePage.orders,

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

@@ -121,9 +121,9 @@
           <vxe-column width="200" title="报告号" field="reportNumber"></vxe-column>
           <vxe-column width="100" title="经办人" field="userName"></vxe-column>
           <vxe-column width="100" title="报销人" field="name"></vxe-column>
-          <vxe-column width="200" title="报销部门" field="deptName"></vxe-column>
+          <vxe-column width="100" title="报销部门" field="deptName"></vxe-column>
           <vxe-column width="100" title="报销日期" field="reimDate"></vxe-column>
-          <vxe-column width="100" title="报销金额" field="number"></vxe-column>
+          <vxe-column width="150" title="报销金额(元)" field="number"></vxe-column>
           <vxe-column width="100" title="状态" field="type">
             <template slot-scope="scope">
               <el-button type="text" @click="detail(scope.row)" :type="$dictUtils.getDictLabel('status_info', scope.row.type, '-')" effect="dark" size="mini">{{$dictUtils.getDictLabel("status", scope.row.type, '未开始')}} </el-button>

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

@@ -63,7 +63,8 @@
           @cell-click=""
           @edit-closed=""
           highlight-current-row
-          :edit-config="{trigger: 'click', mode: 'cell', showStatus: true, autoClear: true}"
+          :edit-config="{trigger: 'click', mode: 'cell', showStatus: true, autoClear: true, icon:'_'}"
+          :edit-rules="validRules"
         >
           <vxe-table-column field="userName" title="报销人" :edit-render="{}" :rules="[{required: true, message:'请选择报销人', trigger:'blur'}]">
             <template v-slot:edit="scope">
@@ -81,16 +82,16 @@
             </template>
           </vxe-table-column>
           <vxe-table-column field="projectName" title="报销项目" :edit-render="{}" :rules="[{required: true, message:'请选择报销项目', trigger:'blur'}]">
+            <span slot="label"><span style="color: red;border-top: 20px">*</span> 报销项目</span>
             <template v-slot:edit="scope">
               <el-input v-model="scope.row.projectName" @focus="openProgramPageForm(scope.$rowIndex, scope.row)"></el-input>
             </template>
           </vxe-table-column>
-
-<!--          <vxe-table-column field="reportNumber" title="报告号" :edit-render="{}">-->
-<!--            <template v-slot:edit="scope">-->
-<!--              <el-input :disabled="true" v-model="scope.row.reportNumber" ></el-input>-->
-<!--            </template>-->
-<!--          </vxe-table-column>-->
+          <vxe-table-column field="reportNo" title="报告号" :edit-render="{}">
+            <template v-slot:edit="scope">
+              <el-input v-model="scope.row.reportNo" @focus="openReportNoPageForm(scope.$rowIndex, scope.row)"></el-input>
+            </template>
+          </vxe-table-column>
           <vxe-table-column field="number" title="费用(元)" :edit-render="{}" :rules="[{required: true, message:'请输入费用', trigger:'blur'}]">
             <template v-slot:edit="scope">
               <el-input maxlength="15" v-model="scope.row.number" @keyup.native="scope.row.number = twoDecimalPlaces(scope.row.number)"></el-input>
@@ -136,7 +137,7 @@
           @cell-click=""
           @edit-closed=""
           highlight-current-row
-          :edit-config="{trigger: 'click', mode: 'cell', showStatus: true, autoClear: true}"
+          :edit-config="{trigger: 'click', mode: 'cell', showStatus: true, autoClear: true, icon:'_'}"
         >
           <vxe-table-column field="code" title="发票代码" :edit-render="{}">
             <template v-slot:edit="scope">
@@ -179,10 +180,12 @@
       <CwReimbursementTypePullForm ref="cwReimbursementTypePullForm" @getProgramForType="getProgramForType"></CwReimbursementTypePullForm>
       <UserPullForm ref="userPullForm" @getProgramForUser="getProgramForUser"></UserPullForm>
     </el-form>
+    <ReportNoChooseRadio ref="reportNoChooseRadio" @getWorkClientRadioChoose="getWorkClientChoose2"></ReportNoChooseRadio>
   </div>
 </template>
 
 <script>
+  import ReportNoChooseRadio from './ReportNoChooseRadio'
   // import ReimbursementService from '@/api/sys/ReimbursementService'
   import ReimbursementApprovalService from '@/api/cw/reimbursementApproval/ReimbursementApprovalService'
   // import ReimbursementTypeService from '@/api/sys/ReimbursementTypeService'
@@ -200,6 +203,23 @@
   export default {
     data () {
       return {
+        validRules: {
+          userName: [
+            {required: true, message: '报销人不能为空'}
+          ],
+          deptName: [
+            {required: true, message: '报销部门不能为空'}
+          ],
+          typeName: [
+            {required: true, message: '报销类型不能为空'}
+          ],
+          projectName: [
+            {required: true, message: '报销项目不能为空'}
+          ],
+          reportNo: [
+            {required: true, message: '报告号不能为空'}
+          ]
+        },
         title: '',
         method: '',
         visible: false,
@@ -252,7 +272,8 @@
       CwProgramPageForm,
       // ReimbursementTypePullForm,
       CwReimbursementTypePullForm,
-      UserPullForm
+      UserPullForm,
+      ReportNoChooseRadio
     },
     computed: {
       name () {
@@ -600,6 +621,15 @@
         }
         row.count = parseFloat(count).toFixed(2)
       },
+      // 选择报告号
+      openReportNoPageForm (rowIndex, row) {
+        let i = this.inputForm.detailInfos.length
+        for (let j = 0; j < i; j++) {
+          if (this.commonJS.isNotEmpty(this.inputForm.detailInfos[j].projectName)) {
+            this.$refs.reportNoChooseRadio.init(this.inputForm.detailInfos[j].projectName)
+          }
+        }
+      },
       openProgramPageForm (rowIndex, row) {
         if (this.commonJS.isEmpty(row.typeName)) {
           this.$message.error('请选择报销类型')
@@ -612,6 +642,7 @@
           let i = data.sort.toString()
           i = i.substring(0, 1)
           // 非业务报销
+          console.log('i', i)
           if (i !== '1') {
             this.$refs.cwProgramPageForm.init('2', false)
           } else {
@@ -619,25 +650,12 @@
             this.$refs.cwProgramPageForm.init(null, false)
           }
         })
-        // this.reimbursementTypeService.findById(row.typeId).then(({data}) => {
-        //   console.log('typeInfo', data.sort)
-        //   let i = data.sort.toString()
-        //   i = i.substring(0, 1)
-        //   // 非业务报销
-        //   if (i !== '1') {
-        //     this.$refs.programPageForm.init('2', false)
-        //   } else {
-        //     // 打开单选组件
-        //     this.$refs.programPageForm.init(null, false)
-        //   }
-        // })
       },
       getProgram (rows) {
-        console.log('aaaaaaaaaaa', rows[0])
         this.inputForm.detailInfos[this.indexRow].projectId = rows[0].id
-        this.inputForm.detailInfos[this.indexRow].projectName = rows[0].name
-        this.inputForm.detailInfos[this.indexRow].reportNumber = rows[0].reportNo
-        this.indexRow = ''
+        this.inputForm.detailInfos[this.indexRow].projectName = rows[0].projectName
+        this.inputForm.detailInfos[this.indexRow].reportNumber = rows[0].reportNumber
+        // this.indexRow = ''
         this.$forceUpdate()
       },
       // 报销类型下拉弹窗
@@ -649,7 +667,7 @@
       getProgramForType (rows) {
         this.inputForm.detailInfos[this.indexRow].typeId = rows.id
         this.inputForm.detailInfos[this.indexRow].typeName = rows.name
-        this.indexRow = ''
+        // this.indexRow = ''
         this.$forceUpdate()
       },
       // 报销人下拉弹窗
@@ -663,7 +681,12 @@
         this.inputForm.detailInfos[this.indexRow].userName = rows[0].name
         this.inputForm.detailInfos[this.indexRow].deptId = rows[0].parentId
         this.inputForm.detailInfos[this.indexRow].deptName = rows[0].officeName
-        this.indexRow = ''
+        // this.indexRow = ''
+        this.$forceUpdate()
+      },
+      getWorkClientChoose2 (list) {
+        console.log('list', list)
+        this.inputForm.detailInfos[this.indexRow].reportNo = list.reportNo
         this.$forceUpdate()
       }
     }

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

@@ -0,0 +1,197 @@
+<template>
+  <div>
+    <el-dialog
+      :title="title"
+      :close-on-click-modal="false"
+      v-dialogDrag
+      width="1400px"
+      append-to-body
+      height="500px"
+      @close="close"
+      @keyup.enter.native="getWorkClient"
+      :visible.sync="visibleChoose">
+      <div style="height: calc(100%);">
+<!--        <el-form size="small" :inline="true" class="query-form" ref="searchForm" :model="searchForm" @submit.native.prevent>-->
+<!--          &lt;!&ndash; 搜索框&ndash;&gt;-->
+<!--          <el-form-item label="客户名称" prop="name">-->
+<!--            <el-input size="small" v-model="searchForm.name" placeholder="客户名称" clearable></el-input>-->
+<!--          </el-form-item>-->
+<!--          <el-form-item label="客户编号" prop="no">-->
+<!--            <el-input size="small" v-model="searchForm.no" placeholder="客户编号" clearable></el-input>-->
+<!--          </el-form-item>-->
+<!--          <el-form-item label="客户类型" prop="type">-->
+<!--            <el-select v-model="searchForm.type" placeholder="请选择" style="width:100%;"clearable>-->
+<!--              <el-option-->
+<!--                v-for="item in $dictUtils.getDictList('cw_work_client_type')"-->
+<!--                :key="item.value"-->
+<!--                :label="item.label"-->
+<!--                :value="item.value">-->
+<!--              </el-option>-->
+<!--            </el-select>-->
+<!--          </el-form-item>-->
+<!--          <el-form-item label="所属行业" prop="industry">-->
+<!--            <el-select v-model="searchForm.industry" placeholder="请选择" style="width:100%;"clearable>-->
+<!--              <el-option-->
+<!--                v-for="item in $dictUtils.getDictList('cw_work_client_industry')"-->
+<!--                :key="item.value"-->
+<!--                :label="item.label"-->
+<!--                :value="item.value">-->
+<!--              </el-option>-->
+<!--            </el-select>-->
+<!--          </el-form-item>-->
+
+
+<!--          <el-form-item>-->
+<!--            <el-button type="primary" @click="list()" size="small" icon="el-icon-search">查询</el-button>-->
+<!--            <el-button @click="resetSearch()" size="small" icon="el-icon-refresh-right">重置</el-button>-->
+<!--          </el-form-item>-->
+<!--        </el-form>-->
+
+        <vxe-table
+          border="inner"
+          auto-resize
+          resizable
+          height="400px"
+          :loading="loading"
+          size="small"
+          ref="clientTable"
+          show-header-overflow
+          show-overflow
+          highlight-hover-row
+          :menu-config="{}"
+          :print-config="{}"
+          @sort-change=""
+          :sort-config="{remote:true}"
+          :data="dataList"
+          :row-config="{isCurrent: true}"
+          :radio-config="{trigger: 'row'}">
+          <vxe-column type="seq" width="40"></vxe-column>
+          <vxe-column type="radio" width="40px"></vxe-column>
+          <vxe-column width="" title="报告号" align="center" field="reportNo" ></vxe-column>
+        </vxe-table>
+        <vxe-pager
+          background
+          size="small"
+          :current-page="tablePage.currentPage"
+          :page-size="tablePage.pageSize"
+          :total="tablePage.total"
+          :page-sizes="[10, 20, 100, 1000, {label: '全量数据', value: 1000000}]"
+          :layouts="['PrevPage', 'JumpNumber', 'NextPage', 'FullJump', 'Sizes', 'Total']"
+          @page-change="currentChangeHandle">
+        </vxe-pager>
+      </div>
+      <span slot="footer" class="dialog-footer">
+      <el-button size="small" @click="close()" icon="el-icon-circle-close">关闭</el-button>
+      <el-button size="small" type="primary" v-if="method != 'view'" @click="getWorkClient()" icon="el-icon-circle-check" v-noMoreClick>确定</el-button>
+    </span>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+  import InputNumber from '@/views/modules/sys/workContract/InputNumber.vue'
+  // import WorkClientService from '@/api/cw/workClientInfo/WorkClientService'
+  import ReimbursementApprovalService from '@/api/cw/reimbursementApproval/ReimbursementApprovalService'
+  import SelectUserTree from '@/views/modules/utils/treeUserSelect'
+  export default {
+    data () {
+      return {
+        title: '',
+        method: '',
+        visibleChoose: false,
+        loading: false,
+        tablePage: {
+          total: 0,
+          currentPage: 1,
+          pageSize: 10,
+          orders: []
+        },
+        dataList: [],
+        searchForm: {
+          projectName: '',
+          name: '',
+          no: '',
+          type: '',
+          industry: ''
+        }
+      }
+    },
+    // workClientService: null,
+    reimbursementApprovalService: null,
+    created () {
+      // this.workClientService = new WorkClientService()
+      this.reimbursementApprovalService = new ReimbursementApprovalService()
+    },
+    components: {
+      SelectUserTree,
+      InputNumber
+    },
+    methods: {
+      init (deputy) {
+        this.title = '报告号选择'
+        this.visibleChoose = true
+        console.log('deputy', deputy)
+        this.list(deputy)
+      },
+      // 表单提交
+      getWorkClient () {
+        let row = this.$refs.clientTable.getRadioRecord()
+        if (this.commonJS.isEmpty(row)) {
+          this.$message.error('请至少选择一条数据')
+        } else {
+          this.close()
+          this.$emit('getWorkClientRadioChoose', row)
+        }
+      },
+      list (deputy) {
+        this.dataList = []
+        this.loading = true
+        this.searchForm.status = '5'
+        this.searchForm.projectName = deputy
+        console.log('deputy', deputy)
+        this.reimbursementApprovalService.reportNoList({
+          'current': this.tablePage.currentPage,
+          'size': this.tablePage.pageSize,
+          'orders': this.tablePage.orders,
+          ...this.searchForm
+        }).then(({data}) => {
+          this.dataList = data.records
+          this.tablePage.total = data.total
+          this.loading = false
+        })
+        // this.workClientService.reportNoList({
+        //   'current': 1,
+        //   'size': -1,
+        //   'orders': this.tablePage.orders,
+        //   ...this.searchForm
+        // }).then(({data}) => {
+        //   this.dataList = data.records
+        //   this.tablePage.total = data.total
+        //   this.loading = false
+        // })
+      },
+      // 当前页
+      currentChangeHandle ({currentPage, pageSize}) {
+        this.tablePage.currentPage = currentPage
+        this.tablePage.pageSize = pageSize
+        this.list()
+      },
+      resetSearch () {
+        // this.$refs.searchForm.resetFields()
+        this.list()
+      },
+      close () {
+        // this.$refs.searchForm.resetFields()
+        this.visibleChoose = false
+      }
+    }
+  }
+</script>
+<style scoped>
+  /deep/ .el-dialog__body {
+    padding-top: 0;
+  }
+  /deep/ .el-form-item--mini.el-form-item, .el-form-item--small.el-form-item {
+    margin-bottom: 0px;
+  }
+</style>

src/views/modules/cw/reportManagement/ReportManagementForm.vue

@@ -208,7 +208,7 @@
               <el-col :span="12">
                 <el-form-item label="意见类型" prop="opinionType"
                               :rules="[
-                            {required: true, message:'意见类型不能为空', trigger:'blur'}
+                            {required: true, message:'意见类型不能为空', trigger:'change'}
                    ]">
                   <el-select v-model="inputForm.opinionType" placeholder="请选择意见类型" style="width:100%;">
                     <el-option
@@ -340,6 +340,10 @@
               <!--        附件-->
               <UpLoadComponent ref="archiveFile"></UpLoadComponent>
             </el-tab-pane>
+            <el-tab-pane label="已签章附件" name="signatureFile">
+              <!--        附件-->
+              <UpLoadComponent2 ref="signatureFile"></UpLoadComponent2>
+            </el-tab-pane>
             <el-tab-pane label="历史报告列表" name="contact">
               <el-row  :gutter="15">
                 <el-form :disabled="method==='view'">
@@ -421,7 +425,7 @@
       <el-button size="small" @click="close()" icon="el-icon-circle-close">关闭</el-button>
       <el-button size="small" v-if="method === 'edit'" type="primary" icon="el-icon-circle-check" @click="doSubmit('save')">确定</el-button>
     </span>
-<!--      <UpLoadComponentDialog ref="upLoadComponentDialog" @getUpload="getUpload"></UpLoadComponentDialog>-->
+      <UpLoadComponentDialog ref="upLoadComponentDialog" @getUpload="getUpload"></UpLoadComponentDialog>
 <!--      <WorkContractChooseCom ref="workContractChooseCom" @getContract="getContract"></WorkContractChooseCom>-->
 <!--      <WorkClientChooseForm ref="workClientChooseForm" @getWorkClientChoose="getWorkClientChoose"></WorkClientChooseForm>-->
       <ProjectRecoredChooseCom  ref="projectRecoredChooseCom" @getProject="getContract"></ProjectRecoredChooseCom>
@@ -431,7 +435,7 @@
 </template>
 
 <script>
-  // import UpLoadComponent from '@/views/common/UpLoadComponent'
+  import UpLoadComponent2 from '@/views/common/UpLoadComponent'
   import UpLoadComponent from '@/views/common/UpLoadComponentV2.1'
   import SelectUserTree from '@/views/modules/utils/treeUserSelect'
   import SelectTree from '@/components/treeSelect/treeSelect.vue'
@@ -490,6 +494,7 @@
           projectMasterName: '',
           cwProjectInfoList: [],
           cwFileInfoList: [],
+          signatureFileList: [],
           servedUnitId: '',
           status: '',
           realCreate: ''
@@ -536,6 +541,7 @@
     },
     components: {
       SelectUserTree,
+      UpLoadComponent2,
       UpLoadComponent,
       SelectTree,
       UserSelect,
@@ -561,24 +567,6 @@
         // this.$refs.upLoadComponentDialog.newUpload('view', this.inputForm.cwProjectInfoList[index].cwFileInfoList, null, null, null, null, null, false, index)
         this.$refs.upLoadComponentDialog.newUpload('view', this.inputForm.cwWorkClientContactDTOList[index].cwFileInfoList, null, null, null, null, null, false, index)
       },
-      // sss (index) {
-      //   if (this.commonJS.isEmpty(this.inputForm.cwProjectInfoList[index].cwFileInfoList)) {
-      //     this.inputForm.cwProjectInfoList[index].cwFileInfoList = []
-      //   }
-      //   this.$refs.upLoadComponentDialog.newUpload(null, this.inputForm.cwProjectInfoList[index].cwFileInfoList, null, null, null, null, null, false, index)
-      // },
-      // getUpload (p, index) {
-      //   p.then((list) => {
-      //     // list为返回数据
-      //     this.inputForm.cwProjectInfoList[index].cwFileInfoList = list
-      //     this.inputForm.cwProjectInfoList[index].fileNumber = list.length
-      //     this.tableKeyClient = Math.random()
-      //     this.tableKeyContact = Math.random()
-      //     // console.log('this.inputForm.cwFileInfoList', this.inputForm.cwFileInfoList)
-      //     // console.log('list.length', list.length)
-      //     // console.log(list)
-      //   })
-      // },
       getKeyWatch (keyWatch) {
         this.keyWatch = keyWatch
       },
@@ -621,9 +609,11 @@
           projectMasterName: '',
           cwProjectInfoList: [],
           cwFileInfoList: [],
+          signatureFileList: [],
           servedUnitId: '',
           status: '',
-          realCreate: ''
+          realCreate: '',
+          cwWorkClientContactDTOList: []
         }
         this.inputForm.id = id
         this.loading = false
@@ -651,6 +641,7 @@
         // })
         this.$nextTick(() => {
           this.$refs.archiveFile.clearUpload()
+          this.$refs.signatureFile.clearUpload()
           this.$refs.inputForm.resetFields()
           this.loading = true
           this.projectReportService.queryById(this.inputForm.id).then(({data}) => {
@@ -660,6 +651,7 @@
             // this.$refs.uploadComponent.clearUpload()
             this.inputForm = this.recover(this.inputForm, data)
             this.inputForm = JSON.parse(JSON.stringify(this.inputForm))
+            console.log('this.inputForm.cwWorkClientContactDTOList', data.cwWorkClientContactDTOList)
             if (this.commonJS.isEmpty(this.inputForm.createDate)) {
               this.inputForm.createDate = this.moment(new Date()).format('YYYY-MM-DD HH:mm:ss')
             }
@@ -673,6 +665,7 @@
               method = 'view'
             }
             this.$refs.archiveFile.newUpload(method, data.cwFileInfoList, 'cwWorkContract', null, null, null, null, false)
+            this.$refs.signatureFile.newUpload(method, data.signatureFileList, 'cwWorkContract', null, null, null, null, false)
             this.loading = false
           })
           // this.projectRecordsService.queryById(this.inputForm.id).then(({data}) => {
@@ -717,15 +710,17 @@
           // 暂存
           // this.inputForm.status = '1'
           this.loading = true
-          // if (this.$refs.uploadComponent.checkProgress()) {
-          //   this.loading = false
-          //   return
-          // }
-          // this.inputForm.workAttachmentDtoList = this.$refs.uploadComponent.getDataList()
-          // this.inputForm.createDate = this.moment(new Date()).format('YYYY-MM-DD HH:mm:ss')
+          if (this.commonJS.isEmpty(this.inputForm.opinionType)) {
+            this.$message.error('意见类型不能为空')
+            this.loading = false
+            throw new Error('意见类型不能为空')
+          }
           this.$refs.archiveFile.getDataList().then((data) => {
             this.inputForm.cwFileInfoList = data
           })
+          this.$refs.signatureFile.getDataList().then((data) => {
+            this.inputForm.signatureFileList = data
+          })
           this.projectReportService.saveForm(this.inputForm).then(({data}) => {
             // callback(data.businessTable, data.businessId, this.inputForm)
             this.close()
@@ -772,6 +767,9 @@
             this.$refs.archiveFile.getDataList().then((data) => {
               this.inputForm.cwFileInfoList = data
             })
+            this.$refs.signatureFile.getDataList().then((data) => {
+              this.inputForm.signatureFileList = data
+            })
             this.projectReportService.saveForm(this.inputForm).then(({data}) => {
               callback(data.businessTable, data.businessId, this.inputForm)
               this.loading = false
@@ -943,6 +941,18 @@
         // eslint-disable-next-line no-useless-escape
         str = str.replace(/[^\d^\.]+/g, '') // 保留数字和小数点
         return str
+      },
+      getUpload (p, index) {
+        p.then((list) => {
+          // list为返回数据
+          this.inputForm.cwProjectInfoList[index].cwFileInfoList = list
+          this.inputForm.cwProjectInfoList[index].fileNumber = list.length
+          this.tableKeyClient = Math.random()
+          this.tableKeyContact = Math.random()
+          // console.log('this.inputForm.cwFileInfoList', this.inputForm.cwFileInfoList)
+          // console.log('list.length', list.length)
+          // console.log(list)
+        })
       }
     }
   }

src/views/modules/cw/reportManagement/ReportManagementTaskForm.vue

@@ -65,7 +65,7 @@
           <el-col :span="12">
             <el-form-item label="盖章类型" prop="signatureType"
                           :rules="[
-                              {required: true, message: '盖章类型不能为空', trigger: 'blur'}
+                              {required: true, message: '盖章类型不能为空', trigger: 'change'}
                    ]">
               <!--                <el-input v-model="inputForm.signatureType" placeholder="请填写盖章类型" clearable></el-input>-->
               <el-select v-model="inputForm.signatureType" placeholder="请选择盖章类型" clearable style="width: 100%;">
@@ -148,9 +148,10 @@
           <el-col :span="12">
             <el-form-item label="被服务单位" prop="servedUnitName"
                           :rules="[
-                            {required: true, message:'被服务单位不能为空', trigger:'blur'}
+                            {required: true, message:'被服务单位不能为空', trigger:'blur'},
+                            {required: true, message:'被服务单位不能为空', trigger:'change'}
                    ]">
-              <el-input @focus="openWorkClient()" v-model="inputForm.servedUnitName" placeholder="请填写被服务单位" clearable>
+              <el-input :readonly="true" @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>
@@ -172,7 +173,7 @@
           <el-col :span="12">
             <el-form-item label="报告类型" prop="reportType"
                           :rules="[
-                            {required: true, message:'报告类型不能为空', trigger:'blur'}
+                            {required: true, message:'报告类型不能为空', trigger:'change'}
                    ]">
               <el-select v-model="inputForm.reportType" placeholder="请选择报告类型" style="width:100%;">
                 <el-option
@@ -217,7 +218,7 @@
             <el-col v-if="inputForm.status === '2'" :span="12">
               <el-form-item label="意见类型" prop="opinionType"
                             :rules="[
-                              {required: true, message:'意见类型不能为空', trigger:'blur'}
+                              {required: true, message:'意见类型不能为空', trigger:'change'}
                      ]">
                 <el-select v-model="inputForm.opinionType" placeholder="请选择意见类型" style="width:100%;">
                   <el-option
@@ -503,15 +504,6 @@
             this.$refs.archiveFile.newUpload(method, data.cwFileInfoList, 'cwWorkContract', null, null, null, null, false)
             this.loading = false
           })
-          // this.projectRecordsService.queryById(this.inputForm.id).then(({data}) => {
-          //   // this.$refs.uploadComponent.clearUpload()
-          //   this.inputForm = this.recover(this.inputForm, data)
-          //   this.inputForm = JSON.parse(JSON.stringify(this.inputForm))
-          //   if (this.commonJS.isEmpty(this.inputForm.createDate)) {
-          //     this.inputForm.createDate = this.moment(new Date()).format('YYYY-MM-DD HH:mm:ss')
-          //   }
-          //   this.loading = false
-          // })
         })
       },
       openContractForm () {
@@ -554,32 +546,13 @@
             this.doSubmit('agree', callback)
           }
         })
-        // await this.projectRecordsService.queryById(this.inputForm.id).then(({data}) => {
-        //   if (this.inputForm.status !== '2') { // 审核状态不是“待审核”，就弹出提示
-        //     this.$message.error('任务数据已发生改变或不存在，请在待办任务中确认此任务是否存在')
-        //     throw new Error()
-        //   } else {
-        //     this.doSubmit('agree', callback)
-        //   }
-        // })
       },
       // 表单提交
       doSubmit (status, callback) {
-        if (this.inputForm.status === '2' && this.commonJS.isEmpty(this.inputForm.opinionType)) {
-          this.$message.error('意见类型不能为空')
-          this.loading = false
-          throw new Error('意见类型不能为空')
-        }
         if (status === 'save') {
           // 暂存
           this.inputForm.status = '1'
           this.loading = true
-          // if (this.$refs.uploadComponent.checkProgress()) {
-          //   this.loading = false
-          //   return
-          // }
-          // this.inputForm.workAttachmentDtoList = this.$refs.uploadComponent.getDataList()
-          // this.inputForm.cwFileInfoList = this.$refs.archiveFile.getDataList()
           this.$refs.archiveFile.getDataList().then((data) => {
             this.inputForm.cwFileInfoList = data
           })
@@ -593,12 +566,6 @@
           }).catch(() => {
             this.loading = false
           })
-          // this.projectRecordsService.saveForm(this.inputForm).then(({data}) => {
-          //   callback(data.businessTable, data.businessId, this.inputForm)
-          //   this.loading = false
-          // }).catch(() => {
-          //   this.loading = false
-          // })
           return
         } else if (status === 'start') {
           // 送审  待审核
@@ -623,15 +590,18 @@
                   if (_this.commonJS.isEmpty(item.fileType)) {
                     _this.$message.error('签章文件中，第' + (index + 1) + '条数据的“文件类型”未填写')
                     _this.loading = false
-                    _this.inputForm.status = ''
                     throw new Error('签章文件中，第' + (index + 1) + '条数据的“文件类型”未填写')
                   } else if (_this.commonJS.isEmpty(item.sealType)) {
                     _this.$message.error('签章文件中，第' + (index + 1) + '条数据的“盖章类型”未填写')
                     _this.loading = false
-                    _this.inputForm.status = ''
                     throw new Error('签章文件中，第' + (index + 1) + '条数据的“盖章类型”未填写')
                   }
                 })
+                if (status === 'agree' && this.commonJS.isEmpty(this.inputForm.opinionType)) {
+                  this.$message.error('意见类型不能为空')
+                  this.loading = false
+                  throw new Error('意见类型不能为空')
+                }
                 this.projectReportService.saveForm(this.inputForm).then(({data}) => {
                   // console.log('businessTable', data.businessTable)
                   // console.log('businessId', data.businessId)

src/views/modules/cw/workContract/ContractFilePaperForm.vue

@@ -135,40 +135,28 @@
                  ]">
             <el-input maxlength="64" :disabled="true" v-model="inputForm.departmentName" placeholder="请输入所属部门"></el-input>
           </el-form-item>
-<!--          <el-form-item  prop="department" label="所属部门">-->
-<!--            <SelectTree-->
-<!--              ref="officeTree"-->
-<!--              :props="{-->
-<!--                  value: 'id',             // ID字段名-->
-<!--                  label: 'name',         // 显示名称-->
-<!--                  children: 'children'    // 子级字段名-->
-<!--                }"-->
-<!--              :disabled="true"-->
-<!--              :url="`/sys/office/treeData?type=1`"-->
-<!--              :value="inputForm.department"-->
-<!--              :accordion="true"-->
-<!--              size="medium"-->
-<!--              @getValue="(value) => {inputForm.department=value}"/>-->
-<!--          </el-form-item>-->
         </el-col>
 
-        <el-col :span="12">
-          <el-form-item label="案卷号" prop="filedNo"
-                        :rules="[{required: true, message: '请输入案卷号', trigger: 'blur'}
+        <el-form size="middle" :model="inputForm" ref="inputForm" v-loading="loading" :class="method==='view'?'readonly':''"  :disabled="status !== 'audit'"
+                 label-width="150px">
+          <el-col :span="12">
+            <el-form-item label="案卷号" prop="filedNo"
+                          :rules="[{required: true, message: '请输入案卷号', trigger: 'blur'}
                  ]">
-            <el-input maxlength="15" v-model="inputForm.filedNo" placeholder="请输入案卷号"
-            ></el-input>
-          </el-form-item>
-        </el-col>
+              <el-input maxlength="15" v-model="inputForm.filedNo" placeholder="请输入案卷号"
+              ></el-input>
+            </el-form-item>
+          </el-col>
 
-        <el-col :span="12">
-          <el-form-item label="确认案卷号" prop="confirmFiledNo"
-                        :rules="[{required: true, message: '请输入确认案卷号', trigger: 'blur'}
+          <el-col :span="12">
+            <el-form-item label="确认案卷号" prop="confirmFiledNo"
+                          :rules="[{required: true, message: '请输入确认案卷号', trigger: 'blur'}
                  ]">
-            <el-input maxlength="15" @change="checkFiledNo" v-model="inputForm.confirmFiledNo" placeholder="请输入确认案卷号"
-            ></el-input>
-          </el-form-item>
-        </el-col>
+              <el-input maxlength="15" @change="checkFiledNo" v-model="inputForm.confirmFiledNo" placeholder="请输入确认案卷号"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+        </el-form>
 
         <el-col :span="12">
           <el-form-item label="创建人" prop="createBy"
@@ -743,28 +731,21 @@
           this.inputForm.status = '5'
           this.inputForm.filedPaperType = '2'
           this.inputForm.contractProperList = []
-          if (this.inputForm.filedNo === '' || this.inputForm.filedNo === undefined) {
-            this.loading = false
-            this.$message.error('请填写案卷号')
-            throw new Error('请填写案卷号')
-          }
-          if (this.inputForm.confirmFiledNo === '' || this.inputForm.confirmFiledNo === undefined) {
-            this.loading = false
-            this.$message.error('请填写确认案卷号')
-            throw new Error('请填写确认案卷号')
-          }
+          console.log('status', status)
           // this.contractInfoService.updateInfo(this.inputForm)
           // console.log('inputForm', this.inputForm)
           this.inputForm.contractInfoId = id
           this.inputForm.contractInfoList = this.$refs.archiveFile.getDataList()
           // console.log('this.inputForm', this.inputForm)
           // this.inputForm.contractProperList = this.$refs.uploadFile.getDataList()
+
           this.contractFilePaperService.save(this.inputForm).then(({data}) => {
             // console.log('data', data)
             callback(data.businessTable, data.businessId, this.inputForm)
             this.$refs.inputForm.resetFields()
             this.loading = false
           })
+
           // this.contractFileService.save(this.inputForm).then(({data}) => {
           //   // console.log('data', data)
           //   callback(data.businessTable, data.businessId, this.inputForm)
@@ -788,7 +769,17 @@
           // console.log('this.inputForm.contractProperList', this.inputForm.contractProperList)
           // this.contractInfoService.updateInfo(this.inputForm)
           this.inputForm.contractInfoId = id
-          // this.inputForm.contractInfoList = this.$refs.uploadFile.getDataList()
+          if (this.inputForm.filedNo === '' || this.inputForm.filedNo === undefined) {
+            this.loading = false
+            this.$message.error('请填写案卷号')
+            throw new Error('请填写案卷号')
+          }
+          if (this.inputForm.confirmFiledNo === '' || this.inputForm.confirmFiledNo === undefined) {
+            this.loading = false
+            this.$message.error('请填写确认案卷号')
+            throw new Error('请填写确认案卷号')
+          }
+          this.inputForm.contractInfoList = this.$refs.uploadFile.getDataList()
           this.contractFilePaperService.save(this.inputForm).then(({data}) => {
             callback(data.businessTable, data.businessId, this.inputForm)
             this.$refs.inputForm.resetFields()

src/views/modules/cw/workContract/CwWorkContractBorrowForm.vue

@@ -353,6 +353,7 @@
       agreeForm (callback) {
         this.inputForm.borrowType = '5'
         this.cwWorkContractBorrowService.updateMessageStatusById(this.inputForm).then(({data}) => {
+          this.cwWorkContractBorrowService.updateStatusById(this.inputForm)
           callback(data.businessTable, data.businessId, this.inputForm)
           this.$refs.inputForm.resetFields()
           this.loading = false
@@ -390,11 +391,6 @@
             this.inputForm.type = 'reject'
             this.cwWorkContractBorrowService.updateMessageStatusById(this.inputForm)
           })
-          // this.workContractBorrowService.updateStatusById(this.inputForm).then(() => {
-          //   this.inputForm.borrowType = '3'
-          //   this.inputForm.type = 'reject'
-          //   this.workContractBorrowService.updateMessageStatusById(this.inputForm)
-          // })
         }
         if (type === 'reback') {
           this.inputForm.borrowType = '0'

src/views/modules/flowable/task/TaskForm.vue

@@ -58,9 +58,10 @@
     </el-col>
     <el-col :span="16">
       <el-form-item v-if="isCC"  :rules="[
-              {required: true, message: '用户不能为空', trigger: 'blur'}
+              {required: true, message: '用户不能为空', trigger: 'blur'},
+              {required: true, message: '用户不能为空', trigger: 'change'}
             ]"  prop="userIds" label="抄送给">
-            <user-select :value="auditForm.userIds"  @getValue='(value) => {auditForm.userIds=value}'>></user-select>
+            <user-select :readonly="true" :value="auditForm.userIds"  @getValue='(value) => {auditForm.userIds=value}'>></user-select>
       </el-form-item>
     </el-col>
     <el-col :span="16">

src/views/modules/materialManagement/info/MaterialTypePullForm.vue

@@ -38,7 +38,8 @@
           :tree-config="{transform: true, rowField: 'id', parentField: 'parentId'}"
           :checkbox-config="{}">
           <vxe-column type="seq" width="60" title="序号"></vxe-column>
-          <vxe-column type="checkbox" width="40" ></vxe-column>
+<!--          <vxe-column type="checkbox" width="40" ></vxe-column>-->
+          <vxe-column type="radio" width="40" ></vxe-column>
           <vxe-column title="报销内容名称" field="name" align="left" tree-node></vxe-column>
           <vxe-column width="100" title="序号" field="sort"></vxe-column>
         </vxe-table>
@@ -89,12 +90,12 @@
       // 表单提交
       getProgramForType () {
         let rows
-        if (this.commonJS.isEmpty(this.$refs.typeTable.getCheckboxRecords()) || this.$refs.typeTable.getCheckboxRecords().length > 1) {
+        if (this.commonJS.isEmpty(this.$refs.typeTable.getRadioRecord())) {
           this.$message.error('请选择一条数据')
           return
         }
-        rows = this.$refs.typeTable.getCheckboxRecords()
-        if (rows[0].level !== '3' && rows[0].id !== '3') {
+        rows = this.$refs.typeTable.getRadioRecord()
+        if (rows.level !== '3') {
           this.$message.error('请选择子集数据')
           return
         }

src/views/modules/materialManagement/info/UpdateInfoForm.vue

@@ -151,7 +151,7 @@
               <template v-slot="scope">
                 <el-button size="mini" type="danger" @click="removeEvent(scope.row,scope.$rowIndex,'detail')">删除</el-button>
                 <el-button size="mini" type="primary" @click="sss(scope.$rowIndex)">上传附件</el-button>
-                <el-button size="mini" type="primary" v-if="scope.row.status !== '1' || scope.row.status !== '' " :disabled="false" @click="seeFileInfo(scope.$rowIndex)">查看文件详情</el-button>
+                <el-button size="mini" type="primary" v-if="method==='view'" :disabled="false" @click="seeFileInfo(scope.$rowIndex)">查看文件详情</el-button>
                 <!--              <el-button size="mini" v-if="formReadOnly" :disabled="false" type="primary" @click="seeFileInfo(scope.$rowIndex)">查看文件详情</el-button>-->
               </template>
             </vxe-table-column>

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

@@ -121,12 +121,17 @@
           </vxe-table-column>
           <vxe-table-column field="tradePrice" title="商品单价(元)" :edit-render="{}" :rules="[{required: true, message:'请输入商品单价', trigger:'blur'}]">
             <template v-slot:edit="scope">
-              <el-input maxlength="15" v-model="scope.row.tradePrice" @keyup.native="scope.row.tradePrice = twoDecimalPlaces(scope.row.tradePrice)"></el-input>
+              <el-input @change="changeValue" maxlength="15" v-model="scope.row.tradePrice" @keyup.native="scope.row.tradePrice = twoDecimalPlaces(scope.row.tradePrice)"></el-input>
             </template>
           </vxe-table-column>
           <vxe-table-column field="tradeNumber" title="商品数量" :edit-render="{}">
             <template v-slot:edit="scope">
-              <el-input v-model="scope.row.tradeNumber" oninput ="value=value.replace(/\D|^0/g,'')" maxlength="10"></el-input>
+              <el-input @change="changeValue" v-model="scope.row.tradeNumber" oninput ="value=value.replace(/\D|^0/g,'')" maxlength="10"></el-input>
+            </template>
+          </vxe-table-column>
+          <vxe-table-column field="priceSum" title="商品总价" :edit-render="{}">
+            <template v-slot:edit="scope">
+              <el-input v-model="scope.row.priceSum" @keyup.native="scope.row.priceSum = twoDecimalPlaces(scope.row.priceSum)" maxlength="15"></el-input>
             </template>
           </vxe-table-column>
           <vxe-table-column field="company" title="单位" :edit-render="{}" :rules="[{required: true, message:'请填写单位', trigger:'blur'}]">
@@ -143,7 +148,7 @@
             <template v-slot="scope">
               <el-button size="mini" type="danger" @click="removeEvent(scope.row,scope.$rowIndex,'detail')">删除</el-button>
               <el-button size="mini" type="primary" @click="sss(scope.$rowIndex)">上传附件</el-button>
-              <el-button size="mini" type="primary" v-if="scope.row.status !== '1' || scope.row.status !== '' " :disabled="false" @click="seeFileInfo(scope.$rowIndex)">查看文件详情</el-button>
+              <el-button size="mini" type="primary" v-if="formReadOnly" :disabled="false" @click="seeFileInfo(scope.$rowIndex)">查看文件详情</el-button>
 <!--              <el-button size="mini" v-if="formReadOnly" :disabled="false" type="primary" @click="seeFileInfo(scope.$rowIndex)">查看文件详情</el-button>-->
             </template>
           </vxe-table-column>
@@ -354,19 +359,18 @@
               if (this.commonJS.isEmpty(this.inputForm.handledByOffice)) {
                 this.inputForm.handledByOffice = JSON.parse(localStorage.getItem('user')).officeDTO.id
               }
+              let i = this.inputForm.detailInfos.length
+              for (let j = 0; j < i; j++) {
+                if (this.commonJS.isNotEmpty(this.inputForm.detailInfos[j].tradePrice)) {
+                  if (this.commonJS.isNotEmpty(this.inputForm.detailInfos[j].tradeNumber)) {
+                    this.inputForm.detailInfos[j].priceSum = this.inputForm.detailInfos[j].tradePrice * this.inputForm.detailInfos[j].tradeNumber
+                  }
+                }
+              }
               this.$refs.uploadComponent.newUpload(method, this.inputForm.files, 'reimbursement')
               this.inputForm = JSON.parse(JSON.stringify(this.inputForm))
               this.loading = false
             })
-            // this.reimbursementApprovalService.findById(this.inputForm.id).then(({data}) => {
-            //   this.inputForm = this.recover(this.inputForm, data)
-            //   if (this.commonJS.isEmpty(this.inputForm.handledByOffice)) {
-            //     this.inputForm.handledByOffice = JSON.parse(localStorage.getItem('user')).officeDTO.id
-            //   }
-            //   this.$refs.uploadComponent.newUpload(method, this.inputForm.files, 'reimbursement')
-            //   this.inputForm = JSON.parse(JSON.stringify(this.inputForm))
-            //   this.loading = false
-            // })
           }
           if (method !== 'edit' && method !== 'view') {
             this.$refs.uploadComponent.newUpload(method, [], 'reimbursement')
@@ -470,8 +474,8 @@
           this.inputForm.files = []
         }
         this.inputForm.files = this.$refs.uploadComponent.getDataList()
+        console.log('this.inputForm', this.inputForm)
         this.inputForm.status = '1'
-        console.log('this.inputForm.tradeTotalPrice', this.inputForm.tradeTotalPrice)
         this.materialManagementService.save(this.inputForm).then(({data}) => {
           callback()
           this.$refs.inputForm.resetFields()
@@ -594,10 +598,9 @@
             if (columnIndex === 0) {
               return '商品总价'
             }
-            if (['tradePrice'].includes(column.property)) {
+            if (['priceSum'].includes(column.property)) {
               // eslint-disable-next-line no-undef
               this.inputForm.tradeTotalPrice = XEUtils.sum(data, column.property)
-              console.log('this.inputForm.tradeTotalPrice', this.inputForm.tradeTotalPrice)
               return XEUtils.sum(data, column.property)
             }
             return null
@@ -671,8 +674,8 @@
         this.$refs.materialTypePullForm.init()
       },
       getProgramForType (rows) {
-        this.inputForm.detailInfos[this.indexRow].typeId = rows[0].id
-        this.inputForm.detailInfos[this.indexRow].procurementType = rows[0].name
+        this.inputForm.detailInfos[this.indexRow].typeId = rows.id
+        this.inputForm.detailInfos[this.indexRow].procurementType = rows.name
         this.indexRow = ''
         this.$forceUpdate()
       },
@@ -689,6 +692,18 @@
         this.inputForm.detailInfos[this.indexRow].procurementOffice = rows[0].officeName
         this.indexRow = ''
         this.$forceUpdate()
+      },
+      // 值改变事件
+      changeValue () {
+        console.log('进来了')
+        let i = this.inputForm.detailInfos.length
+        for (let j = 0; j < i; j++) {
+          if (this.commonJS.isNotEmpty(this.inputForm.detailInfos[j].tradePrice)) {
+            if (this.commonJS.isNotEmpty(this.inputForm.detailInfos[j].tradeNumber)) {
+              this.inputForm.detailInfos[j].priceSum = this.inputForm.detailInfos[j].tradePrice * this.inputForm.detailInfos[j].tradeNumber
+            }
+          }
+        }
       }
     }
   }

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

@@ -124,7 +124,6 @@
               <span v-else>{{scope.row.purchaseSketch}}</span>
             </template>
           </vxe-column>
-          <vxe-column min-width="160" align="center" title="采购类型" field="procurementType"></vxe-column>
           <vxe-column min-width="160" align="center" title="采购方式" field="purchaseMode"></vxe-column>
           <vxe-column min-width="160" align="center" title="采购金额（元）" field="tradeTotalPrice"></vxe-column>
           <vxe-column min-width="160" align="center" title="经办人" field="handledBy"></vxe-column>

src/views/modules/reimbursement/info/InfoList.vue

@@ -121,9 +121,9 @@
           <vxe-column width="200" title="报告号" field="reportNumber"></vxe-column>
           <vxe-column width="100" title="经办人" field="userName"></vxe-column>
           <vxe-column width="100" title="报销人" field="name"></vxe-column>
-          <vxe-column width="200" title="报销部门" field="deptName"></vxe-column>
+          <vxe-column width="100" title="报销部门" field="deptName"></vxe-column>
           <vxe-column width="100" title="报销日期" field="reimDate"></vxe-column>
-          <vxe-column width="100" title="报销金额" field="number"></vxe-column>
+          <vxe-column width="150" title="报销金额(元)" field="number"></vxe-column>
           <vxe-column width="100" title="状态" field="type">
             <template slot-scope="scope">
               <el-button type="text" @click="detail(scope.row)" :type="$dictUtils.getDictLabel('status_info', scope.row.type, '-')" effect="dark" size="mini">{{$dictUtils.getDictLabel("status", scope.row.type, '未开始')}} </el-button>