代码提交:

1019自检类型管理

src/views/modules/finance/invoice/ReimbursementTypePullForm.vue

@@ -91,7 +91,7 @@
           return
         }
         rows = this.$refs.typeTable.getCheckboxRecords()
-        if (!rows[0].disabled && rows[0].id !== '3') {
+        if (rows[0].level !== '3' && rows[0].id !== '3') {
           this.$message.error('请选择子集数据')
           return
         }

src/views/modules/program/registered/ProjectList.vue

@@ -124,6 +124,9 @@
               <el-button v-if="hasPermission('program:registered:del')&&scope.row.status === '5' && isAdmin" type="text"  icon="el-icon-delete" size="small" @click="del(scope.row.id)">删除</el-button>
 
               <el-button v-if="hasPermission('program:registered:edit')&&scope.row.status === '5' && commonJS.isEmpty(scope.row.reportNo)" type="text"  icon="el-icon-circle-check" size="small" @click="saveReportNo(scope.row.id)">生成报告号</el-button>
+              <el-button v-if="hasPermission('program:configuration:type:del')&&scope.row.status === '5' && isAdmin" type="text"  icon="el-icon-delete" size="small" @click="del(scope.row.id)">删除</el-button>
+              <!--三神结束后，评估报告签发前进行资产评估项目（校对）-->
+              <el-button v-if="hasPermission('program:registered:proo')" type="text"  icon="el-icon-delete" size="small" @click="proofread(scope.row.id)">校对</el-button>
             </template>
           </vxe-column>
         </vxe-table>
@@ -140,6 +143,7 @@
       </div>
     </div>
     <ProjectForm  ref="projectForm" @refreshDataList="refreshList"></ProjectForm>
+    <ProofreadForm  ref="proofreadForm" @refreshDataList="refreshList"></ProofreadForm>
     <WorkContractForm2 ref="workContractForm2" @refreshDataList="refreshList"></WorkContractForm2>
   </div>
 </template>
@@ -147,6 +151,7 @@
 <script>
   import ProgramProjectListInfoService from '@/api/program/ProgramProjectListInfoService'
   import ProjectForm from './ProjectForm'
+  import ProofreadForm from './ProofreadForm'
   import WorkContractForm2 from '../../sys/workContract/WorkContractForm2'
   import SelectUserTree from '@/views/modules/utils/treeUserSelect'
   import pick from 'lodash.pick'
@@ -192,7 +197,8 @@
     components: {
       ProjectForm,
       WorkContractForm2,
-      SelectUserTree
+      SelectUserTree,
+      ProofreadForm
     },
     mounted () {
       this.refreshList()
@@ -408,6 +414,10 @@
         }).catch((e) => {
           this.loading = false
         })
+      },
+      // 校对
+      proofread (id) {
+        this.$refs.proofreadForm.init(id)
       }
     }
   }

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

@@ -21,40 +21,10 @@
         </el-date-picker>
       </el-form-item>
       <el-form-item label="经办人" prop="handled">
-        <el-input size="small" v-model="searchForm.handled" placeholder="请输入经办人" clearable>
-          <el-button icon="el-icon-search" slot="append">
-            <SelectUserTree
-              ref="companyTree"
-              :props="{
-                  value: 'id',             // ID字段名
-                  label: 'name',         // 显示名称
-                  children: 'children'    // 子级字段名
-                }"
-              :url="`/sys/user/treeUserDataAllOffice?type=2`"
-              :value="searchForm.handled"
-              :clearable="true"
-              :accordion="true"
-              @getValue="(value, label) => {searchForm.handled=label}"/>
-          </el-button>
-        </el-input>
+        <UserSelect :limit='1' :userName="searchForm.handled" @getValue='(value, label) => {searchForm.handled = label}'></UserSelect>
       </el-form-item>
       <el-form-item label="报销人" prop="remiBy">
-        <el-input size="small" v-model="searchForm.remiBy" placeholder="请输入报销人" clearable>
-          <el-button icon="el-icon-search" slot="append">
-            <SelectUserTree
-              ref="companyTree"
-              :props="{
-                  value: 'id',             // ID字段名
-                  label: 'name',         // 显示名称
-                  children: 'children'    // 子级字段名
-                }"
-              :url="`/sys/user/treeUserDataAllOffice?type=2`"
-              :value="searchForm.remiBy"
-              :clearable="true"
-              :accordion="true"
-              @getValue="(value, label) => {searchForm.remiBy=label}"/>
-          </el-button>
-        </el-input>
+        <UserSelect :limit='1' :userName="searchForm.remiBy" @getValue='(value, label) => {searchForm.remiBy = label}'></UserSelect>
       </el-form-item>
       <el-form-item label="报销状态" prop="type">
         <el-select v-model="searchForm.type" placeholder="请选择" style="width:100%;">
@@ -67,40 +37,32 @@
         </el-select>
       </el-form-item>
       <el-form-item label="报销部门" prop="department">
-        <el-input size="small" v-model="searchForm.department" placeholder="请输入报销部门" clearable>
-          <el-button icon="el-icon-search" slot="append">
-            <SelectTree
-              ref="officeTree"
-              :props="{
-                    value: 'id',             // ID字段名
-                    label: 'name',         // 显示名称
-                    children: 'children'    // 子级字段名
-                  }"
-              :url="`/sys/office/treeData?type=2`"
-              :value="searchForm.department"
-              :clearable="true"
-              :accordion="true"
-              @getValue="(value,label) => {searchForm.department=label}"/>
-          </el-button>
-        </el-input>
+        <SelectTree
+          ref="officeTree"
+          :props="{
+                value: 'id',             // ID字段名
+                label: 'name',         // 显示名称
+                children: 'children'    // 子级字段名
+              }"
+          :url="`/sys/office/treeData?type=2`"
+          :value="searchForm.department"
+          :clearable="true"
+          :accordion="true"
+          @getValue="(value,label) => {searchForm.department=label}"/>
       </el-form-item>
       <el-form-item label="报销类别" prop="remiType">
-        <el-input size="small" v-model="searchForm.remiType" placeholder="请输入报销类别" clearable>
-          <el-button icon="el-icon-search" slot="append">
-            <SelectTree
-              ref="areaTree"
-              :props="{
-                      value: 'id',             // ID字段名
-                      label: 'name',         // 显示名称
-                      children: 'children'    // 子级字段名
-                    }"
-              url="/reimbursement/type/treeData?type=12"
-              :value="searchForm.remiType"
-              :clearable="true"
-              :accordion="true"
-              @getValue="(value, label) => {searchForm.remiType=label}"/>
-          </el-button>
-        </el-input>
+        <SelectTree
+          ref="areaTree"
+          :props="{
+                  value: 'id',             // ID字段名
+                  label: 'name',         // 显示名称
+                  children: 'children'    // 子级字段名
+                }"
+          url="/reimbursement/type/treeData?type=12"
+          :value="searchForm.remiType"
+          :clearable="true"
+          :accordion="true"
+          @getValue="(value, label) => {searchForm.remiType=label}"/>
       </el-form-item>
       <el-form-item label="报销金额" prop="amounts">
         <InputNumber :disabled="false" :precision="num" v-model="searchForm.amounts"></InputNumber>
@@ -189,6 +151,7 @@
   import ReimbursementService from '@/api/sys/ReimbursementService'
   import InputNumber from '@/views/modules/sys/workContract/InputNumber.vue'
   import SelectUserTree from '@/views/modules/utils/treeUserSelect'
+  import UserSelect from '@/components/userSelect'
   import SelectTree from '@/components/treeSelect/treeSelect.vue'
   import ProgramPageForm from '@/views/modules/finance/invoice/ProgramPageForm'
   import InfoForm from './InfoForm'
@@ -237,7 +200,8 @@
       SelectTree,
       ProgramPageForm,
       InfoForm,
-      ProjectForm
+      ProjectForm,
+      UserSelect
     },
     mounted () {
       this.refreshList()

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

@@ -87,7 +87,7 @@
           </vxe-table-column>
           <vxe-table-column field="reportNumber" title="报告号" :edit-render="{}">
             <template v-slot:edit="scope">
-              <el-input v-model="scope.row.reportNumber" ></el-input>
+              <el-input :disabled="true" v-model="scope.row.reportNumber" ></el-input>
             </template>
           </vxe-table-column>
           <vxe-table-column field="number" title="费用(元)" :edit-render="{}" :rules="[{required: true, message:'请输入费用', trigger:'blur'}]">
@@ -545,7 +545,7 @@
       },
       openProgramPageForm (rowIndex, row) {
         if (this.commonJS.isEmpty(row.typeName)) {
-          this.$message.error('请选择报销类型')
+          this.$message.error('请选择报销项目')
           return
         }
         this.indexRow = rowIndex
@@ -554,7 +554,7 @@
           let i = data.sort.toString()
           i = i.substring(0, 1)
           // 非业务报销
-          if (i === '2') {
+          if (i !== '1') {
             this.$refs.programPageForm.init('2', false)
           } else {
             // 打开单选组件
@@ -563,8 +563,10 @@
         })
       },
       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.$forceUpdate()
       },