Merge remote-tracking branch 'origin/master'

.env.production

@@ -2,7 +2,7 @@
 ENV = 'production'
 
 #Jeeplus快速开发平台/后台地址
-#VUE_APP_SERVER_URL = 'http://pg.xgccpm.com/jeeplus-vue'
+#VUE_APP_SERVER_URL = 'http://cpa.xgccpm.com/jeeplus-vue'
 VUE_APP_SERVER_URL = 'http://3081089em4.wicp.vip:36186/jeeplus-vue'
 #单点登录设置
 VUE_APP_SSO_LOGIN  = 'false'

src/api/materialManagement/WareHouseService.js

@@ -43,4 +43,18 @@ export default class WareHouseService {
       params: {id: id}
     })
   }
+  findRequestId (purchaseNo) {
+    return request({
+      url: '/material/management/wareHouse/findRequestId',
+      method: 'get',
+      params: {purchaseNo: purchaseNo}
+    })
+  }
+  updateStatusById (data) {
+    return request({
+      url: '/material/management/wareHouse/updateStatusById',
+      method: 'post',
+      data: data
+    })
+  }
 }

src/api/notify/NotifyService.js

@@ -17,6 +17,14 @@ export default class NotifyService {
     })
   }
 
+  close (id) {
+    return request({
+      url: '/notify/close',
+      method: 'delete',
+      params: {id: id}
+    })
+  }
+
   queryById (id) {
     return request({
       url: `/notify/queryById`,

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

@@ -469,7 +469,10 @@
       // Process_1665383385070 评估-报销申请
       // Process_1665628043339 评估-发票作废
       // Process_1665458731435 评估-发票申请
+      // Process_1669961023358 物资管理-采购申请
+      // Process_1672729521837 物资管理-领用申请
       // Process_1673332958749 财务-报告签章-实体章
+      // Process_1673492595431 物资管理-入库修改
       // 驳回
       reject (vars) {
         if (this.procDefId.includes('Process_1667978088459') ||
@@ -497,7 +500,10 @@
           this.procDefId.includes('Process_1665383385070') ||
           this.procDefId.includes('Process_1665628043339') ||
           this.procDefId.includes('Process_1665458731435') ||
-          this.procDefId.includes('Process_1673332958749')
+          this.procDefId.includes('Process_1669961023358') ||
+          this.procDefId.includes('Process_1672729521837') ||
+          this.procDefId.includes('Process_1673332958749') ||
+          this.procDefId.includes('Process_1673492595431')
         ) {
           console.log('进入新版驳回')
           this.$confirm(`确定驳回流程吗?`, '提示', {

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

@@ -430,6 +430,16 @@
           })
         }
       },
+      reapplyForm (callback) {
+        this.collectService.findById(this.inputForm.id).then(({data}) => {
+          if (data.status !== '4') { // 审核状态不是“驳回”，就弹出提示
+            this.$message.error('任务数据已发生改变或不存在，请在待办任务中确认此任务是否存在')
+            throw new Error('任务数据已发生改变或不存在，请在待办任务中确认此任务是否存在')
+          } else {
+            this.startForm(callback)
+          }
+        })
+      },
       // 暂存
       async saveForm (callback) {
         this.loading = true
@@ -535,12 +545,55 @@
         })
       },
       // 修改状态
-      updateStatusById (type) {
-        if (type === 'reject') {
-          this.inputForm.status = '4'
-          this.collectService.updateStatusById(this.inputForm)
+      async updateStatusById (type, callback) {
+        if (await this.$refs.uploadComponent.checkProgress()) {
+          this.loading = false
+          throw new Error()
+        } else {
+          if (type === 'reject' || type === 'reback') {
+            this.collectService.findById(this.inputForm.id).then(({data}) => {
+              if (data.status !== '2') { // status的值不等于“审核中”，就弹出提示
+                this.$message.error('任务数据已发生改变或不存在，请在待办任务中确认此任务是否存在')
+                throw new Error()
+              } else {
+                if (type === 'reject') {
+                  // 驳回
+                  this.inputForm.status = '4'
+                }
+                if (type === 'reback') {
+                  // 撤回
+                  this.inputForm.status = '3'
+                }
+                if (type === 'reject' || type === 'reback') {
+                  let param = {status: this.inputForm.status, id: this.inputForm.id}
+                  this.collectService.updateStatusById(param).then(() => {
+                    callback()
+                  })
+                }
+              }
+            })
+          } else if (type === 'hold') {
+            this.collectService.findById(this.inputForm.id).then(({data}) => {
+              if (data.status !== '4') { // status的值不等于“驳回”就弹出提示
+                this.$message.error('任务数据已发生改变或不存在，请在待办任务中确认此任务是否存在')
+                throw new Error()
+              } else {
+                // 终止
+                let param = {status: '1', id: this.inputForm.id}
+                this.collectService.updateStatusById(param).then(() => {
+                  callback()
+                })
+              }
+            })
+          }
         }
       },
+      // updateStatusById (type) {
+      //   if (type === 'reject') {
+      //     this.inputForm.status = '4'
+      //     this.collectService.updateStatusById(this.inputForm)
+      //   }
+      // },
       // footerMethod ({ columns, data }) {
       //   const footerData = [
       //     columns.map((column, columnIndex) => {
@@ -682,7 +735,7 @@
             return
           }
           if (this.commonJS.isNotEmpty(this.inputForm.detailInfos[j].collectNumber)) {
-            if (this.inputForm.detailInfos[j].surplusNumber < this.inputForm.detailInfos[j].collectNumber) {
+            if (parseFloat(this.inputForm.detailInfos[j].surplusNumber) < parseFloat(this.inputForm.detailInfos[j].collectNumber)) {
               this.$message.error('领用数量不能大于剩余数量')
               this.inputForm.detailInfos[j].collectNumber = ''
               return

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

@@ -9,18 +9,19 @@
         <el-input size="small" v-model="searchForm.goodsName" placeholder="请输入领用物品名称" clearable></el-input>
       </el-form-item>
       <el-form-item label="经办人" prop="handledBy">
-        <SelectUserTree
-          ref="companyTree"
-          :props="{
-                  value: 'id',             // ID字段名
-                  label: 'name',         // 显示名称
-                  children: 'children'    // 子级字段名
-                }"
-          :url="`/sys/user/treeUserDataAllOffice?type=2`"
-          :value="searchForm.handledBy"
-          :clearable="true"
-          :accordion="true"
-          @getValue="(value) => {searchForm.handledBy=value}"/>
+        <UserSelect :limit='1' :userName="searchForm.handledBy" @getValue='(value, label) => {searchForm.handledBy = label}'></UserSelect>
+<!--        <SelectUserTree-->
+<!--          ref="companyTree"-->
+<!--          :props="{-->
+<!--                  value: 'id',             // ID字段名-->
+<!--                  label: 'name',         // 显示名称-->
+<!--                  children: 'children'    // 子级字段名-->
+<!--                }"-->
+<!--          :url="`/sys/user/treeUserDataAllOffice?type=2`"-->
+<!--          :value="searchForm.handledBy"-->
+<!--          :clearable="true"-->
+<!--          :accordion="true"-->
+<!--          @getValue="(value) => {searchForm.handledBy=value}"/>-->
       </el-form-item>
       <el-form-item  prop="handledByOffice" label="经办人部门">
         <SelectTree
@@ -126,6 +127,7 @@
 </template>
 
 <script>
+  import UserSelect from '@/components/userSelect'
   import CollectService from '@/api/materialManagement/CollectService'
   import UpdateCollectInfoForm from './UpdateCollectInfoForm'
   import InputNumber from '@/views/modules/cw/workContract/InputNumber.vue'
@@ -175,6 +177,7 @@
       this.userService = new UserService()
     },
     components: {
+      UserSelect,
       InputNumber,
       SelectUserTree,
       SelectTree,
@@ -284,6 +287,7 @@
             this.$router.push({
               path: '/flowable/task/TaskForm',
               query: {
+                ...pick(data.data, 'formType', 'formUrl', 'procDefKey', 'taskDefKey', 'procInsId', 'procDefId', 'taskId', 'status', 'title'),
                 procDefId: this.processDefinitionAuditId,
                 procDefKey: this.procDefAuditKey,
                 status: 'startAndHold',
@@ -304,8 +308,10 @@
         let title = `发起流程【领用申请】`
         let processTitle = `${this.userName} 在 ${this.moment(new Date()).format('YYYY-MM-DD HH:mm')} 发起了[领用申请]`
         let status = 'startAndHold'
-        if (row.status === '3' || row.status === '4') {
+        if (row.status === '3') {
           status = 'startAndClose'
+        } else if (row.status === '4') {
+          status = 'reapplyFlag'
         }
         this.taskService.getTaskDef({ procDefId: this.processDefinitionAuditId,
           businessId: row.id,
@@ -313,6 +319,7 @@
             this.$router.push({
               path: '/flowable/task/TaskForm',
               query: {
+                ...pick(data.data, 'formType', 'formUrl', 'procDefKey', 'taskDefKey', 'procInsId', 'procDefId', 'taskId', 'status', 'title'),
                 procDefId: this.processDefinitionAuditId,
                 procDefKey: this.procDefAuditKey,
                 title: title,
@@ -339,13 +346,13 @@
             this.$router.push({
               path: '/flowable/task/TaskFormDetail',
               query: {
+                ...pick(data, 'formType', 'formUrl', 'procDefKey', 'taskDefKey', 'procInsId', 'procDefId', 'taskId', 'status', 'title'),
                 isShow: 'false',
                 readOnly: true,
                 title: '质控管理' + '流程详情',
                 formTitle: '质控管理' + '流程详情',
                 businessId: row.id,
-                status: 'reback',
-                ...pick(data, 'formType', 'formUrl', 'procDefKey', 'taskDefKey', 'procInsId', 'procDefId', 'taskId', 'title', 'businessId')
+                status: 'reback'
               }
             })
           })

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

@@ -87,7 +87,8 @@
         dataList: [],
         searchForm: {
           wareHouseType: ''
-        }
+        },
+        typeTest: ''
       }
     },
     collectService: null,
@@ -101,6 +102,7 @@
     methods: {
       init (collectType) {
         this.visible = true
+        this.typeTest = collectType
         this.list(collectType)
       },
       // 表单提交
@@ -117,7 +119,7 @@
         this.loading = true
         // this.searchForm.createId = this.$store.state.user.id
         // this.searchForm.status = '5'
-        this.searchForm.wareHouseType = collectType
+        this.searchForm.wareHouseType = this.typeTest
         this.collectService.wareHouseList({
           'current': this.tablePage.currentPage,
           'size': this.tablePage.pageSize,
@@ -142,6 +144,7 @@
       close () {
         this.$refs.searchForm.resetFields()
         this.visible = false
+        this.typeTest = ''
       }
     }
   }

src/views/modules/materialManagement/file/MaterialManagementV2.vue

@@ -12,7 +12,7 @@
                :on-change="changes"
                :on-progress="uploadVideoProcess"
                :file-list="fileList">
-      <el-button type="info" size="mini" :slot="auth==='view'&&uploadFlag===false?'tip':'trigger'" @click="clickHandel" :disabled="auth==='view'&&uploadFlag===false">点击上传</el-button>
+      <el-button type="primary" size="mini" :slot="auth==='view'&&uploadFlag===false?'tip':'trigger'" @click="clickHandel" :disabled="auth==='view'&&uploadFlag===false">点击上传</el-button>
     </el-upload>
     <div style="height: calc(100% - 80px);margin-top: 10px">
       <!-- 进度条 -->

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

@@ -7,7 +7,9 @@
       width="1500px"
       @close="close"
       @keyup.enter.native="doSubmit"
-      :visible.sync="visible">
+      :visible.sync="visible"
+      append-to-body
+    >
       <el-form size="middle" :model="inputForm" ref="inputForm" v-loading="loading" :class="method==='view'?'readonly':''"  :disabled="method==='view'"
                label-width="100px" @submit.native.prevent>
 

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

@@ -42,7 +42,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="采购时间" prop="purchaseDate" :rules="[{required: true, message:'请选择采购时间', trigger:'blur'}]">
+          <el-form-item label="采购申请时间" prop="purchaseDate" :rules="[{required: true, message:'请选择采购申请时间', trigger:'blur'}]">
             <el-date-picker
               v-model="inputForm.purchaseDate"
               type="date"
@@ -117,12 +117,12 @@
               <el-input v-model="scope.row.procurementType" @focus="typePullForm(scope.$rowIndex)"></el-input>
             </template>
           </vxe-table-column>
-          <vxe-table-column field="tradeName" title="商品名称" :edit-render="{}" :rules="[{required: true, message:'请填写商品名称', trigger:'blur'}]">
+          <vxe-table-column field="tradeName" title="商品名称" :edit-render="{}" :rules="[]">
             <template v-slot:edit="scope">
               <el-input v-model="scope.row.tradeName"></el-input>
             </template>
           </vxe-table-column>
-          <vxe-table-column field="tradePrice" title="商品单价(元)" :edit-render="{}" :rules="[{required: true, message:'请输入商品单价', trigger:'blur'}]">
+          <vxe-table-column field="tradePrice" title="商品单价(元)" :edit-render="{}" :rules="[]">
             <template v-slot:edit="scope">
 <!--              <el-input @change="changeValue" 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" @blur="scope.row.tradePrice = twoDecimalPlaces2(scope.row.tradePrice)"></el-input>
@@ -227,18 +227,15 @@
 
 <script>
   import UserSelect from '@/components/userSelect'
-  // import UpLoadComponentDialog from '@/views/common/UpLoadComponentDialog'
+  import CommonApi from '@/api/cw/common/CommonApi'
   import MaterialManagementDialog from '../file/MaterialManagementDialog'
-  // import ReimbursementApprovalService from '@/api/cw/reimbursementApproval/ReimbursementApprovalService'
   import MaterialManagementService from '@/api/materialManagement/MaterialManagementService'
-  // import ReimbursementApprovalTypeService from '@/api/cw/reimbursementApproval/ReimbursementApprovalTypeService'
   import UpLoadComponent from '@/views/common/UpLoadComponent'
   import SelectUserTree from '@/views/modules/utils/treeUserSelect'
   import SelectTree from '@/components/treeSelect/treeSelect.vue'
   import XEUtils from 'xe-utils'
   import UserService from '@/api/sys/UserService'
   import CwProgramPageForm from '@/views/modules/cw/reimbursementApproval/info/CwProgramPageForm'
-  // import CwReimbursementTypePullForm from '@/views/modules/cw/reimbursementApproval/info/CwReimbursementTypePullForm'
   import MaterialTypePullForm from '../info/MaterialTypePullForm'
   import UserPullForm from '@/views/modules/finance/invoice/UserPullForm'
   export default {
@@ -253,18 +250,6 @@
           ],
           procurementType: [
             {required: true, message: '采购类型不能为空'}
-          ],
-          tradeName: [
-            {required: true, message: '商品名称不能为空'}
-          ],
-          tradePrice: [
-            {required: true, message: '商品单价不能为空'}
-          ],
-          tradeNumber: [
-            {required: true, message: '商品数量不能为空'}
-          ],
-          priceSum: [
-            {required: true, message: '商品总价不能为空'}
           ]
         },
         title: '',
@@ -285,25 +270,20 @@
           purchaseDate: '',
           remarks: '',
           detailInfos: [],
+          procInsId: '',
           // amountInfos: [],
           files: [] // 附件信息
         },
         keyWatch: ''
       }
     },
-    // ReimbursementApprovalService: null,
     MaterialManagementService: null,
-    // reimbursementApprovalTypeService: null,
     userService: null,
+    commonApi: null,
     created () {
-      // this.reimbursementApprovalService = new ReimbursementApprovalService()
       this.materialManagementService = new MaterialManagementService()
-      // this.inputForm.userId = this.userId
-      // this.inputForm.handledBy = this.name
-      // this.inputForm.purchaseDate = new Date()
-      // this.inputForm.deptName = this.officeName
       this.userService = new UserService()
-      // this.reimbursementApprovalTypeService = new ReimbursementApprovalTypeService()
+      this.commonApi = new CommonApi()
     },
     props: {
       businessId: {
@@ -326,7 +306,6 @@
       SelectUserTree,
       SelectTree,
       CwProgramPageForm,
-      // CwReimbursementTypePullForm,
       MaterialTypePullForm,
       UserPullForm
     },
@@ -384,6 +363,7 @@
           purchaseDate: new Date(),
           remarks: '',
           detailInfos: [],
+          procInsId: '',
           // amountInfos: [],
           files: [] // 附件信息
         }
@@ -450,36 +430,6 @@
           if (method !== 'edit' && method !== 'view') {
             this.$refs.uploadComponent.newUpload(method, [], 'reimbursement')
           }
-          // if (method === 'edit' || method === 'view') { // 修改或者查看
-          //   this.loading = true
-          //   this.$refs.inputForm.resetFields()
-          //   this.materialManagementService.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
-          //     }
-          //     if (this.commonJS.isNotEmpty(data.purchaserAgentId)) {
-          //       this.purchaserAgentId = data.purchaserAgentId
-          //     }
-          //     if (this.commonJS.isNotEmpty(data.procurementTypeId)) {
-          //       this.procurementTypeId = data.procurementTypeId
-          //     }
-          //     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
-          //   })
-          // }
-          // if (method !== 'edit' && method !== 'view') {
-          //   this.$refs.uploadComponent.newUpload(method, [], 'reimbursement')
-          // }
         })
       },
       getUpload (p, index) {
@@ -524,14 +474,6 @@
             }).catch(() => {
               this.loading = false
             })
-            // this.reimbursementApprovalService.save(this.inputForm).then(({data}) => {
-            //   this.close()
-            //   this.$message.success(data)
-            //   this.$emit('refreshDataList')
-            //   this.loading = false
-            // }).catch(() => {
-            //   this.loading = false
-            // })
           }
         })
       },
@@ -550,7 +492,6 @@
         }
         if (type === 'amount') {
           this.$refs.amountTable.remove(row)
-          // this.inputForm.amountInfos.splice(rowIndex, 1)
         }
       },
       // 新增
@@ -569,6 +510,16 @@
           })
         }
       },
+      reapplyForm (callback) {
+        this.materialManagementService.findById(this.inputForm.id).then(({data}) => {
+          if (data.status !== '4') { // 审核状态不是“驳回”，就弹出提示
+            this.$message.error('任务数据已发生改变或不存在，请在待办任务中确认此任务是否存在')
+            throw new Error('任务数据已发生改变或不存在，请在待办任务中确认此任务是否存在')
+          } else {
+            this.startForm(callback)
+          }
+        })
+      },
       // 暂存
       async saveForm (callback) {
         this.loading = true
@@ -589,14 +540,6 @@
           this.$refs.inputForm.resetFields()
           this.loading = false
         })
-        // this.reimbursementApprovalService.save(this.inputForm).then(({data}) => {
-        //   callback()
-        //   this.$refs.inputForm.resetFields()
-        //   this.loading = false
-        // }).catch(() => {
-        //   this.$refs.inputForm.resetFields()
-        //   this.loading = false
-        // })
       },
       // 送审
       async startForm (callback) {
@@ -628,21 +571,6 @@
                   this.loading = false
                   return
                 }
-                if (this.commonJS.isEmpty(this.inputForm.detailInfos[j].tradeName)) {
-                  this.$message.error('采购详情第' + k + '行请输入商品名称')
-                  this.loading = false
-                  return
-                }
-                if (this.commonJS.isEmpty(this.inputForm.detailInfos[j].tradePrice)) {
-                  this.$message.error('采购详情第' + k + '行请输入商品单价')
-                  this.loading = false
-                  return
-                }
-                if (this.commonJS.isEmpty(this.inputForm.detailInfos[j].tradeNumber)) {
-                  this.$message.error('采购详情第' + k + '行请输入商品数量')
-                  this.loading = false
-                  return
-                }
               }
             }
             this.inputForm.files = this.$refs.uploadComponent.getDataList()
@@ -655,14 +583,6 @@
               this.$refs.inputForm.resetFields()
               this.loading = false
             })
-            // this.reimbursementApprovalService.save(this.inputForm).then(({data}) => {
-            //   callback(data.businessTable, data.businessId, this.inputForm)
-            //   this.$refs.inputForm.resetFields()
-            //   this.loading = false
-            // }).catch(() => {
-            //   this.$refs.inputForm.resetFields()
-            //   this.loading = false
-            // })
           }
         })
       },
@@ -679,34 +599,75 @@
               this.inputForm.files = []
             }
             this.inputForm.files = this.$refs.uploadComponent.getDataList()
-            await this.userService.is().then(({data}) => {
-              if (data) {
-                this.inputForm.status = '5'
+            console.log('this.inputForm.procInsId', this.inputForm.procInsId)
+            this.commonApi.getTaskNameByProcInsId(this.inputForm.procInsId).then(({data}) => {
+              if (this.commonJS.isNotEmpty(data)) {
+                console.log('进来了', data)
+                if (data === '公司领导审批') {
+                  this.inputForm.status = '5'
+                }
               }
+              this.materialManagementService.save(this.inputForm).then(({data}) => {
+                callback(data.businessTable, data.businessId, this.inputForm)
+                this.loading = false
+              }).catch(() => {
+                this.loading = false
+              })
             })
-            this.materialManagementService.save(this.inputForm).then(({data}) => {
-              callback(data.businessTable, data.businessId, this.inputForm)
-              this.loading = false
-            }).catch(() => {
-              this.loading = false
-            })
-            // this.reimbursementApprovalService.save(this.inputForm).then(({data}) => {
-            //   callback(data.businessTable, data.businessId, this.inputForm)
-            //   this.loading = false
-            // }).catch(() => {
-            //   this.loading = false
-            // })
           }
         })
       },
-      // 修改状态
-      updateStatusById (type) {
-        if (type === 'reject') {
-          this.inputForm.status = '4'
-          // this.reimbursementApprovalService.updateStatusById(this.inputForm)
-          this.materialManagementService.updateStatusById(this.inputForm)
+      async updateStatusById (type, callback) {
+        if (await this.$refs.uploadComponent.checkProgress()) {
+          this.loading = false
+          throw new Error()
+        } else {
+          if (type === 'reject' || type === 'reback') {
+            this.materialManagementService.findById(this.inputForm.id).then(({data}) => {
+              if (data.status !== '2') { // status的值不等于“审核中”，就弹出提示
+                this.$message.error('任务数据已发生改变或不存在，请在待办任务中确认此任务是否存在')
+                throw new Error()
+              } else {
+                if (type === 'reject') {
+                  // 驳回
+                  this.inputForm.status = '4'
+                }
+                if (type === 'reback') {
+                  // 撤回
+                  this.inputForm.status = '3'
+                }
+                if (type === 'reject' || type === 'reback') {
+                  let param = {status: this.inputForm.status, id: this.inputForm.id}
+                  this.materialManagementService.updateStatusById(param).then(() => {
+                    callback()
+                  })
+                }
+              }
+            })
+          } else if (type === 'hold') {
+            this.materialManagementService.findById(this.inputForm.id).then(({data}) => {
+              if (data.status !== '4') { // status的值不等于“驳回”就弹出提示
+                this.$message.error('任务数据已发生改变或不存在，请在待办任务中确认此任务是否存在')
+                throw new Error()
+              } else {
+                // 终止
+                let param = {status: '1', id: this.inputForm.id}
+                this.materialManagementService.updateStatusById(param).then(() => {
+                  callback()
+                })
+              }
+            })
+          }
         }
       },
+      // 修改状态
+      // updateStatusById (type) {
+      //   if (type === 'reject') {
+      //     this.inputForm.status = '4'
+      //     // this.reimbursementApprovalService.updateStatusById(this.inputForm)
+      //     this.materialManagementService.updateStatusById(this.inputForm)
+      //   }
+      // },
       footerMethod ({ columns, data }) {
         const footerData = [
           columns.map((column, columnIndex) => {
@@ -778,14 +739,6 @@
         str = str.replace(/[^\d^\.]+/g, '') // 保留数字和小数点
         return str
       },
-      // isExict (row) {
-      //   this.reimbursementApprovalService.checkNumber(row.number).then(({data}) => {
-      //     if (data) {
-      //       this.$message.error('该发票号已存在')
-      //       row.number = ''
-      //     }
-      //   })
-      // },
       countAmount (row) {
         let amount
         let taxAmount

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

@@ -9,18 +9,19 @@
 <!--        <el-input size="small" v-model="searchForm.handledBy" placeholder="请输入经办人" clearable></el-input>-->
 <!--      </el-form-item>-->
       <el-form-item label="经办人" prop="handledBy">
-        <SelectUserTree
-          ref="companyTree"
-          :props="{
-                  value: 'id',             // ID字段名
-                  label: 'name',         // 显示名称
-                  children: 'children'    // 子级字段名
-                }"
-          :url="`/sys/user/treeUserDataAllOffice?type=2`"
-          :value="searchForm.handledBy"
-          :clearable="true"
-          :accordion="true"
-          @getValue="(value) => {searchForm.handledBy=value}"/>
+        <UserSelect :limit='1' :userName="searchForm.handledBy" @getValue='(value, label) => {searchForm.handledBy = label}'></UserSelect>
+<!--        <SelectUserTree-->
+<!--          ref="companyTree"-->
+<!--          :props="{-->
+<!--                  value: 'id',             // ID字段名-->
+<!--                  label: 'name',         // 显示名称-->
+<!--                  children: 'children'    // 子级字段名-->
+<!--                }"-->
+<!--          :url="`/sys/user/treeUserDataAllOffice?type=2`"-->
+<!--          :value="searchForm.handledBy"-->
+<!--          :clearable="true"-->
+<!--          :accordion="true"-->
+<!--          @getValue="(value) => {searchForm.handledBy=value}"/>-->
       </el-form-item>
       <el-form-item  prop="handledByOffice" label="经办人部门">
         <SelectTree
@@ -116,7 +117,7 @@
           :data="dataList"
           :checkbox-config="{}">
           <vxe-column type="seq" width="60" title="序号"></vxe-column>
-          <vxe-column min-width="160" align="center" title="采购编号" field="purchaseNo"></vxe-column>
+          <vxe-column min-width="160" align="center" title="采购申请编号" field="purchaseNo"></vxe-column>
           <vxe-column min-width="160" align="center" title="采购名称" field="purchaseSketch">
             <template slot-scope="scope">
               <el-link  type="primary" :underline="false" v-if="hasPermission('material:list')" @click="view(scope.row.id)">{{scope.row.purchaseSketch}}</el-link>
@@ -165,6 +166,7 @@
 </template>
 
 <script>
+  import UserSelect from '@/components/userSelect'
   import UpdateInfoForm from '../info/UpdateInfoForm'
   import InputNumber from '@/views/modules/cw/workContract/InputNumber.vue'
   import SelectTree from '@/components/treeSelect/treeSelect.vue'
@@ -225,7 +227,8 @@
       InputNumber,
       SelectUserTree,
       SelectTree,
-      UpdateInfoForm
+      UpdateInfoForm,
+      UserSelect
     },
     computed: {
       userName () {
@@ -336,6 +339,7 @@
             this.$router.push({
               path: '/flowable/task/TaskForm',
               query: {
+                ...pick(data.data, 'formType', 'formUrl', 'procDefKey', 'taskDefKey', 'procInsId', 'procDefId', 'taskId', 'status', 'title'),
                 procDefId: this.processDefinitionAuditId,
                 procDefKey: this.procDefAuditKey,
                 status: 'startAndHold',
@@ -356,8 +360,10 @@
         let title = `发起流程【采购申请】`
         let processTitle = `${this.userName} 在 ${this.moment(new Date()).format('YYYY-MM-DD HH:mm')} 发起了[采购申请]`
         let status = 'startAndHold'
-        if (row.status === '3' || row.status === '4') {
+        if (row.status === '3') {
           status = 'startAndClose'
+        } else if (row.status === '4') {
+          status = 'reapplyFlag'
         }
         this.taskService.getTaskDef({ procDefId: this.processDefinitionAuditId,
           businessId: row.id,
@@ -365,6 +371,7 @@
             this.$router.push({
               path: '/flowable/task/TaskForm',
               query: {
+                ...pick(data.data, 'formType', 'formUrl', 'procDefKey', 'taskDefKey', 'procInsId', 'procDefId', 'taskId', 'status', 'title'),
                 procDefId: this.processDefinitionAuditId,
                 procDefKey: this.procDefAuditKey,
                 title: title,
@@ -391,13 +398,13 @@
             this.$router.push({
               path: '/flowable/task/TaskFormDetail',
               query: {
+                ...pick(data, 'formType', 'formUrl', 'procDefKey', 'taskDefKey', 'procInsId', 'procDefId', 'taskId', 'status', 'title'),
                 isShow: 'false',
                 readOnly: true,
                 title: '质控管理' + '流程详情',
                 formTitle: '质控管理' + '流程详情',
                 businessId: row.id,
-                status: 'reback',
-                ...pick(data, 'formType', 'formUrl', 'procDefKey', 'taskDefKey', 'procInsId', 'procDefId', 'taskId', 'title', 'businessId')
+                status: 'reback'
               }
             })
           })

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

@@ -61,8 +61,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="采购编号" prop="purchaseNo"
-                          :rules="[{required: true, message:'采购编号不能为空', trigger:'blur'},
-                              {required: true, message:'采购编号不能为空', trigger:'change'}]">
+                          :rules="[]">
               <el-input size="medium" :readonly="true" @focus="openContractForm()" v-model="inputForm.purchaseNo" placeholder="请选择采购编号">
                 <el-button slot="append" icon="el-icon-search" @click="openContractForm()"></el-button>
               </el-input>
@@ -82,7 +81,8 @@
         </el-row>
 
         <el-divider content-position="left"><i class="el-icon-document"></i>
-          采购详情
+          <el-link v-if="this.commonJS.isNotEmpty(this.inputForm.purchaseNo)" :underline="false" @click="viewContract(inputForm.purchaseNo)">采购详情</el-link>
+          <span v-else>采购详情</span>
 <!--          <el-button style="margin-left: 20px" type="primary" @click="insertEvent('detail')" plain>-->
 <!--            新增-->
 <!--          </el-button>-->
@@ -204,26 +204,33 @@
                 <el-input maxlength="64" v-model="scope.row.tradeName"></el-input>
               </template>
             </vxe-table-column>
-            <vxe-table-column field="tradePrice" title="商品单价(元)" :edit-render="{}" :rules="[{required: true, message:'请输入商品单价', trigger:'blur'}]">
+
+            <vxe-table-column field="tradeNumber" title="商品数量" :edit-render="{}">
               <template v-slot:edit="scope">
-                <el-input @change="changeValue2" maxlength="15" v-model="scope.row.tradePrice" @blur="scope.row.tradePrice = twoDecimalPlaces2(scope.row.tradePrice)"></el-input>
+                <el-input @change="changeValue2" v-model="scope.row.tradeNumber" @blur="scope.row.tradeNumber = twoDecimalPlaces2(scope.row.tradeNumber)" maxlength="10"></el-input>
               </template>
             </vxe-table-column>
-            <vxe-table-column field="tradeNumber" title="商品数量" :edit-render="{}">
+            <vxe-table-column field="company" title="单位" :edit-render="{}" :rules="[{required: true, message:'请填写单位', trigger:'blur'}]">
               <template v-slot:edit="scope">
-                <el-input @change="changeValue2" v-model="scope.row.tradeNumber" @blur="scope.row.tradeNumber = twoDecimalPlaces2(scope.row.tradeNumber)" maxlength="10"></el-input>
+                <el-input maxlength="64" v-model="scope.row.company"></el-input>
+              </template>
+            </vxe-table-column>
+            <vxe-table-column field="tradePrice" title="商品单价(元)" :edit-render="{}" :rules="[{required: true, message:'请输入商品单价', trigger:'blur'}]">
+              <template v-slot:edit="scope">
+                <el-input @change="changeValue2" maxlength="15" v-model="scope.row.tradePrice" @blur="scope.row.tradePrice = twoDecimalPlaces2(scope.row.tradePrice)"></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" @blur="scope.row.priceSum = twoDecimalPlaces(scope.row.priceSum)" maxlength="15"></el-input>
+                <el-input :disabled='true' v-model="scope.row.priceSum" @blur="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'}]">
+            <vxe-table-column field="actualPrice" title="实际价格" :edit-render="{}">
               <template v-slot:edit="scope">
-                <el-input maxlength="64" v-model="scope.row.company"></el-input>
+                <el-input v-model="scope.row.actualPrice" @blur="scope.row.actualPrice = twoDecimalPlaces(scope.row.actualPrice)" maxlength="15"></el-input>
               </template>
             </vxe-table-column>
+
             <vxe-table-column field="remarks" title="备注" :edit-render="{}">
               <template v-slot:edit="scope">
                 <el-input maxlength="255" v-model="scope.row.remarks" ></el-input>
@@ -242,6 +249,7 @@
 
       </el-form>
       <!-- 附件 -->
+      <UpdateInfoForm ref="updateInfoForm"></UpdateInfoForm>
       <UpLoadComponent ref="uploadComponent"></UpLoadComponent>
       <MaterialManagementDialog ref="materialManagementDialog" @getUpload="getUpload"></MaterialManagementDialog>
       <CwProgramPageForm ref="cwProgramPageForm" @getProgram="getProgram"></CwProgramPageForm>
@@ -267,6 +275,7 @@
   import UserPullForm from '@/views/modules/finance/invoice/UserPullForm'
   import PurchaseChooseForm from './PurchaseChooseForm'
   import XEUtils from 'xe-utils'
+  import UpdateInfoForm from '../info/UpdateInfoForm'
   export default {
     data () {
       return {
@@ -285,9 +294,6 @@
           ],
           tradeNumber: [
             {required: true, message: '商品数量不能为空'}
-          ],
-          tradePrice: [
-            {required: true, message: '商品单价不能为空'}
           ]
         },
         title: '',
@@ -296,6 +302,7 @@
         loading: false,
         inputForm: {
           wareHouseTotalPrice: '', // 入库商品总价
+          wareHouseActualPrice: '', // 入库商品实际价格
           tradeTotalPrice: '',  // 商品总价
           fileInfoLost: [],
           purchaseNo: '',
@@ -327,7 +334,8 @@
       MaterialManagementDialog,
       UpLoadComponent,
       UserPullForm,
-      PurchaseChooseForm
+      PurchaseChooseForm,
+      UpdateInfoForm
     },
     computed: {
       name () {
@@ -348,6 +356,7 @@
         this.method = method
         this.inputForm = {
           wareHouseTotalPrice: '', // 入库商品总价
+          wareHouseActualPrice: '', // 入库商品实际价格
           tradeTotalPrice: '',  // 商品总价
           fileInfoLost: [],
           purchaseNo: '',
@@ -579,6 +588,11 @@
               this.inputForm.wareHouseTotalPrice = XEUtils.sum(data, column.property)
               return XEUtils.sum(data, column.property)
             }
+            if (['actualPrice'].includes(column.property)) {
+              // eslint-disable-next-line no-undef
+              this.inputForm.wareHouseActualPrice = XEUtils.sum(data, column.property)
+              return XEUtils.sum(data, column.property)
+            }
             return null
           })
         ]
@@ -644,11 +658,6 @@
                   this.loading = false
                   return
                 }
-                if (this.commonJS.isEmpty(this.inputForm.wareHouse[j].tradePrice)) {
-                  this.$message.error('入库详情第' + k + '行请输入商品单价')
-                  this.loading = false
-                  return
-                }
               }
             }
             this.inputForm.files = this.$refs.uploadComponent.getDataList()
@@ -704,6 +713,13 @@
             this.inputForm.amountInfos.push(data)
           })
         }
+      },
+      // 查看采购详情
+      async viewContract (purchaseNo) {
+        this.wareHouseService.findRequestId(purchaseNo).then(({data}) => {
+          this.$refs.updateInfoForm.init('view', data)
+        }).catch(() => {
+        })
       }
     }
   }

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

@@ -9,18 +9,19 @@
         <el-input size="small" v-model="searchForm.wareHouseName" placeholder="请输入入库名称" clearable></el-input>
       </el-form-item>
       <el-form-item label="经办人" prop="handledBy">
-        <SelectUserTree
-          ref="companyTree"
-          :props="{
-                  value: 'id',             // ID字段名
-                  label: 'name',         // 显示名称
-                  children: 'children'    // 子级字段名
-                }"
-          :url="`/sys/user/treeUserDataAllOffice?type=2`"
-          :value="searchForm.handledBy"
-          :clearable="true"
-          :accordion="true"
-          @getValue="(value) => {searchForm.handledBy=value}"/>
+        <UserSelect :limit='1' :userName="searchForm.handledBy" @getValue='(value, label) => {searchForm.handledBy = label}'></UserSelect>
+<!--        <SelectUserTree-->
+<!--          ref="companyTree"-->
+<!--          :props="{-->
+<!--                  value: 'id',             // ID字段名-->
+<!--                  label: 'name',         // 显示名称-->
+<!--                  children: 'children'    // 子级字段名-->
+<!--                }"-->
+<!--          :url="`/sys/user/treeUserDataAllOffice?type=2`"-->
+<!--          :value="searchForm.handledBy"-->
+<!--          :clearable="true"-->
+<!--          :accordion="true"-->
+<!--          @getValue="(value) => {searchForm.handledBy=value}"/>-->
       </el-form-item>
       <el-form-item  prop="handledByOffice" label="经办人部门">
         <SelectTree
@@ -36,6 +37,16 @@
           :accordion="true"
           @getValue="(value) => {searchForm.handledByOffice=value}"/>
       </el-form-item>
+      <el-form-item label="状态" prop="status">
+        <el-select v-model="searchForm.status" placeholder="请选择" style="width:100%;"clearable>
+          <el-option
+            v-for="item in $dictUtils.getDictList('cw_status')"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value">
+          </el-option>
+        </el-select>
+      </el-form-item>
       <el-form-item label="入库时间" prop="wareHouseDates">
         <el-date-picker
           placement="bottom-start"
@@ -90,13 +101,28 @@
           <vxe-column min-width="160" align="center" title="入库时间" field="wareHouseDate"></vxe-column>
           <vxe-column min-width="160" align="center" title="经办人" field="handleByName"></vxe-column>
           <vxe-column min-width="160" align="center" title="经办人部门" field="handledByOfficeName"></vxe-column>
+          <vxe-column min-width="160" align="center" title="修改申请状态" field="status">
+            <template slot-scope="scope">
+              <el-button  type="text" @click="detail(scope.row)" effect="dark" size="mini"
+                          :type="$dictUtils.getDictLabel('cw_status_flag', scope.row.status, '-')">
+                {{$dictUtils.getDictLabel("cw_status", scope.row.status, '-')}}
+              </el-button>
+            </template>
+          </vxe-column>
 
           <vxe-column title="操作" width="150px" fixed="right" align="center">
             <template  slot-scope="scope">
-              <el-button v-if="hasPermission('material:edit')&&scope.row.createBy === $store.state.user.id" type="text"  size="small" @click="edit(scope.row.id)">修改</el-button>
-              <el-button v-else-if="hasPermission('material:edit')&&isAdmin" type="text"  size="small" @click="edit(scope.row.id)">修改</el-button>
-              <el-button v-if="hasPermission('material:del')&&scope.row.createBy === $store.state.user.id" type="text"   size="small" @click="del(scope.row.id)">删除</el-button>
-              <el-button v-else-if="hasPermission('material:del')&&isAdmin" type="text"   size="small" @click="del(scope.row.id)">删除</el-button>
+<!--              <el-button v-if="hasPermission('material:edit')&&scope.row.createBy === $store.state.user.id" type="text"  size="small" @click="edit(scope.row.id)">修改</el-button>-->
+              <el-button v-if="hasPermission('material:edit')&&isAdmin" type="text"  size="small" @click="edit(scope.row.id)">修改</el-button>
+<!--              <el-button v-if="hasPermission('material:del')&&scope.row.createBy === $store.state.user.id" type="text"   size="small" @click="del(scope.row.id)">删除</el-button>-->
+              <el-button v-if="hasPermission('material:del')&&isAdmin" type="text"   size="small" @click="del(scope.row.id)">删除</el-button>
+              <el-button v-if="hasPermission('material:wareHouse:edit')&&scope.row.createBy === $store.state.user.id&&(scope.row.status==='0'||scope.row.status==='5')" type="text"  size="small" @click="push(scope.row)">申请修改</el-button>
+              <!--              当前申请人撤回-->
+              <el-button v-if="hasPermission('material:wareHouse: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:wareHouse:edit')&&scope.row.createBy === $store.state.user.id&&(scope.row.status==='3'||scope.row.status==='1')" type="text"  size="small" @click="push(scope.row)">申请修改</el-button>
+              <!--              当前申请人撤回后->取消修改申请-->
+<!--              <el-button v-if="hasPermission('material:edit:edit')&&scope.row.createBy === $store.state.user.id&&scope.row.status==='3'" type="text"  size="small" @click="stopUpdate(scope.row.id)">取消修改</el-button>-->
             </template>
           </vxe-column>
         </vxe-table>
@@ -119,6 +145,7 @@
 
 <script>
   // import UpdateInfoForm from '../info/UpdateInfoForm'
+  import UserSelect from '@/components/userSelect'
   import WareHouseAddForm from './WareHouseAddForm'
   import InputNumber from '@/views/modules/cw/workContract/InputNumber.vue'
   import SelectTree from '@/components/treeSelect/treeSelect.vue'
@@ -129,12 +156,14 @@
   import ProcessService from '@/api/flowable/ProcessService'
   import UserService from '@/api/sys/UserService'
   import SelectUserTree from '@/views/modules/utils/treeUserSelect'
-  export default {
+  import pick from 'lodash.pick'
+export default {
     data () {
       return {
         num: 0,
         searchForm: {
           wareHouseName: '',
+          status: '',
           wareHouseNumber: '',
           handledBy: '',
           handledByOffice: '',
@@ -176,7 +205,8 @@
       SelectUserTree,
       SelectTree,
       // UpdateInfoForm
-      WareHouseAddForm
+      WareHouseAddForm,
+      UserSelect
     },
     computed: {
       userName () {
@@ -244,7 +274,7 @@
         //   this.loading = false
         // })
         this.checkIsAdmin()
-        this.processService.getByName('物资管理-采购申请').then(({data}) => {
+        this.processService.getByName('物资管理-入库修改').then(({data}) => {
           if (!this.commonJS.isEmpty(data.id)) {
             this.processDefinitionAuditId = data.id
             this.procDefAuditKey = data.key
@@ -286,6 +316,91 @@
       resetSearch () {
         this.$refs.searchForm.resetFields()
         this.refreshList()
+      },
+      // 发起物资管理-入库修改
+      push (row) {
+        this.wareHouseService.findById(row.id).then(({data}) => {
+          if (data.status !== row.status) { // status的值不等于“审核中”，就弹出提示
+            this.$message.error('数据已发生改变或不存在，请刷新数据')
+            this.refreshList()
+          } else {
+            // 读取流程表单
+            let title = `发起流程【物资管理-入库修改】`
+            let processTitle = `${this.userName} 在 ${this.moment(new Date()).format('YYYY-MM-DD HH:mm')} 发起了[物资管理-入库修改]`
+            let status = 'startAndClose'
+            if (row.status === '3') {
+              status = 'startAndClose'
+            } else if (row.status === '4') {
+              status = 'reapplyFlag'
+            }
+            this.taskService.getTaskDef({ procDefId: this.processDefinitionAuditId,
+              businessId: row.id,
+              businessTable: 'material_management_warehouse_basics'}).then((data) => {
+                this.$router.push({
+                  path: '/flowable/task/TaskForm',
+                  query: {
+                    ...pick(data.data, 'formType', 'formUrl', 'procDefKey', 'taskDefKey', 'procInsId', 'procDefId', 'taskId', 'status', 'title'),
+                    procDefId: this.processDefinitionAuditId,
+                    procDefKey: this.procDefAuditKey,
+                    title: title,
+                    formType: data.data.formType,
+                    formUrl: data.data.formUrl,
+                    formTitle: processTitle,
+                    businessTable: 'material_management_warehouse_basics',
+                    businessId: row.id,
+                    isShow: 'false',
+                    status: status,
+                    routePath: '/materialManagement/wareHouse/WareHouseList'
+                  }
+                })
+              })
+          }
+        })
+      },
+      // 查看修改流程结果
+      detail (row) {
+        if (row.status !== '0' && row.status !== '1') {
+          // eslint-disable-next-line eqeqeq
+          this.taskService.getTaskDef({
+            procInsId: row.procInsId,
+            procDefId: this.processDefinitionAuditId
+          }).then(({data}) => {
+            this.$router.push({
+              path: '/flowable/task/TaskFormDetail',
+              query: {
+                ...pick(data, 'formType', 'formUrl', 'procDefKey', 'taskDefKey', 'procInsId', 'procDefId', 'taskId', 'status', 'title'),
+                isShow: 'false',
+                readOnly: true,
+                title: '客户修改' + '流程详情',
+                formTitle: '客户修改' + '流程详情',
+                businessId: row.id,
+                status: 'reback'
+              }
+            })
+          })
+        }
+      },
+      // 撤回入库修改
+      reback (row) {
+        this.$confirm(`确定要撤回该申请吗?`, '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          this.wareHouseService.findById(row.id).then(({data}) => {
+            if (data.status !== '2') { // status的值不等于“审核中”，就弹出提示
+              this.$message.error('数据已发生改变或不存在，请刷新数据')
+              this.refreshList()
+            } else {
+              this.processService.revokeProcIns(row.procInsId).then(({data}) => {
+                let form = {status: '3', id: row.id}
+                this.wareHouseService.updateStatusById(form)
+                this.$message.success(data)
+                this.refreshList()
+              })
+            }
+          })
+        })
       }
     }
   }

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

@@ -0,0 +1,842 @@
+<template>
+  <div>
+    <el-form size="middle" :model="inputForm" ref="inputForm" v-loading="loading" :class="method==='view'?'readonly':''"  :disabled="formReadOnly"
+             label-width="100px" @submit.native.prevent>
+      <el-divider content-position="left"><i class="el-icon-document"></i> 基础信息</el-divider>
+      <el-row :gutter="26">
+        <el-col :span="12">
+          <el-form-item label="入库编号" prop="wareHouseNumber">
+            <el-input placeholder="自动生成" v-model="inputForm.wareHouseNumber" :disabled="true"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="入库名称" prop="wareHouseName"
+                        :rules="[{required: true, message: '入库名称不能为空', trigger: 'blur'}
+                 ]">
+            <el-input v-model="inputForm.wareHouseName" placeholder="请填写入库名称"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="经办人" prop="handledBy">
+            <el-input v-model="inputForm.handledBy" :disabled="true"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="经办人部门" prop="handledByOffice">
+            <SelectTree
+              :disabled="true"
+              ref="officeTree"
+              :props="{
+                  value: 'id',             // ID字段名
+                  label: 'name',         // 显示名称
+                  children: 'children'    // 子级字段名
+                }"
+
+              :url="`/sys/office/treeData?type=2`"
+              :value="inputForm.handledByOffice"
+              :accordion="true"
+              size="medium"
+              @getValue="(value) => {inputForm.handledByOffice=value}"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="入库时间" prop="wareHouseDate" :rules="[{required: true, message:'请选择入库时间', trigger:'blur'}]">
+            <el-date-picker
+              v-model="inputForm.wareHouseDate"
+              type="date"
+              value-format="yyyy-MM-dd"
+              style="width: 100%"
+              placeholder="选择日期">
+            </el-date-picker>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="采购编号" prop="purchaseNo"
+                        :rules="[]">
+            <el-input size="medium" :readonly="true" @focus="openContractForm()" v-model="inputForm.purchaseNo" placeholder="请选择采购编号">
+              <el-button slot="append" icon="el-icon-search" @click="openContractForm()"></el-button>
+            </el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="24">
+          <el-form-item label="备注" prop="remarks">
+            <el-input v-model="inputForm.remarks"
+                      type="textarea"
+                      :rows="5"
+                      maxlength="500"
+                      placeholder="请输入简介"
+                      show-word-limit>
+            </el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
+
+      <el-divider content-position="left"><i class="el-icon-document"></i>
+        <el-link v-if="this.commonJS.isNotEmpty(this.inputForm.purchaseNo)" :underline="false" @click="viewContract(inputForm.purchaseNo)">采购详情</el-link>
+        <span v-else>采购详情</span>
+      </el-divider>
+      <el-row  :gutter="15" >
+        <vxe-table
+          border
+          show-footer
+          show-overflow
+          :footer-method="footerMethod"
+          ref="detailTable"
+          class="vxe-table-element"
+          :data="inputForm.detailInfos"
+          style="margin-left: 5em"
+          @cell-click=""
+          @edit-closed=""
+          highlight-current-row
+          :edit-config="{trigger: 'click', mode: 'row', showStatus: false, autoClear: true, icon: '-'}"
+        >
+          <vxe-table-column field="purchaserAgent" title="采购人" :edit-render="{}" :rules="[{required: true, message:'请选择采购人', trigger:'blur'}]">
+            <template v-slot:edit="scope">
+              <el-input :disabled='true' v-model="scope.row.purchaserAgent"></el-input>
+              <!--                <el-input v-model="scope.row.purchaser" @focus="userPullListForm(scope.$rowIndex)"></el-input>-->
+            </template>
+          </vxe-table-column>
+          <vxe-table-column field="procurementOffice" title="采购部门" :edit-render="{}">
+            <template v-slot:edit="scope">
+              <el-input :disabled='true' v-model="scope.row.procurementOffice" ></el-input>
+            </template>
+          </vxe-table-column>
+          <vxe-table-column field="procurementType" title="采购类型" :edit-render="{}" :rules="[{required: true, message:'请选择采购类型', trigger:'blur'}]">
+            <template v-slot:edit="scope">
+              <el-input :disabled='true' v-model="scope.row.procurementType"></el-input>
+              <!--                <el-input v-model="scope.row.procurementType" @focus="typePullForm(scope.$rowIndex)"></el-input>-->
+            </template>
+          </vxe-table-column>
+          <vxe-table-column field="tradeName" width="250" title="商品名称" :edit-render="{}" :rules="[{required: true, message:'请填写商品名称', trigger:'blur'}]">
+            <template v-slot:edit="scope">
+              <el-input :disabled='true' v-model="scope.row.tradeName"></el-input>
+            </template>
+          </vxe-table-column>
+          <vxe-table-column field="tradePrice" title="商品单价(元)" :edit-render="{}" :rules="[{required: true, message:'请输入商品单价', trigger:'blur'}]">
+            <template v-slot:edit="scope">
+              <!--              <el-input @change="changeValue" maxlength="15" v-model="scope.row.tradePrice" @keyup.native="scope.row.tradePrice = twoDecimalPlaces(scope.row.tradePrice)"></el-input>-->
+              <el-input :disabled='true' @change="changeValue" maxlength="15" v-model="scope.row.tradePrice"></el-input>
+              <!--                <el-input @change="changeValue" maxlength="15" v-model="scope.row.tradePrice" @blur="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 @change="changeValue" v-model="scope.row.tradeNumber" oninput ="value=value.replace(/\D|^0/g,'')" maxlength="10"></el-input>-->
+              <el-input :disabled='true' @change="changeValue" v-model="scope.row.tradeNumber" maxlength="10"></el-input>
+              <!--                <el-input @change="changeValue" v-model="scope.row.tradeNumber" @blur="scope.row.tradeNumber = twoDecimalPlaces2(scope.row.tradeNumber)" maxlength="10"></el-input>-->
+            </template>
+          </vxe-table-column>
+          <vxe-table-column field="priceSum" title="商品总价" :edit-render="{}">
+            <template v-slot:edit="scope">
+              <el-input :disabled='true' v-model="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'}]">
+            <template v-slot:edit="scope">
+              <el-input :disabled='true' v-model="scope.row.company"></el-input>
+            </template>
+          </vxe-table-column>
+          <vxe-table-column field="remarks" title="备注" :edit-render="{}">
+            <template v-slot:edit="scope">
+              <el-input :disabled='true' v-model="scope.row.remarks" ></el-input>
+            </template>
+          </vxe-table-column>
+          <vxe-table-column title="操作" width="180">
+            <template v-slot="scope">
+              <el-button size="mini" type="primary" :disabled="false" @click="seeFileInfo(scope.$rowIndex)">查看文件详情</el-button>
+            </template>
+          </vxe-table-column>
+        </vxe-table>
+      </el-row>
+      <el-divider content-position="left"><i class="el-icon-document"></i>
+        入库详情
+        <el-button style="margin-left: 20px" type="primary" @click="insertEvent('detail')" plain>
+          新增
+        </el-button>
+      </el-divider>
+      <el-row  :gutter="15" >
+        <vxe-table
+          border
+          show-footer
+          show-overflow
+          :footer-method="footerMethod2"
+          ref="detailTable"
+          class="vxe-table-element"
+          :data="inputForm.wareHouse"
+          style="margin-left: 5em"
+          @cell-click=""
+          @edit-closed=""
+          highlight-current-row
+          :edit-config="{trigger: 'click', mode: 'row', showStatus: false, autoClear: true, icon: '-'}"
+          :edit-rules="validRules"
+        >
+          <vxe-table-column field="wareHouseMan" title="入库人" :edit-render="{}" :rules="[{required: true, message:'请选择入库人', trigger:'blur'}]">
+            <template v-slot:edit="scope">
+              <el-input v-model="scope.row.wareHouseMan" @focus="userPullListForm(scope.$rowIndex)"></el-input>
+            </template>
+          </vxe-table-column>
+          <vxe-table-column field="wareHouseManOffice" title="入库部门" :edit-render="{}">
+            <template v-slot:edit="scope">
+              <el-input :disabled='true' v-model="scope.row.wareHouseManOffice" ></el-input>
+            </template>
+          </vxe-table-column>
+          <vxe-table-column field="wareHouseType" title="入库类型" :edit-render="{}" :rules="[{required: true, message:'请选择采购类型', trigger:'blur'}]">
+            <template v-slot:edit="scope">
+              <el-input v-model="scope.row.wareHouseType" @focus="typePullForm(scope.$rowIndex)"></el-input>
+            </template>
+          </vxe-table-column>
+          <vxe-table-column field="tradeName" width="250" title="商品名称" :edit-render="{}" :rules="[{required: true, message:'请填写商品名称', trigger:'blur'}]">
+            <template v-slot:edit="scope">
+              <el-input maxlength="64" v-model="scope.row.tradeName"></el-input>
+            </template>
+          </vxe-table-column>
+
+          <vxe-table-column field="tradeNumber" title="商品数量" :edit-render="{}">
+            <template v-slot:edit="scope">
+              <el-input @change="changeValue2" v-model="scope.row.tradeNumber" @blur="scope.row.tradeNumber = twoDecimalPlaces2(scope.row.tradeNumber)" maxlength="10"></el-input>
+            </template>
+          </vxe-table-column>
+          <vxe-table-column field="company" title="单位" :edit-render="{}" :rules="[{required: true, message:'请填写单位', trigger:'blur'}]">
+            <template v-slot:edit="scope">
+              <el-input maxlength="64" v-model="scope.row.company"></el-input>
+            </template>
+          </vxe-table-column>
+          <vxe-table-column field="tradePrice" title="商品单价(元)" :edit-render="{}" :rules="[{required: true, message:'请输入商品单价', trigger:'blur'}]">
+            <template v-slot:edit="scope">
+              <el-input @change="changeValue2" maxlength="15" v-model="scope.row.tradePrice" @blur="scope.row.tradePrice = twoDecimalPlaces2(scope.row.tradePrice)"></el-input>
+            </template>
+          </vxe-table-column>
+          <vxe-table-column field="priceSum" title="商品总价" :edit-render="{}">
+            <template v-slot:edit="scope">
+              <el-input :disabled='true' v-model="scope.row.priceSum" @blur="scope.row.priceSum = twoDecimalPlaces(scope.row.priceSum)" maxlength="15"></el-input>
+            </template>
+          </vxe-table-column>
+          <vxe-table-column field="actualPrice" title="实际价格" :edit-render="{}">
+            <template v-slot:edit="scope">
+              <el-input v-model="scope.row.actualPrice" @blur="scope.row.actualPrice = twoDecimalPlaces(scope.row.actualPrice)" maxlength="15"></el-input>
+            </template>
+          </vxe-table-column>
+
+          <vxe-table-column field="remarks" title="备注" :edit-render="{}">
+            <template v-slot:edit="scope">
+              <el-input maxlength="255" v-model="scope.row.remarks" ></el-input>
+            </template>
+          </vxe-table-column>
+          <vxe-table-column title="操作" width="180">
+            <template v-slot="scope">
+              <el-button size="mini" type="danger" v-if="!formReadOnly" @click="removeEvent(scope.row,scope.$rowIndex,'detail')">删除</el-button>
+              <el-button size="mini" type="primary" v-if="!formReadOnly" @click="sss2(scope.$rowIndex)">上传附件</el-button>
+              <el-button size="mini" type="primary" v-if="formReadOnly" :disabled="false" @click="seeFileInfo2(scope.$rowIndex)">查看文件详情</el-button>
+            </template>
+          </vxe-table-column>
+        </vxe-table>
+      </el-row>
+    </el-form>
+    <!-- 附件 -->
+    <MaterialManagementDialog ref="materialManagementDialog" @getUpload="getUpload"></MaterialManagementDialog>
+    <UpdateInfoForm ref="updateInfoForm"></UpdateInfoForm>
+    <PurchaseChooseForm  ref="purchaseChooseForm" @getProject="getContract"></PurchaseChooseForm>
+    <UpLoadComponent ref="uploadComponent"></UpLoadComponent>
+    <CwProgramPageForm ref="cwProgramPageForm" @getProgram="getProgram"></CwProgramPageForm>
+    <MaterialTypePullForm ref="materialTypePullForm" @getProgramForType="getProgramForType"></MaterialTypePullForm>
+    <UserPullForm ref="userPullForm" @getProgramForUser="getProgramForUser"></UserPullForm>
+  </div>
+</template>
+
+<script>
+  import MaterialManagementDialog from '../file/MaterialManagementDialog'
+  import WareHouseService from '@/api/materialManagement/WareHouseService'
+  import UpdateInfoForm from '../info/UpdateInfoForm'
+  import PurchaseChooseForm from './PurchaseChooseForm'
+
+  import UserSelect from '@/components/userSelect'
+  import CommonApi from '@/api/cw/common/CommonApi'
+  import MaterialManagementService from '@/api/materialManagement/MaterialManagementService'
+  import UpLoadComponent from '@/views/common/UpLoadComponent'
+  import SelectUserTree from '@/views/modules/utils/treeUserSelect'
+  import SelectTree from '@/components/treeSelect/treeSelect.vue'
+  import XEUtils from 'xe-utils'
+  import UserService from '@/api/sys/UserService'
+  import CwProgramPageForm from '@/views/modules/cw/reimbursementApproval/info/CwProgramPageForm'
+  import MaterialTypePullForm from '../info/MaterialTypePullForm'
+  import UserPullForm from '@/views/modules/finance/invoice/UserPullForm'
+  export default {
+    data () {
+      return {
+        validRules: {
+          wareHouseMan: [
+            {required: true, message: '采购人不能为空'}
+          ],
+          wareHouseManOffice: [
+            {required: true, message: '入库部门不能为空'}
+          ],
+          wareHouseType: [
+            {required: true, message: '入库类型不能为空'}
+          ],
+          tradeName: [
+            {required: true, message: '商品名称不能为空'}
+          ],
+          tradeNumber: [
+            {required: true, message: '商品数量不能为空'}
+          ]
+        },
+        title: '',
+        method: '',
+        visible: false,
+        loading: false,
+        indexRow: '',
+        inputForm: {
+          procInsId: '',
+          wareHouseTotalPrice: '', // 入库商品总价
+          wareHouseActualPrice: '', // 入库商品实际价格
+          tradeTotalPrice: '',  // 商品总价
+          fileInfoLost: [],
+          purchaseNo: '',
+          handledBy: '',
+          handledById: '',
+          handledByOffice: '',
+          wareHouseName: '',
+          wareHouseNumber: '', // 入库编号
+          userId: '',
+          wareHouseDate: '',
+          remarks: '',
+          detailInfos: [],
+          wareHouse: [],
+          // amountInfos: [],
+          files: [] // 附件信息
+        },
+        keyWatch: ''
+      }
+    },
+    WareHouseService: null,
+    MaterialManagementService: null,
+    userService: null,
+    commonApi: null,
+    created () {
+      this.materialManagementService = new MaterialManagementService()
+      this.userService = new UserService()
+      this.commonApi = new CommonApi()
+      this.wareHouseService = new WareHouseService()
+    },
+    props: {
+      businessId: {
+        type: String,
+        default: ''
+      },
+      formReadOnly: {
+        type: Boolean,
+        default: false
+      },
+      status: {
+        type: String,
+        default: ''
+      }
+    },
+    components: {
+      MaterialManagementDialog,
+      PurchaseChooseForm,
+      UserSelect,
+      UpLoadComponent,
+      SelectUserTree,
+      SelectTree,
+      CwProgramPageForm,
+      MaterialTypePullForm,
+      UserPullForm,
+      UpdateInfoForm
+    },
+    computed: {
+      bus: {
+        get () {
+          return this.businessId
+        },
+        set (val) {
+          this.businessId = val
+        }
+      },
+      name () {
+        return JSON.parse(localStorage.getItem('user')).name
+      },
+      officeName () {
+        return JSON.parse(localStorage.getItem('user')).officeDTO.name
+      },
+      purchaserAgentId () {
+        return JSON.parse(localStorage.getItem('user')).id
+      },
+      procurementTypeId () {
+        return ''
+      }
+    },
+    watch: {
+      'keyWatch': {
+        handler (newVal) {
+          if (this.commonJS.isNotEmpty(this.bus)) {
+            this.init('', this.bus)
+          } else {
+            this.$nextTick(() => {
+              this.$refs.inputForm.resetFields()
+            })
+          }
+        }
+      }
+    },
+    methods: {
+      getKeyWatch (keyWatch) {
+        this.keyWatch = keyWatch
+      },
+      init (method, id) {
+        this.method = method
+        this.inputForm = {
+          procInsId: '',
+          wareHouseTotalPrice: '', // 入库商品总价
+          wareHouseActualPrice: '', // 入库商品实际价格
+          tradeTotalPrice: '',  // 商品总价
+          fileInfoLost: [],
+          purchaseNo: '',
+          handledBy: JSON.parse(localStorage.getItem('user')).name,
+          handledById: JSON.parse(localStorage.getItem('user')).id,
+          handledByOffice: JSON.parse(localStorage.getItem('user')).officeDTO.id,
+          wareHouseName: '',
+          wareHouseNumber: '', // 入库编号
+          userId: JSON.parse(localStorage.getItem('user')).id,
+          wareHouseDate: new Date(),
+          remarks: '',
+          detailInfos: [],
+          wareHouse: [],
+          // amountInfos: [],
+          files: [] // 附件信息
+        }
+        if (method === 'add') {
+          this.title = `新建采购类型`
+        } else if (method === 'edit') {
+          this.title = '修改采购类型'
+        }
+        this.inputForm.id = id
+        this.visible = true
+        this.loading = false
+        this.$nextTick(() => {
+          if (this.formReadOnly === true && this.businessId !== 'false') {
+            method = 'view'
+          }
+          if (this.commonJS.isEmpty(this.inputForm.handledByOffice)) {
+            this.inputForm.handledByOffice = JSON.parse(localStorage.getItem('user')).officeDTO.id
+          }
+          if (this.status === 'audit' || this.status === 'taskFormDetail') {
+            method = 'view'
+          }
+          this.loading = true
+          this.$refs.inputForm.resetFields()
+          this.wareHouseService.findById(this.inputForm.id).then(({data}) => {
+            if (this.commonJS.isNotEmpty(data.wareHouseManId)) {
+              this.wareHouseManId = data.wareHouseManId
+            }
+            if (this.commonJS.isNotEmpty(data.wareHouseTypeId)) {
+              this.wareHouseTypeId = data.wareHouseTypeId
+            }
+            this.inputForm = this.recover(this.inputForm, data)
+            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
+                }
+              }
+            }
+            let k = this.inputForm.wareHouse.length
+            for (let j = 0; j < k; j++) {
+              if (this.commonJS.isNotEmpty(this.inputForm.wareHouse[j].tradePrice)) {
+                if (this.commonJS.isNotEmpty(this.inputForm.wareHouse[j].tradeNumber)) {
+                  this.inputForm.wareHouse[j].priceSum = this.inputForm.wareHouse[j].tradePrice * this.inputForm.wareHouse[j].tradeNumber
+                }
+              }
+            }
+            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')
+          }
+        })
+      },
+      getUpload (p, index) {
+        p.then((list) => {
+          // list为返回数据
+          this.inputForm.wareHouse[index].fileInfoLost = list
+          this.inputForm.wareHouse[index].fileNumber = list.length
+          this.tableKeyClient = Math.random()
+        })
+      },
+      close () {
+        this.method = ''
+        this.inputForm.detailInfos = []
+        this.inputForm.wareHouse = []
+        this.inputForm.amountInfos = []
+        this.$refs.uploadComponent.clearUpload()
+        this.$refs.inputForm.resetFields()
+        this.visible = false
+      },
+      // 新增
+      async insertEvent (type) {
+        if (type === 'detail') {
+          await this.$refs.detailTable.insert().then((data) => {
+            data.wareHouseManId = this.wareHouseManId
+            data.wareHouseMan = this.name
+            data.wareHouseManOffice = this.officeName
+            // this.inputForm.detailInfos.push(data)
+            this.inputForm.wareHouse.push(data)
+          })
+        }
+        if (type === 'amount') {
+          await this.$refs.amountTable.insert().then((data) => {
+            this.inputForm.amountInfos.push(data)
+          })
+        }
+      },
+      reapplyForm (callback) {
+        this.wareHouseService.findById(this.inputForm.id).then(({data}) => {
+          if (data.status !== '4') { // 审核状态不是“驳回”，就弹出提示
+            this.$message.error('任务数据已发生改变或不存在，请在待办任务中确认此任务是否存在')
+            throw new Error('任务数据已发生改变或不存在，请在待办任务中确认此任务是否存在')
+          } else {
+            this.startForm(callback)
+          }
+        })
+      },
+      // 暂存
+      async saveForm (callback) {
+        this.loading = true
+        if (this.$refs.uploadComponent.checkProgress()) {
+          this.loading = false
+          return
+        }
+        if (this.commonJS.isEmpty(this.inputForm.files)) {
+          this.inputForm.files = []
+        }
+        this.inputForm.files = this.$refs.uploadComponent.getDataList()
+        this.inputForm.status = '1'
+        this.wareHouseService.save(this.inputForm).then(({data}) => {
+          callback()
+          this.$refs.inputForm.resetFields()
+          this.loading = false
+        }).catch(() => {
+          this.$refs.inputForm.resetFields()
+          this.loading = false
+        })
+      },
+      // 送审
+      async startForm (callback) {
+        this.$refs['inputForm'].validate(async (valid) => {
+          if (valid) {
+            this.loading = true
+            if (this.$refs.uploadComponent.checkProgress()) {
+              this.loading = false
+              return
+            }
+            if (this.commonJS.isEmpty(this.inputForm.files)) {
+              this.inputForm.files = []
+            }
+            if (this.commonJS.isEmpty(this.inputForm.wareHouse)) {
+              this.$message.error('至少填写一条入库详情信息')
+              this.loading = false
+              return
+            } else {
+              let i = this.inputForm.wareHouse.length
+              for (let j = 0; j < i; j++) {
+                let k = j + 1
+                if (this.commonJS.isEmpty(this.inputForm.wareHouse[j].wareHouseMan)) {
+                  this.$message.error('入库详情第' + k + '行请选择入库人')
+                  this.loading = false
+                  return
+                }
+                if (this.commonJS.isEmpty(this.inputForm.wareHouse[j].wareHouseType)) {
+                  this.$message.error('入库详情第' + k + '行请选择入库类型')
+                  this.loading = false
+                  return
+                }
+              }
+            }
+            this.inputForm.files = this.$refs.uploadComponent.getDataList()
+            this.inputForm.status = '2'
+            this.wareHouseService.save(this.inputForm).then(({data}) => {
+              callback(data.businessTable, data.businessId, this.inputForm)
+              this.$refs.inputForm.resetFields()
+              this.loading = false
+            }).catch(() => {
+              this.$refs.inputForm.resetFields()
+              this.loading = false
+            })
+          }
+        })
+      },
+      // 通过
+      async agreeForm (callback) {
+        this.$refs['inputForm'].validate(async (valid) => {
+          if (valid) {
+            this.loading = true
+            if (this.$refs.uploadComponent.checkProgress()) {
+              this.loading = false
+              return
+            }
+            if (this.commonJS.isEmpty(this.inputForm.files)) {
+              this.inputForm.files = []
+            }
+            this.inputForm.files = this.$refs.uploadComponent.getDataList()
+            console.log('this.inputForm.procInsId', this.inputForm.procInsId)
+            this.commonApi.getTaskNameByProcInsId(this.inputForm.procInsId).then(({data}) => {
+              if (this.commonJS.isNotEmpty(data)) {
+                console.log('进来了', data)
+                if (data === '公司领导审批') {
+                  this.inputForm.status = '5'
+                }
+              }
+              this.wareHouseService.save(this.inputForm).then(({data}) => {
+                callback(data.businessTable, data.businessId, this.inputForm)
+                this.loading = false
+              }).catch(() => {
+                this.loading = false
+              })
+            })
+          }
+        })
+      },
+      async updateStatusById (type, callback) {
+        if (await this.$refs.uploadComponent.checkProgress()) {
+          this.loading = false
+          throw new Error()
+        } else {
+          if (type === 'reject' || type === 'reback') {
+            this.wareHouseService.findById(this.inputForm.id).then(({data}) => {
+              if (data.status !== '2') { // status的值不等于“审核中”，就弹出提示
+                this.$message.error('任务数据已发生改变或不存在，请在待办任务中确认此任务是否存在')
+                throw new Error()
+              } else {
+                if (type === 'reject') {
+                  // 驳回
+                  this.inputForm.status = '4'
+                }
+                if (type === 'reback') {
+                  // 撤回
+                  this.inputForm.status = '3'
+                }
+                if (type === 'reject' || type === 'reback') {
+                  let param = {status: this.inputForm.status, id: this.inputForm.id}
+                  this.wareHouseService.updateStatusById(param).then(() => {
+                    callback()
+                  })
+                }
+              }
+            })
+          } else if (type === 'hold') {
+            this.wareHouseService.findById(this.inputForm.id).then(({data}) => {
+              if (data.status !== '4') { // status的值不等于“驳回”就弹出提示
+                this.$message.error('任务数据已发生改变或不存在，请在待办任务中确认此任务是否存在')
+                throw new Error()
+              } else {
+                // 终止
+                let param = {status: '1', id: this.inputForm.id}
+                this.wareHouseService.updateStatusById(param).then(() => {
+                  callback()
+                })
+              }
+            })
+          }
+        }
+      },
+      twoDecimalPlaces (num, index) {
+        let str = num.toString()
+        var len1 = str.substr(0, 1)
+        var len2 = str.substr(1, 1)
+        // eslint-disable-next-line eqeqeq
+        if (str.length > 1 && len1 == 0 && len2 != '.') {
+          str = str.substr(1, 1)
+        }
+        // eslint-disable-next-line eqeqeq
+        if (len1 == '.') {
+          str = ''
+        }
+        // eslint-disable-next-line eqeqeq
+        if (str.indexOf('.') != -1) {
+          var str_ = str.substr(str.indexOf('.') + 1)
+          // eslint-disable-next-line eqeqeq
+          if (str_.indexOf('.') != -1) {
+            str = str.substr(0, str.indexOf('.') + str_.indexOf('.') + 1)
+          }
+          if (str_.length > 2) {
+            this.$message.warning(`金额小数点后只能输入两位，请正确输入！`)
+            return (str = '')
+          }
+        }
+        // eslint-disable-next-line no-useless-escape
+        this.inputForm.detailInfos[index].priceSum = str.replace(/[^\d^\.]+/g, '') // 保留数字和小数点
+      },
+      countAmount (row) {
+        let amount
+        let taxAmount
+        let count = 0
+        if (!this.commonJS.isEmpty(row.amount)) {
+          amount = parseFloat(row.amount)
+          count = count + amount
+        }
+        if (!this.commonJS.isEmpty(row.taxAmount)) {
+          taxAmount = parseFloat(row.taxAmount)
+          count = count + taxAmount
+        }
+        row.count = parseFloat(count).toFixed(2)
+      },
+      getProgram (rows) {
+        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()
+      },
+      getProgramForType (rows) {
+        this.inputForm.wareHouse[this.indexRow].wareHouseTypeId = rows.id
+        this.inputForm.wareHouse[this.indexRow].wareHouseType = rows.name
+        // this.inputForm.detailInfos[this.indexRow].procurementType = rows.name
+        this.indexRow = ''
+        this.$forceUpdate()
+      },
+      getProgramForUser (rows) {
+        this.inputForm.wareHouse[this.indexRow].wareHouseManId = rows[0].id
+        this.inputForm.wareHouse[this.indexRow].wareHouseMan = rows[0].name
+        this.inputForm.wareHouse[this.indexRow].deptId = rows[0].parentId
+        this.inputForm.wareHouse[this.indexRow].wareHouseManOffice = rows[0].officeName
+        this.indexRow = ''
+        this.$forceUpdate()
+      },
+      getUserInfo (rows) {
+        console.log('rows', rows)
+      },
+      openContractForm () {
+        this.$refs.purchaseChooseForm.init()
+      },
+      getContract (row) {
+        this.materialManagementService.findById(row.id).then(({data}) => {
+          this.inputForm.detailInfos = data.detailInfos
+          this.inputForm.purchaseNo = data.purchaseNo
+          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.$forceUpdate()
+      },
+      // 查看采购详情
+      async viewContract (purchaseNo) {
+        this.wareHouseService.findRequestId(purchaseNo).then(({data}) => {
+          this.$refs.updateInfoForm.init('view', data)
+        }).catch(() => {
+        })
+      },
+      footerMethod ({ columns, data }) {
+        const footerData = [
+          columns.map((column, columnIndex) => {
+            if (columnIndex === 0) {
+              return '商品总价'
+            }
+            if (['priceSum'].includes(column.property)) {
+              // eslint-disable-next-line no-undef
+              this.inputForm.tradeTotalPrice = XEUtils.sum(data, column.property)
+              return XEUtils.sum(data, column.property)
+            }
+            return null
+          })
+        ]
+        return footerData
+      },
+      footerMethod2 ({ columns, data }) {
+        const footerData = [
+          columns.map((column, columnIndex) => {
+            if (columnIndex === 0) {
+              return '商品总价'
+            }
+            if (['priceSum'].includes(column.property)) {
+              // eslint-disable-next-line no-undef
+              this.inputForm.wareHouseTotalPrice = XEUtils.sum(data, column.property)
+              return XEUtils.sum(data, column.property)
+            }
+            if (['actualPrice'].includes(column.property)) {
+              // eslint-disable-next-line no-undef
+              this.inputForm.wareHouseActualPrice = XEUtils.sum(data, column.property)
+              return XEUtils.sum(data, column.property)
+            }
+            return null
+          })
+        ]
+        return footerData
+      },
+      // 值改变事件
+      changeValue () {
+        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)) {
+              // parseFloat(item.account).toFixed(2)
+              this.inputForm.detailInfos[j].priceSum = parseFloat(parseFloat(this.inputForm.detailInfos[j].tradePrice) * parseFloat(this.inputForm.detailInfos[j].tradeNumber)).toFixed(2)
+            }
+          }
+        }
+      },
+      // 值改变事件
+      changeValue2 () {
+        let i = this.inputForm.wareHouse.length
+        for (let j = 0; j < i; j++) {
+          if (this.commonJS.isNotEmpty(this.inputForm.wareHouse[j].tradePrice)) {
+            if (this.commonJS.isNotEmpty(this.inputForm.wareHouse[j].tradeNumber)) {
+              // parseFloat(item.account).toFixed(2)
+              this.inputForm.wareHouse[j].priceSum = parseFloat(parseFloat(this.inputForm.wareHouse[j].tradePrice) * parseFloat(this.inputForm.wareHouse[j].tradeNumber)).toFixed(2)
+            }
+          }
+        }
+      },
+      seeFileInfo (index) {
+        if (this.commonJS.isEmpty(this.inputForm.detailInfos[index].fileInfoLost)) {
+          this.inputForm.detailInfos[index].fileInfoLost = []
+        }
+        this.$refs.materialManagementDialog.newUpload('view', this.inputForm.detailInfos[index].fileInfoLost, null, null, null, null, null, false, index)
+      },
+      seeFileInfo2 (index) {
+        if (this.commonJS.isEmpty(this.inputForm.wareHouse[index].fileInfoLost)) {
+          this.inputForm.wareHouse[index].fileInfoLost = []
+        }
+        this.$refs.materialManagementDialog.newUpload('view', this.inputForm.wareHouse[index].fileInfoLost, null, null, null, null, null, false, index)
+      },
+      sss2 (index) {
+        if (this.commonJS.isEmpty(this.inputForm.wareHouse[index].fileInfoLost)) {
+          this.inputForm.wareHouse[index].fileInfoLost = []
+        }
+        this.$refs.materialManagementDialog.newUpload(null, this.inputForm.wareHouse[index].fileInfoLost, null, null, null, null, null, false, index)
+      },
+      // 采购人下拉弹窗
+      userPullListForm (rowIndex) {
+        this.indexRow = rowIndex
+        this.$refs.userPullForm.init()
+      },
+      // 采购类型下拉弹窗
+      typePullForm (rowIndex) {
+        this.indexRow = rowIndex
+        this.$refs.materialTypePullForm.init()
+      },
+      // 删除
+      removeEvent (row, rowIndex, type) {
+        if (type === 'detail') {
+          this.$refs.detailTable.remove(row)
+          // this.inputForm.detailInfos.splice(rowIndex, 1)
+          this.inputForm.wareHouse.splice(rowIndex, 1)
+        }
+        if (type === 'amount') {
+          this.$refs.amountTable.remove(row)
+          this.inputForm.amountInfos.splice(rowIndex, 1)
+        }
+      }
+    }
+  }
+</script>

src/views/modules/materialManagement/wareHouseSummary/WareHouseSummaryList.vue

@@ -2,52 +2,67 @@
   <div class="page">
     <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="wareHouseNumber">
-        <el-input size="small" v-model="searchForm.wareHouseNumber" placeholder="请输入入库编号" clearable></el-input>
-      </el-form-item>
+<!--      <el-form-item label="入库编号" prop="wareHouseNumber">-->
+<!--        <el-input size="small" v-model="searchForm.wareHouseNumber" placeholder="请输入入库编号" clearable></el-input>-->
+<!--      </el-form-item>-->
       <el-form-item label="商品名称" prop="tradeName">
         <el-input size="small" v-model="searchForm.tradeName" placeholder="请输入商品名称" clearable></el-input>
       </el-form-item>
-      <el-form-item label="入库人" prop="wareHouseMan">
-        <SelectUserTree
-          ref="companyTree"
+      <el-form-item label="入库类型" prop="wareHouseType">
+        <SelectTree
+          ref="areaTree"
           :props="{
                   value: 'id',             // ID字段名
                   label: 'name',         // 显示名称
                   children: 'children'    // 子级字段名
                 }"
-          :url="`/sys/user/treeUserDataAllOffice?type=2`"
-          :value="searchForm.wareHouseMan"
+          url="/reimbursementApproval/type/summaryTreeData?type=last"
+          :value="searchForm.wareHouseType"
           :clearable="true"
           :accordion="true"
-          @getValue="(value) => {searchForm.wareHouseMan=value}"/>
+          @getValue="(value, label) => {searchForm.wareHouseType=label}"/>
       </el-form-item>
-      <el-form-item  prop="wareHouseManOffice" label="入库人部门">
-        <SelectTree
-          ref="officeTree"
-          :props="{
-                  value: 'id',             // ID字段名
-                  label: 'name',         // 显示名称
-                  children: 'children'    // 子级字段名
-                }"
+<!--      <el-form-item label="入库人" prop="wareHouseMan">-->
+<!--        <UserSelect :limit='1' :userName="searchForm.wareHouseMan" @getValue='(value, label) => {searchForm.wareHouseMan = label}'></UserSelect>-->
+<!--&lt;!&ndash;        <SelectUserTree&ndash;&gt;-->
+<!--&lt;!&ndash;          ref="companyTree"&ndash;&gt;-->
+<!--&lt;!&ndash;          :props="{&ndash;&gt;-->
+<!--&lt;!&ndash;                  value: 'id',             // ID字段名&ndash;&gt;-->
+<!--&lt;!&ndash;                  label: 'name',         // 显示名称&ndash;&gt;-->
+<!--&lt;!&ndash;                  children: 'children'    // 子级字段名&ndash;&gt;-->
+<!--&lt;!&ndash;                }"&ndash;&gt;-->
+<!--&lt;!&ndash;          :url="`/sys/user/treeUserDataAllOffice?type=2`"&ndash;&gt;-->
+<!--&lt;!&ndash;          :value="searchForm.wareHouseMan"&ndash;&gt;-->
+<!--&lt;!&ndash;          :clearable="true"&ndash;&gt;-->
+<!--&lt;!&ndash;          :accordion="true"&ndash;&gt;-->
+<!--&lt;!&ndash;          @getValue="(value) => {searchForm.wareHouseMan=value}"/>&ndash;&gt;-->
+<!--      </el-form-item>-->
+<!--      <el-form-item  prop="wareHouseManOffice" label="入库人部门">-->
+<!--        <SelectTree-->
+<!--          ref="officeTree"-->
+<!--          :props="{-->
+<!--                  value: 'id',             // ID字段名-->
+<!--                  label: 'name',         // 显示名称-->
+<!--                  children: 'children'    // 子级字段名-->
+<!--                }"-->
 
-          :url="`/sys/office/treeData?type=1`"
-          :value="searchForm.wareHouseManOffice"
-          :accordion="true"
-          @getValue="(value) => {searchForm.wareHouseManOffice=value}"/>
-      </el-form-item>
-      <el-form-item label="入库时间" prop="wareHouseDates">
-        <el-date-picker
-          placement="bottom-start"
-          format="yyyy-MM-dd HH:mm:ss"
-          value-format="yyyy-MM-dd HH:mm:ss"
-          v-model="searchForm.wareHouseDates"
-          type="datetimerange"
-          range-separator="至"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期">
-        </el-date-picker>
-      </el-form-item>
+<!--          :url="`/sys/office/treeData?type=1`"-->
+<!--          :value="searchForm.wareHouseManOffice"-->
+<!--          :accordion="true"-->
+<!--          @getValue="(value) => {searchForm.wareHouseManOffice=value}"/>-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="入库时间" prop="wareHouseDates">-->
+<!--        <el-date-picker-->
+<!--          placement="bottom-start"-->
+<!--          format="yyyy-MM-dd HH:mm:ss"-->
+<!--          value-format="yyyy-MM-dd HH:mm:ss"-->
+<!--          v-model="searchForm.wareHouseDates"-->
+<!--          type="datetimerange"-->
+<!--          range-separator="至"-->
+<!--          start-placeholder="开始日期"-->
+<!--          end-placeholder="结束日期">-->
+<!--        </el-date-picker>-->
+<!--      </el-form-item>-->
 
       <el-form-item>
         <el-button type="primary" @click="refreshList()" size="small" icon="el-icon-search">查询</el-button>
@@ -74,14 +89,14 @@
           :data="dataList"
           :checkbox-config="{}">
           <vxe-column type="seq" width="60" title="序号"></vxe-column>
-          <vxe-column min-width="160" align="center" title="入库编号" field="wareHouseNumber"></vxe-column>
-          <vxe-column min-width="160" align="center" title="入库人" field="wareHouseManName"></vxe-column>
-          <vxe-column min-width="160" align="center" title="入库部门" field="wareHouseManOfficeName"></vxe-column>
+<!--          <vxe-column min-width="160" align="center" title="入库编号" field="wareHouseNumber"></vxe-column>-->
+<!--          <vxe-column min-width="160" align="center" title="入库人" field="wareHouseManName"></vxe-column>-->
+<!--          <vxe-column min-width="160" align="center" title="入库部门" field="wareHouseManOfficeName"></vxe-column>-->
           <vxe-column min-width="160" align="center" title="入库类型" field="wareHouseTypeName"></vxe-column>
           <vxe-column min-width="160" align="center" title="商品名称" field="tradeName"></vxe-column>
           <vxe-column min-width="160" align="center" title="商品数量" field="tradeNumber"></vxe-column>
           <vxe-column min-width="160" align="center" title="单位" field="company"></vxe-column>
-          <vxe-column min-width="160" align="center" title="入库时间" field="wareHouseDate"></vxe-column>
+<!--          <vxe-column min-width="160" align="center" title="入库时间" field="wareHouseDate"></vxe-column>-->
 
         </vxe-table>
         <vxe-pager
@@ -101,6 +116,7 @@
 </template>
 
 <script>
+  import UserSelect from '@/components/userSelect'
   import WareHouseAddForm from '../wareHouse/WareHouseAddForm'
   import InputNumber from '@/views/modules/cw/workContract/InputNumber.vue'
   import SelectTree from '@/components/treeSelect/treeSelect.vue'
@@ -116,6 +132,7 @@
       return {
         num: 0,
         searchForm: {
+          wareHouseType: '',
           tradeName: '',
           wareHouseNumber: '',
           wareHouseMan: '',
@@ -154,6 +171,7 @@
       this.userService = new UserService()
     },
     components: {
+      UserSelect,
       InputNumber,
       SelectUserTree,
       SelectTree,

src/views/modules/notify/NotifyList.vue

@@ -90,6 +90,7 @@
 
                   <el-button v-if="hasPermission('notify:edit')&&(scope.row.status === '1' || scope.row.status === '3')&&scope.row.createBy.id === $store.state.user.id" type="text" size="small" @click="push(scope.row)">修改</el-button>
                   <el-button v-else-if="(scope.row.status === '1' || scope.row.status === '3' || scope.row.status === '5')&&isAdmin" type="text" size="small" @click="edit(scope.row.id)">修改</el-button>
+                  <el-button v-if="scope.row.status === '5'" type="text" size="small" @click="close(scope.row.id)">关闭</el-button>
 
                   <el-button v-if="hasPermission('notify:edit')&&(scope.row.status === '2')&&scope.row.createBy.id === $store.state.user.id" type="text" size="small" @click="reback(scope.row)">撤回</el-button>
                   <el-button v-if="hasPermission('notify:del')&&(scope.row.status === '1' || scope.row.status === '3')&&(scope.row.createBy.id === $store.state.user.id || isAdmin)"  type="text" size="small" @click="del(scope.row.id)">删除</el-button>
@@ -206,6 +207,23 @@
         }
         this.refreshList()
       },
+      close (id) {
+        id = id || this.$refs.notifyTable.getCheckboxRecords().map(item => {
+          return item.id
+        })[0]
+        this.$confirm(`确定删除所选项吗?`, '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          this.loading = true
+          this.notifyService.close(id).then(({data}) => {
+            this.$message.success(data)
+            this.refreshList()
+            this.loading = false
+          })
+        })
+      },
       // 新增
       add () {
         this.$refs.notifyForm.init('add', '')

src/views/modules/notify/NotifyTaskForm.vue

@@ -3,39 +3,21 @@
       <el-form size="small" :model="inputForm" ref="inputForm" v-loading="loading" :class="method==='view' || method === 'read'?'readonly':''" :disabled="method==='view' || method === 'read' || status === 'audit' || status === 'taskFormDetail'"
                label-width="120px" @submit.native.prevent>
         <el-row  :gutter="15">
-          <el-col :span="12">
+          <el-col :span="24">
             <el-form-item label="通告状态" prop="notifyType"
                           :rules="[
                   {required: true, message:'通告状态不能为空', trigger:'blur'}
                  ]">
-              <el-select size="medium" @change="changeNotifyType" v-model="inputForm.notifyType" placeholder="请选择"  style="width: 100%;">
-                <el-option
-                  v-for="item in $dictUtils.getDictList('oa_notify_status')"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value">
-                </el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12" v-if="inputForm.notifyType === '0'">
-            <el-form-item label="通告时间" prop="dates"
-                          :rules="[
-                                {required: true, message:'通告时间不能为空', trigger:'blur'}
-                   ]">
-              <el-date-picker
-                size="medium"
-                style="width: 100%"
-                placement="bottom-start"
-                format="yyyy-MM-dd HH:mm:ss"
-                value-format="yyyy-MM-dd HH:mm:ss"
-                v-model="inputForm.dates"
-                type="datetimerange"
-                range-separator="至"
-                @input="daterangeChange"
-                start-placeholder="开始日期"
-                end-placeholder="结束日期">
-              </el-date-picker>
+              <el-radio v-model="inputForm.notifyType" v-for="item in $dictUtils.getDictList('oa_notify_status')" :label="item.value" size="small" style="margin-right: 20px">
+                {{item.label}}</el-radio>
+<!--              <el-select size="medium" @change="changeNotifyType" v-model="inputForm.notifyType" placeholder="请选择"  style="width: 100%;">-->
+<!--                <el-option-->
+<!--                  v-for="item in $dictUtils.getDictList('oa_notify_status')"-->
+<!--                  :key="item.value"-->
+<!--                  :label="item.label"-->
+<!--                  :value="item.value">-->
+<!--                </el-option>-->
+<!--              </el-select>-->
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -68,6 +50,26 @@
               <el-input size="medium" v-model="inputForm.no" placeholder="请填写文号"     ></el-input>
             </el-form-item>
           </el-col>
+          <el-col :span="12" v-if="inputForm.notifyType === '0'">
+            <el-form-item label="通告时间" prop="dates"
+                          :rules="[
+                                {required: true, message:'通告时间不能为空', trigger:'blur'}
+                   ]">
+              <el-date-picker
+                size="medium"
+                style="width: 100%"
+                placement="bottom-start"
+                format="yyyy-MM-dd HH:mm:ss"
+                value-format="yyyy-MM-dd HH:mm:ss"
+                v-model="inputForm.dates"
+                type="datetimerange"
+                range-separator="至"
+                @input="daterangeChange"
+                start-placeholder="开始日期"
+                end-placeholder="结束日期">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
           <el-col :span="12">
             <el-form-item label="创建人" prop="createBy.name"
                           :rules="[

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

@@ -143,7 +143,7 @@
             </el-col>
 
             <el-col :span="12">
-              <el-form-item label="废旧物资评估(万元)" prop="waystEvaluation"
+              <el-form-item label="废旧物资评估值(万元)" prop="waystEvaluation"
                             :rules="[
                  ]">
                 <el-input-number
@@ -161,7 +161,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="固定资产评估(万元)" prop="fixedAssetsEvaluation"
+              <el-form-item label="固定资产评估值(万元)" prop="fixedAssetsEvaluation"
                             :rules="[
                  ]">
                 <el-input-number
@@ -179,7 +179,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="净资产评估" prop="netAssetsEvaluation"
+              <el-form-item label="净资产评估值(万元)" prop="netAssetsEvaluation"
                             :rules="[
                  ]">
                 <el-input-number
@@ -266,7 +266,7 @@
               </el-form-item>
             </el-col>
 
-            <el-col :span="24">
+            <el-col :span="12">
               <el-form-item label="是否开票" prop="isInvoice"
                             :rules="[
                         {required: true, message:'是否开票不能为空', trigger:'blur'}
@@ -276,9 +276,6 @@
                 </el-radio-group>
               </el-form-item>
             </el-col>
-            <el-col :span="24" style="margin-bottom: 30px">
-              <UpLoadComponent ref="uploadComponentDetail"></UpLoadComponent>
-            </el-col>
 
             <el-col :span="12">
               <el-form-item label="开票日期" prop="invoiceDate"
@@ -470,6 +467,8 @@
               </el-form-item>
             </el-col>-->
           </el-row>
+          <!--附件信息 - 开票文件-->
+          <UpLoadComponent ref="uploadComponentDetail"></UpLoadComponent>
           <!--附件信息 - 评估报告-->
           <UpLoadComponent ref="uploadComponentReport"></UpLoadComponent>
           <!--附件信息 - 评估说明-->
@@ -570,7 +569,7 @@
         get () {
           this.$refs.uploadComponentReport.setDividerName('评估报告及评估明细表')
           this.$refs.uploadComponentExplain.setDividerName('评估说明')
-          this.$refs.uploadComponentDetail.setDividerName('图片上传')
+          this.$refs.uploadComponentDetail.setDividerName('开票文件')
           this.$refs.uploadComponentPapers.setDividerName('评估操作计算底稿')
           this.$refs.uploadComponentOther.setDividerName('其他')
           return this.businessId
@@ -742,7 +741,7 @@
             }
             this.$refs.uploadComponentReport.newUpload(method, this.inputForm.reportFileList, 'program', null, '评估报告及评估明细表')
             this.$refs.uploadComponentExplain.newUpload(method, this.inputForm.explainFileList, 'program', null, '评估说明')
-            this.$refs.uploadComponentDetail.newUpload(method, this.inputForm.detailFileList, 'program', null, '图片上传')
+            this.$refs.uploadComponentDetail.newUpload(method, this.inputForm.detailFileList, 'program', null, '开票文件')
             this.$refs.uploadComponentPapers.newUpload(method, this.inputForm.papersFileList, 'program', null, '评估操作计算底稿')
             this.$refs.uploadComponentOther.newUpload(method, this.inputForm.otherFileList, 'program', null, '其他')
             this.loading = false

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

@@ -4,7 +4,7 @@
       title="资产评估项目（校对）审核记录表"
       :close-on-click-modal="false"
       v-dialogDrag
-      width="1300px"
+      width="1500px"
       @close="close"
       @keyup.enter.native=""
       :visible.sync="visible">
@@ -86,9 +86,9 @@
                 </vxe-select>
               </template>
             </vxe-table-column>
-            <vxe-table-column width="150px" field="replyComments" title="回复意见（√/×）" :edit-render="{}">
+            <vxe-table-column width="150px" field="isApply" title="是否适用（√/×）" :edit-render="{}">
               <template v-slot:edit="scope">
-                <vxe-select v-model="scope.row.replyComments" transfer>
+                <vxe-select v-model="scope.row.isApply" transfer>
                   <vxe-option
                     v-for="item in $dictUtils.getDictList('yes_no_flag')"
                     :key="item.value"
@@ -98,6 +98,11 @@
                 </vxe-select>
               </template>
             </vxe-table-column>
+            <vxe-table-column width="350px" field="replyComments" title="回复意见" :edit-render="{}">
+              <template v-slot:edit="scope">
+                <el-input v-model="scope.row.replyComments" ></el-input>
+              </template>
+            </vxe-table-column>
           </vxe-table>
         </el-row>
 
@@ -144,9 +149,9 @@
                 </vxe-select>
               </template>
             </vxe-table-column>
-            <vxe-table-column width="150px" field="replyComments" title="回复意见（√/×）" :edit-render="{}">
+            <vxe-table-column width="150px" field="isApply" title="是否适用（√/×）" :edit-render="{}">
               <template v-slot:edit="scope">
-                <vxe-select v-model="scope.row.replyComments" transfer>
+                <vxe-select v-model="scope.row.isApply" transfer>
                   <vxe-option
                     v-for="item in $dictUtils.getDictList('yes_no_flag')"
                     :key="item.value"
@@ -156,6 +161,11 @@
                 </vxe-select>
               </template>
             </vxe-table-column>
+            <vxe-table-column width="350px" field="replyComments" title="回复意见" :edit-render="{}">
+              <template v-slot:edit="scope">
+                <el-input v-model="scope.row.replyComments" ></el-input>
+              </template>
+            </vxe-table-column>
           </vxe-table>
         </el-row>
 
@@ -200,9 +210,9 @@
                 </vxe-select>
               </template>
             </vxe-table-column>
-            <vxe-table-column width="150px" field="replyComments" title="回复意见（√/×）" :edit-render="{}">
+            <vxe-table-column width="150px" field="isApply" title="是否适用（√/×）" :edit-render="{}">
               <template v-slot:edit="scope">
-                <vxe-select v-model="scope.row.replyComments" transfer>
+                <vxe-select v-model="scope.row.isApply" transfer>
                   <vxe-option
                     v-for="item in $dictUtils.getDictList('yes_no_flag')"
                     :key="item.value"
@@ -212,6 +222,11 @@
                 </vxe-select>
               </template>
             </vxe-table-column>
+            <vxe-table-column width="350px" field="replyComments" title="回复意见" :edit-render="{}">
+              <template v-slot:edit="scope">
+                <el-input v-model="scope.row.replyComments" ></el-input>
+              </template>
+            </vxe-table-column>
           </vxe-table>
         </el-row>
 
@@ -256,9 +271,9 @@
                 </vxe-select>
               </template>
             </vxe-table-column>
-            <vxe-table-column width="150px" field="replyComments" title="回复意见（√/×）" :edit-render="{}">
+            <vxe-table-column width="150px" field="isApply" title="是否适用（√/×）" :edit-render="{}">
               <template v-slot:edit="scope">
-                <vxe-select v-model="scope.row.replyComments" transfer>
+                <vxe-select v-model="scope.row.isApply" transfer>
                   <vxe-option
                     v-for="item in $dictUtils.getDictList('yes_no_flag')"
                     :key="item.value"
@@ -268,6 +283,11 @@
                 </vxe-select>
               </template>
             </vxe-table-column>
+            <vxe-table-column width="350px" field="replyComments" title="回复意见" :edit-render="{}">
+              <template v-slot:edit="scope">
+                <el-input v-model="scope.row.replyComments" ></el-input>
+              </template>
+            </vxe-table-column>
           </vxe-table>
         </el-row>
 
@@ -312,9 +332,9 @@
                 </vxe-select>
               </template>
             </vxe-table-column>
-            <vxe-table-column width="150px" field="replyComments" title="回复意见（√/×）" :edit-render="{}">
+            <vxe-table-column width="150px" field="isApply" title="是否适用（√/×）" :edit-render="{}">
               <template v-slot:edit="scope">
-                <vxe-select v-model="scope.row.replyComments" transfer>
+                <vxe-select v-model="scope.row.isApply" transfer>
                   <vxe-option
                     v-for="item in $dictUtils.getDictList('yes_no_flag')"
                     :key="item.value"
@@ -324,6 +344,11 @@
                 </vxe-select>
               </template>
             </vxe-table-column>
+            <vxe-table-column width="350px" field="replyComments" title="回复意见" :edit-render="{}">
+              <template v-slot:edit="scope">
+                <el-input v-model="scope.row.replyComments" ></el-input>
+              </template>
+            </vxe-table-column>
           </vxe-table>
         </el-row>
 
@@ -368,9 +393,9 @@
                 </vxe-select>
               </template>
             </vxe-table-column>
-            <vxe-table-column width="150px" field="replyComments" title="回复意见（√/×）" :edit-render="{}">
+            <vxe-table-column width="150px" field="isApply" title="是否适用（√/×）" :edit-render="{}">
               <template v-slot:edit="scope">
-                <vxe-select v-model="scope.row.replyComments" transfer>
+                <vxe-select v-model="scope.row.isApply" transfer>
                   <vxe-option
                     v-for="item in $dictUtils.getDictList('yes_no_flag')"
                     :key="item.value"
@@ -380,6 +405,11 @@
                 </vxe-select>
               </template>
             </vxe-table-column>
+            <vxe-table-column width="350px" field="replyComments" title="回复意见" :edit-render="{}">
+              <template v-slot:edit="scope">
+                <el-input v-model="scope.row.replyComments" ></el-input>
+              </template>
+            </vxe-table-column>
           </vxe-table>
         </el-row>
 
@@ -424,9 +454,9 @@
                 </vxe-select>
               </template>
             </vxe-table-column>
-            <vxe-table-column width="150px" field="replyComments" title="回复意见（√/×）" :edit-render="{}">
+            <vxe-table-column width="150px" field="isApply" title="是否适用（√/×）" :edit-render="{}">
               <template v-slot:edit="scope">
-                <vxe-select v-model="scope.row.replyComments" transfer>
+                <vxe-select v-model="scope.row.isApply" transfer>
                   <vxe-option
                     v-for="item in $dictUtils.getDictList('yes_no_flag')"
                     :key="item.value"
@@ -436,6 +466,11 @@
                 </vxe-select>
               </template>
             </vxe-table-column>
+            <vxe-table-column width="350px" field="replyComments" title="回复意见" :edit-render="{}">
+              <template v-slot:edit="scope">
+                <el-input v-model="scope.row.replyComments" ></el-input>
+              </template>
+            </vxe-table-column>
           </vxe-table>
         </el-row>
 
@@ -480,9 +515,9 @@
                 </vxe-select>
               </template>
             </vxe-table-column>
-            <vxe-table-column width="150px" field="replyComments" title="回复意见（√/×）" :edit-render="{}">
+            <vxe-table-column width="150px" field="isApply" title="是否适用（√/×）" :edit-render="{}">
               <template v-slot:edit="scope">
-                <vxe-select v-model="scope.row.replyComments" transfer>
+                <vxe-select v-model="scope.row.isApply" transfer>
                   <vxe-option
                     v-for="item in $dictUtils.getDictList('yes_no_flag')"
                     :key="item.value"
@@ -492,6 +527,11 @@
                 </vxe-select>
               </template>
             </vxe-table-column>
+            <vxe-table-column width="350px" field="replyComments" title="回复意见" :edit-render="{}">
+              <template v-slot:edit="scope">
+                <el-input v-model="scope.row.replyComments" ></el-input>
+              </template>
+            </vxe-table-column>
           </vxe-table>
         </el-row>
 

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

@@ -84,18 +84,23 @@
                 </vxe-select>
               </template>
             </vxe-table-column>
-            <vxe-table-column width="150px" field="replyComments" title="回复意见（√/×）" :edit-render="{}">
+            <vxe-table-column width="150px" field="isApply" title="是否适用（√/×）" :edit-render="{}">
               <template v-slot:edit="scope">
-                <vxe-select v-model="scope.row.replyComments" transfer>
+                <vxe-select v-model="scope.row.isApply" transfer>
                   <vxe-option
-                          v-for="item in $dictUtils.getDictList('yes_no_flag')"
-                          :key="item.value"
-                          :value="item.label"
-                          :label="item.label">
+                    v-for="item in $dictUtils.getDictList('yes_no_flag')"
+                    :key="item.value"
+                    :value="item.label"
+                    :label="item.label">
                   </vxe-option>
                 </vxe-select>
               </template>
             </vxe-table-column>
+            <vxe-table-column width="350px" field="replyComments" title="回复意见" :edit-render="{}">
+              <template v-slot:edit="scope">
+                <el-input v-model="scope.row.replyComments" ></el-input>
+              </template>
+            </vxe-table-column>
           </vxe-table>
         </el-row>
 
@@ -142,18 +147,23 @@
                 </vxe-select>
               </template>
             </vxe-table-column>
-            <vxe-table-column width="150px" field="replyComments" title="回复意见（√/×）" :edit-render="{}">
+            <vxe-table-column width="150px" field="isApply" title="是否适用（√/×）" :edit-render="{}">
               <template v-slot:edit="scope">
-                <vxe-select v-model="scope.row.replyComments" transfer>
+                <vxe-select v-model="scope.row.isApply" transfer>
                   <vxe-option
-                          v-for="item in $dictUtils.getDictList('yes_no_flag')"
-                          :key="item.value"
-                          :value="item.label"
-                          :label="item.label">
+                    v-for="item in $dictUtils.getDictList('yes_no_flag')"
+                    :key="item.value"
+                    :value="item.label"
+                    :label="item.label">
                   </vxe-option>
                 </vxe-select>
               </template>
             </vxe-table-column>
+            <vxe-table-column width="350px" field="replyComments" title="回复意见" :edit-render="{}">
+              <template v-slot:edit="scope">
+                <el-input v-model="scope.row.replyComments" ></el-input>
+              </template>
+            </vxe-table-column>
           </vxe-table>
         </el-row>
 
@@ -198,18 +208,23 @@
                 </vxe-select>
               </template>
             </vxe-table-column>
-            <vxe-table-column width="150px" field="replyComments" title="回复意见（√/×）" :edit-render="{}">
+            <vxe-table-column width="150px" field="isApply" title="是否适用（√/×）" :edit-render="{}">
               <template v-slot:edit="scope">
-                <vxe-select v-model="scope.row.replyComments" transfer>
+                <vxe-select v-model="scope.row.isApply" transfer>
                   <vxe-option
-                          v-for="item in $dictUtils.getDictList('yes_no_flag')"
-                          :key="item.value"
-                          :value="item.label"
-                          :label="item.label">
+                    v-for="item in $dictUtils.getDictList('yes_no_flag')"
+                    :key="item.value"
+                    :value="item.label"
+                    :label="item.label">
                   </vxe-option>
                 </vxe-select>
               </template>
             </vxe-table-column>
+            <vxe-table-column width="350px" field="replyComments" title="回复意见" :edit-render="{}">
+              <template v-slot:edit="scope">
+                <el-input v-model="scope.row.replyComments" ></el-input>
+              </template>
+            </vxe-table-column>
           </vxe-table>
         </el-row>
 
@@ -254,18 +269,23 @@
                 </vxe-select>
               </template>
             </vxe-table-column>
-            <vxe-table-column width="150px" field="replyComments" title="回复意见（√/×）" :edit-render="{}">
+            <vxe-table-column width="150px" field="isApply" title="是否适用（√/×）" :edit-render="{}">
               <template v-slot:edit="scope">
-                <vxe-select v-model="scope.row.replyComments" transfer>
+                <vxe-select v-model="scope.row.isApply" transfer>
                   <vxe-option
-                          v-for="item in $dictUtils.getDictList('yes_no_flag')"
-                          :key="item.value"
-                          :value="item.label"
-                          :label="item.label">
+                    v-for="item in $dictUtils.getDictList('yes_no_flag')"
+                    :key="item.value"
+                    :value="item.label"
+                    :label="item.label">
                   </vxe-option>
                 </vxe-select>
               </template>
             </vxe-table-column>
+            <vxe-table-column width="350px" field="replyComments" title="回复意见" :edit-render="{}">
+              <template v-slot:edit="scope">
+                <el-input v-model="scope.row.replyComments" ></el-input>
+              </template>
+            </vxe-table-column>
           </vxe-table>
         </el-row>
 
@@ -310,18 +330,23 @@
                 </vxe-select>
               </template>
             </vxe-table-column>
-            <vxe-table-column width="150px" field="replyComments" title="回复意见（√/×）" :edit-render="{}">
+            <vxe-table-column width="150px" field="isApply" title="是否适用（√/×）" :edit-render="{}">
               <template v-slot:edit="scope">
-                <vxe-select v-model="scope.row.replyComments" transfer>
+                <vxe-select v-model="scope.row.isApply" transfer>
                   <vxe-option
-                          v-for="item in $dictUtils.getDictList('yes_no_flag')"
-                          :key="item.value"
-                          :value="item.label"
-                          :label="item.label">
+                    v-for="item in $dictUtils.getDictList('yes_no_flag')"
+                    :key="item.value"
+                    :value="item.label"
+                    :label="item.label">
                   </vxe-option>
                 </vxe-select>
               </template>
             </vxe-table-column>
+            <vxe-table-column width="350px" field="replyComments" title="回复意见" :edit-render="{}">
+              <template v-slot:edit="scope">
+                <el-input v-model="scope.row.replyComments" ></el-input>
+              </template>
+            </vxe-table-column>
           </vxe-table>
         </el-row>
 
@@ -366,18 +391,23 @@
                 </vxe-select>
               </template>
             </vxe-table-column>
-            <vxe-table-column width="150px" field="replyComments" title="回复意见（√/×）" :edit-render="{}">
+            <vxe-table-column width="150px" field="isApply" title="是否适用（√/×）" :edit-render="{}">
               <template v-slot:edit="scope">
-                <vxe-select v-model="scope.row.replyComments" transfer>
+                <vxe-select v-model="scope.row.isApply" transfer>
                   <vxe-option
-                          v-for="item in $dictUtils.getDictList('yes_no_flag')"
-                          :key="item.value"
-                          :value="item.label"
-                          :label="item.label">
+                    v-for="item in $dictUtils.getDictList('yes_no_flag')"
+                    :key="item.value"
+                    :value="item.label"
+                    :label="item.label">
                   </vxe-option>
                 </vxe-select>
               </template>
             </vxe-table-column>
+            <vxe-table-column width="350px" field="replyComments" title="回复意见" :edit-render="{}">
+              <template v-slot:edit="scope">
+                <el-input v-model="scope.row.replyComments" ></el-input>
+              </template>
+            </vxe-table-column>
           </vxe-table>
         </el-row>
 
@@ -422,18 +452,23 @@
                 </vxe-select>
               </template>
             </vxe-table-column>
-            <vxe-table-column width="150px" field="replyComments" title="回复意见（√/×）" :edit-render="{}">
+            <vxe-table-column width="150px" field="isApply" title="是否适用（√/×）" :edit-render="{}">
               <template v-slot:edit="scope">
-                <vxe-select v-model="scope.row.replyComments" transfer>
+                <vxe-select v-model="scope.row.isApply" transfer>
                   <vxe-option
-                          v-for="item in $dictUtils.getDictList('yes_no_flag')"
-                          :key="item.value"
-                          :value="item.label"
-                          :label="item.label">
+                    v-for="item in $dictUtils.getDictList('yes_no_flag')"
+                    :key="item.value"
+                    :value="item.label"
+                    :label="item.label">
                   </vxe-option>
                 </vxe-select>
               </template>
             </vxe-table-column>
+            <vxe-table-column width="350px" field="replyComments" title="回复意见" :edit-render="{}">
+              <template v-slot:edit="scope">
+                <el-input v-model="scope.row.replyComments" ></el-input>
+              </template>
+            </vxe-table-column>
           </vxe-table>
         </el-row>
 
@@ -478,18 +513,23 @@
                 </vxe-select>
               </template>
             </vxe-table-column>
-            <vxe-table-column width="150px" field="replyComments" title="回复意见（√/×）" :edit-render="{}">
+            <vxe-table-column width="150px" field="isApply" title="是否适用（√/×）" :edit-render="{}">
               <template v-slot:edit="scope">
-                <vxe-select v-model="scope.row.replyComments" transfer>
+                <vxe-select v-model="scope.row.isApply" transfer>
                   <vxe-option
-                          v-for="item in $dictUtils.getDictList('yes_no_flag')"
-                          :key="item.value"
-                          :value="item.label"
-                          :label="item.label">
+                    v-for="item in $dictUtils.getDictList('yes_no_flag')"
+                    :key="item.value"
+                    :value="item.label"
+                    :label="item.label">
                   </vxe-option>
                 </vxe-select>
               </template>
             </vxe-table-column>
+            <vxe-table-column width="350px" field="replyComments" title="回复意见" :edit-render="{}">
+              <template v-slot:edit="scope">
+                <el-input v-model="scope.row.replyComments" ></el-input>
+              </template>
+            </vxe-table-column>
           </vxe-table>
         </el-row>
 

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

@@ -473,6 +473,7 @@
                           :rules="[
                  ]">
               <el-switch
+                style="display: block;margin-top: 10px;margin-bottom: 10px;"
                 v-model="inputForm.generateReportNumber"
                 active-color="#13ce66"
                 active-text="是"
@@ -1481,51 +1482,6 @@
   .el-input-number .el-input__inner {
     text-align: left;
   }
-  /**
-  设置框
-   */
-  .el-switch__core{
-    width: 70px!important;
-    height: 30px;
-  }
-  /**
-  设置园
-   */
-  .el-switch__core::after{
-    width: 14px;
-    height: 14px;
-    margin-top: -1px;
-    margin-bottom: 2px;
-  }
-
-  .el-switch__label--left {
-    position: relative;
-    left: 45px;
-    color: #fff;
-    z-index: -1111;
-  }
-  .el-switch__core{
-    width: 50px !important;
-  }
-  .el-switch__label--right {
-    position: relative;
-    right: 46px;
-    color: #fff;
-    z-index: -1111;
-  }
-  .el-switch__label--right.is-active {
-    z-index: 1111;
-    color: #fff !important;
-  }
-  .el-switch__label--left.is-active {
-    z-index: 1111;
-    color: #9c9c9c !important;
-  }
-  .el-switch__label * {
-    line-height: 1;
-    font-size: 18px;
-    display: inline-block;
-  }
 
 
 </style>

src/views/modules/sys/login/login.vue

@@ -46,12 +46,15 @@
                   </el-col>
                 </el-row>
               </el-form-item>
-              <div style ="margin: 20px">
+              <div style ="margin-left: 20px;margin-bottom: 20px; float: left;height: 40px;line-height:40px;">
                 <!-- 记住我 -->
                 <el-checkbox v-model="checked" class="rememberMe">记住我</el-checkbox>
-                <!-- 找回密码 -->
-                <!--<el-button type="text" @click="open()" class="forgetPw">忘记密码？</el-button>-->
               </div>
+              <!--<div style ="margin-right: 20px;margin-bottom: 20px; float: right; position: relative; z-index:99">
+                &lt;!&ndash; 找回密码 &ndash;&gt;
+                <el-button type="text" @click="open()">忘记密码？</el-button>
+                &lt;!&ndash;<el-button type="text" @click="open()" class="forgetPw">忘记密码？</el-button>&ndash;&gt;
+              </div>-->
               <el-form-item>
                 <el-button type="primary" :loading="loading" class="login-submit" @click="login">登录</el-button>
               </el-form-item>
@@ -227,6 +230,9 @@
             }
           }
         }
+      },
+      open () {
+        console.log(321312)
       }
     }
   }

src/views/modules/sys/workContract/WorkContractFileForm.vue

@@ -121,7 +121,7 @@
         <el-col :span="24">
           <el-form-item label="收费标准" prop="contractFees">
             <el-checkbox-group v-model="inputForm.contractFees">
-              <el-checkbox @change="changeContractFee" v-for="item in $dictUtils.getDictList('contract_fee')" :label="item.value">
+              <el-checkbox @change="changeContractFee" v-for="item in $dictUtils.getDictList('contract_fee_pg')" :label="item.value">
                 {{item.label}}
               </el-checkbox>
             </el-checkbox-group>

src/views/modules/sys/workContract/WorkContractForm.vue

@@ -121,7 +121,7 @@
         <el-col :span="24">
           <el-form-item label="收费标准" prop="contractFees">
             <el-checkbox-group v-model="inputForm.contractFees">
-              <el-checkbox @change="changeContractFee" v-for="item in $dictUtils.getDictList('contract_fee')" :label="item.value">
+              <el-checkbox @change="changeContractFee" v-for="item in $dictUtils.getDictList('contract_fee_pg')" :label="item.value">
                 {{item.label}}
               </el-checkbox>
             </el-checkbox-group>

src/views/modules/sys/workContract/WorkContractForm2.vue

@@ -125,7 +125,7 @@
             <el-col :span="24">
               <el-form-item label="收费标准" prop="contractFees">
                 <el-checkbox-group v-model="inputForm.contractFees" @change="changeContractFee">
-                  <el-checkbox  v-for="item in $dictUtils.getDictList('contract_fee')" :label="item.value" >{{item.label}}</el-checkbox>
+                  <el-checkbox  v-for="item in $dictUtils.getDictList('contract_fee_pg')" :label="item.value" >{{item.label}}</el-checkbox>
                 </el-checkbox-group>
               </el-form-item>
             </el-col>