Merge remote-tracking branch 'origin/master'

package.json

@@ -34,6 +34,7 @@
     "jeeplus-flowable-v3": "^2.1.0",
     "jeeplus-form-v3": "^2.1.0",
     "jquery": "^3.6.0",
+    "js-base64": "^3.7.5",
     "js-cookie": "3.0.0",
     "lodash": "^4.17.21",
     "lodash.omit": "^4.5.0",

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

@@ -134,45 +134,45 @@
           :checkbox-config="{}">
           <vxe-column type="seq" width="60" title="序号"></vxe-column>
           <vxe-column type="checkbox" width="60" ></vxe-column>
-          <vxe-column width="130" title="报销编号" field="no" align="center">
+          <vxe-column min-width="130" title="报销编号" field="no" align="center">
             <template #default="scope">
               <el-link  type="primary" :underline="false" v-if="hasPermission('cw:reimbursement:info:view')" @click="view(scope.row.id)">{{scope.row.no}}</el-link>
               <el-link  type="primary" :underline="false" v-else-if="hasPermission('cw:reimbursement:info:view')" @click="view(scope.row.id)">{{scope.row.no}}</el-link>
               <span v-else>{{scope.row.no}}</span>
             </template>
           </vxe-column>
-          <vxe-column width="130" title="报销类型" field="sourceType" align="center">
+          <vxe-column min-width="130" title="报销类型" field="sourceType" align="center">
             <template #default="scope">
               {{$dictUtils.getDictLabel('cw_reimbursement_source_type', scope.row.sourceType, '')}}
             </template>
           </vxe-column>
-          <vxe-column width="130" title="报销类别" field="typeName" align="center"></vxe-column>
-          <vxe-column width="180" title="报销项目" field="projectName" align="center">
+          <vxe-column min-width="130" title="报销类别" field="typeName" align="center"></vxe-column>
+          <vxe-column min-width="180" title="报销项目" field="projectName" align="center">
             <template #default="scope">
               <el-link  type="primary" :underline="false" v-if="hasPermission('cw:reimbursement:info:view') && scope.row.projectId != undefined" @click="viewProject(scope.row.projectId)">{{scope.row.sourceType === '2' ? '' : scope.row.projectName}}</el-link>
               <el-link  type="primary" :underline="false" v-else-if="hasPermission('cw:reimbursement:info:view') && scope.row.projectId != undefined" @click="viewProject(scope.row.projectId)">{{scope.row.sourceType === '2' ? '' : scope.row.projectName}}</el-link>
               <span v-else>{{scope.row.sourceType === '2' ? '' : scope.row.projectName}}</span>
             </template>
           </vxe-column>
-          <vxe-column width="180" title="报销合同" field="projectName" align="center">
+          <vxe-column min-width="180" title="报销合同" field="projectName" align="center">
             <template #default="scope">
               <el-link  type="primary" :underline="false" v-if="hasPermission('cw:reimbursement:info:view') && scope.row.projectId != undefined" @click="viewContract(scope.row.projectId)">{{scope.row.sourceType === '2' ? scope.row.projectName : ''}}</el-link>
               <span v-else>{{scope.row.sourceType === '2' ? scope.row.projectName : ''}}</span>
             </template>
           </vxe-column>
-          <vxe-column width="180" title="报告号" field="reportNumber" align="center"></vxe-column>
-          <vxe-column width="100" title="经办人" field="userName" align="center"></vxe-column>
-          <vxe-column width="100" title="报销人" field="name" align="center"></vxe-column>
-          <vxe-column width="100" title="报销部门" field="deptName" align="center"></vxe-column>
-          <vxe-column width="100" title="报销日期" field="reimDate" align="center"></vxe-column>
-          <vxe-column width="100" title="报销金额(元)" field="number" fixed="right" align="center"></vxe-column>
-          <vxe-column width="100" title="状态" fixed="right" align="center" field="type">
+          <vxe-column min-width="180" title="报告号" field="reportNumber" align="center"></vxe-column>
+          <vxe-column min-width="100" title="经办人" field="userName" align="center"></vxe-column>
+          <vxe-column min-width="100" title="报销人" field="name" align="center"></vxe-column>
+          <vxe-column min-width="100" title="报销部门" field="deptName" align="center"></vxe-column>
+          <vxe-column min-width="100" title="报销日期" field="reimDate" align="center"></vxe-column>
+          <vxe-column min-width="100" title="报销金额(元)" field="number" fixed="right" align="center"></vxe-column>
+          <vxe-column min-width="100" title="状态" fixed="right" align="center" field="type">
             <template #default="scope">
               <el-button @click="detail(scope.row)" :type="$dictUtils.getDictLabel('status_info', scope.row.type, '')" effect="dark" >{{$dictUtils.getDictLabel("status", scope.row.type, '未开始')}} </el-button>
             </template>
           </vxe-column>
 
-          <vxe-column title="操作" width="130px" fixed="right" align="center">
+          <vxe-column title="操作" min-width="130px" fixed="right" align="center">
             <template  #default="scope">
               <div v-if="isAdmin">
                 <el-button v-if=" (scope.row.type === '5' )" text type="primary" @click="editForm(scope.row)">修改</el-button>

src/views/cw/workClientInfo/clientUserSelect/AccountantUserSelectDialog2.vue

@@ -378,7 +378,7 @@ export default {
     },
     refreshTree () {
       this.$http({
-        url: `/system-server/sys/office/treeData`,
+        url: `/system-server/sys/office/accessTreeData`,
         method: 'get'
       }).then((data) => {
         this.officeTreeData = data

src/views/cw/workContract/ContractNameForm.vue

@@ -662,7 +662,7 @@
     },
     computed: {
       officeName () {
-        return this.$store.state.user.officeDTO.name
+        return this.$store.state.user.office.name
       },
       bus: {
         get () {

src/views/dashboard/widgets/components/TodoList.vue

@@ -275,6 +275,8 @@
 						this.$router.push({
 							path: "/flowable/task/TaskForm",
 							query: {
+								wareHouseId: row.processDefinitionName === '物资管理-入库修改' ? data.businessId : '',
+								returnId: row.processDefinitionName === '物资管理-领用退回申请' ? data.businessId : '',
 								formTitle: `${row.vars.title}`,
 								title: `审批【${row.task.name || ""}】`,
 								cs: cs,

src/views/flowable/task/TaskForm.vue

@@ -2,7 +2,7 @@
 	<div class="jp-center">
 		<h2 class="title">{{ title }}</h2>
 
-		<el-tabs type="border-card" v-model="taskSelectedTab">
+		<el-tabs type="border-card" v-model="taskSelectedTab" @tab-click="onTabChange">
 			<el-tab-pane label="表单信息" name="form-first">
 				<component
 					:formReadOnly="formReadOnly"
@@ -77,7 +77,7 @@
 							<span v-else>{{scope.row.updateUser}} </span>
 						</template>
 					</vxe-column>
-					<vxe-column min-width="160" align="center" title="修改时间" field="createDate"></vxe-column>
+					<vxe-column min-width="160" align="center" title="修改时间" field="createTime"></vxe-column>
 					<vxe-column title="操作" width="150px" fixed="right" align="center">
 						<template  #default="scope">
 							<el-button type="text" size="small" @click="hiDetail(scope.row)">修改详情</el-button>
@@ -102,7 +102,7 @@
 						</template>
 					</vxe-column>
 					<vxe-column min-width="160" align="center" title="退回申请人" field="returnUserName"></vxe-column>
-					<vxe-column min-width="160" align="center" title="退回时间" field="createDate"></vxe-column>
+					<vxe-column min-width="160" align="center" title="退回时间" field="createTime"></vxe-column>
 					<vxe-column title="操作" width="150px" fixed="right" align="center">
 						<template  #default="scope">
 							<el-button type="text" size="small" @click="hiDetailCollect(scope.row)">退回详情</el-button>
@@ -243,11 +243,15 @@
 			ref="addSignTaskUserSelectDialog"
 			@doSubmit="selectUsersToAddSignTask"
 		></user-select-dialog>
+		<CollectReturnHi ref="collectReturnHi"></CollectReturnHi>
+		<WareHouseHi ref="wareHouseHi"></WareHouseHi>
 	</div>
 </template>
 
 <script>
 // import FlowChart from '../modeler/FlowChart'
+import CollectReturnHi from '@/views/materialManagement/collect/CollectReturnHiForm'
+import WareHouseHi from '@/views/materialManagement/wareHouse/WareHouseHi'
 import noticeService from '@/api/flowable/noticeService'
 import useTabs from "@/utils/useTabs";
 import UserSelect from "@/components/userSelect/index.vue";
@@ -263,7 +267,15 @@ import flowCopyService from "@/api/flowable/flowCopyService.js";
 import processService from "@/api/flowable/processService.js";
 import print2 from "@/utils/print.js";
 import { shallowRef } from 'vue'
+import CollectService from '@/api/materialManagement/CollectService'
+import WareHouseService from '@/api/materialManagement/WareHouseService'
 export default {
+	collectService: null,
+	wareHouseService: null,
+	beforeCreate () {
+		this.collectService = new CollectService()
+		this.wareHouseService = new WareHouseService()
+	},
 	activated() {
 		this.init();
 		if (this.formType === "2") {
@@ -357,6 +369,8 @@ export default {
 		TaskBackNodes,
 		FlowStep,
 		FlowTimeLine,
+		CollectReturnHi,
+		WareHouseHi
 	},
 	watch: {
 		isAssign(val) {
@@ -407,6 +421,7 @@ export default {
 			this.statusFlag = this.$route.query.statusFlag
 			this.wareHouseId = this.$route.query.wareHouseId
 			this.returnId = this.$route.query.returnId
+			console.log('this.returnId', this.returnId)
 			if (this.commonJS.isEmpty(this.$route.query.isShow)) {
 				this.isShow = 'true'
 			} else {
@@ -739,6 +754,12 @@ export default {
 									} else if (num === '3') {
 										this.$router.push({path: '/sys/dashboard/workBench/PendingList'})
 										this.cc(data)
+									}else if (this.cs === 'cs') {
+										this.$router.push({path: '/dashboard/index'})
+										this.cc(data)
+									}else if (this.cs === 'cs2') {
+										this.$router.push({path: '/home'})
+										this.cc(data)
 									} else {
 										this.$router.push({path: '/flowable/task/TodoList'})
 										this.cc(data)
@@ -1004,6 +1025,9 @@ export default {
 									}else if (this.cs === 'cs') {
 										this.$router.push({path: ''})
 										this.cc(data)
+									}else if (this.cs === 'cs2') {
+										this.$router.push({path: '/home'})
+										this.cc(data)
 									} else {
 										this.$router.push({path: '/flowable/task/TodoList'})
 										this.cc(data)
@@ -1185,14 +1209,14 @@ export default {
 			}
 		},
 		onTabChange (event) {
-			if (event.name === 'form-sixth') {
+			if (event.props.name === 'form-sixth') {
 				if (this.commonJS.isNotEmpty(this.wareHouseId)) {
 					this.wareHouseService.findHiById(this.wareHouseId).then((data) => {
 						this.dataListHi = data
 					})
 				}
 			}
-			if (event.name === 'form-seventh') {
+			if (event.props.name === 'form-seventh') {
 				if (this.commonJS.isNotEmpty(this.returnId)) {
 					this.collectService.findByReturnId(this.returnId).then((data) => {
 						this.collectService.findHiById(data.id).then((data) => {

src/views/flowable/task/TaskFormDetail.vue

@@ -31,7 +31,7 @@
 			class="process-status-img"
 			src="../../../assets/img/flowable/6.png"
 		/>
-		<el-tabs type="border-card" v-model="selectedTab">
+		<el-tabs type="border-card" v-model="selectedTab" @tab-click="onTabChange">
 			<el-tab-pane label="表单信息" name="form-first">
 				<component
 					:formReadOnly="formReadOnly"
@@ -75,7 +75,68 @@
 			<el-tab-pane label="流转记录" v-if="procInsId" name="form-forth">
 				<flow-step :historicTaskList="historicTaskList" />
 			</el-tab-pane>
+			<el-tab-pane label="入库修改历史" v-if="wareHouseId" name="form-sixth">
+				<vxe-table
+					border="inner"
+					size="mini"
+					max-height="1000px"
+					:data="dataListHi">
+					<vxe-column type="seq" width="60" title="序号"></vxe-column>
+					<vxe-column min-width="120" align="center" title="修改类型" field="updateTradeType">
+						<template #default="scope">
+							<span v-if="commonJS.isNotEmpty(scope.row.updateTradeType)"> {{scope.row.updateTradeType}} </span>
+							<span v-else> -- </span>
+						</template>
+					</vxe-column>
+					<vxe-column min-width="160" align="center" title="修改商品" field="updateTradeName">
+						<template #default="scope">
+							<span v-if="commonJS.isNotEmpty(scope.row.updateTradeName)"> {{scope.row.updateTradeName}} </span>
+							<span v-else> -- </span>
+						</template>
+					</vxe-column>
+					<vxe-column min-width="160" align="center" title="修改人" field="updateUser">
+						<template #default="scope">
+							<span v-if="scope.row.endflag === '2'">(创建人) {{scope.row.updateUser}} </span>
+							<span v-else>{{scope.row.updateUser}} </span>
+						</template>
+					</vxe-column>
+					<vxe-column min-width="160" align="center" title="修改时间" field="createTime"></vxe-column>
+					<vxe-column title="操作" width="150px" fixed="right" align="center">
+						<template  #default="scope">
+							<el-button text type="primary" size="small" @click="hiDetail(scope.row)">修改详情</el-button>
+						</template>
+					</vxe-column>
+				</vxe-table>
+			</el-tab-pane>
+			<el-tab-pane label="领用退回历史" v-if="returnId" name="form-seventh">
+				<vxe-table
+					border="inner"
+					size="mini"
+					max-height="1000px"
+					:data="dataListHiCollect">
+					<vxe-column type="seq" width="60" title="序号"></vxe-column>
+					<vxe-column min-width="160" align="center" title="退回物品" field="returnGoods">
+						<template #default="scope">
+							<span v-if="commonJS.isNotEmpty(scope.row.returnGoods)"> {{scope.row.returnGoods}} </span>
+							<span v-else> -- </span>
+						</template>
+					</vxe-column>
+					<vxe-column min-width="160" align="center" title="退回申请人" field="returnUserName">
+						<template #default="scope">
+							<span>{{scope.row.returnUserName}} </span>
+						</template>
+					</vxe-column>
+					<vxe-column min-width="160" align="center" title="退回时间" field="createTime"></vxe-column>
+					<vxe-column title="操作" width="150px" fixed="right" align="center">
+						<template  #default="scope">
+							<el-button text type="primary" size="small" @click="hiDetailCollect(scope.row)">退回详情</el-button>
+						</template>
+					</vxe-column>
+				</vxe-table>
+			</el-tab-pane>
 		</el-tabs>
+		<WareHouseHi ref="wareHouseHi"></WareHouseHi>
+		<CollectReturnHi ref="collectReturnHi"></CollectReturnHi>
 	</div>
 </template>
 
@@ -89,7 +150,17 @@ import taskService from "@/api/flowable/taskService.js";
 import formService from "@/api/flowable/formService.js";
 import processService from "@/api/flowable/processService.js";
 import { shallowRef } from 'vue'
+import WareHouseHi from '@/views/materialManagement/wareHouse/WareHouseHi'
+import CollectReturnHi from '@/views/materialManagement/collect/CollectReturnHiForm'
+import CollectService from '@/api/materialManagement/CollectService'
+import WareHouseService from '@/api/materialManagement/WareHouseService'
 export default {
+	collectService: null,
+	wareHouseService: null,
+	beforeCreate () {
+		this.collectService = new CollectService()
+		this.wareHouseService = new WareHouseService()
+	},
 	activated() {
 		this.init();
 		// 读取流程表单
@@ -140,6 +211,8 @@ export default {
 		PreviewForm,
 		FlowStep,
 		FlowTimeLine,
+		WareHouseHi,
+		CollectReturnHi
 		// FlowChart
 	},
 	watch: {
@@ -166,6 +239,8 @@ export default {
 			this.title = this.$route.query.formTitle;
 			this.businessId = this.$route.query.businessId;
 			this.procInsId = this.$route.query.procInsId;
+			this.returnId = this.$route.query.returnId
+			this.wareHouseId = this.$route.query.wareHouseId
 			this.formReadOnly = true;
 
 			let _this = this
@@ -177,6 +252,37 @@ export default {
 				}
 			}, 500)
 		},
+		onTabChange (event) {
+			if (event.props.name === 'form-sixth') {
+				if (this.commonJS.isNotEmpty(this.wareHouseId)) {
+					this.wareHouseService.findHiById(this.wareHouseId).then((data) => {
+						this.dataListHi = data
+					})
+				}
+			}
+			if (event.props.name === 'form-seventh') {
+				console.log('建立了')
+				if (this.commonJS.isNotEmpty(this.returnId)) {
+					this.collectService.findByReturnId(this.returnId).then((data) => {
+						this.collectService.findHiById(data.id).then((data) => {
+							this.dataListHiCollect = data
+						})
+					})
+				}
+			}
+		},
+		// 打开入库修改历史详情页
+		hiDetail (row) {
+			if (this.commonJS.isNotEmpty(row.id)) {
+				this.$refs.wareHouseHi.init(row.id)
+			}
+		},
+		// 打开领用退回历史详情页
+		hiDetailCollect (row) {
+			if (this.commonJS.isNotEmpty(row.id)) {
+				this.$refs.collectReturnHi.init(row.id)
+			}
+		}
 	},
 	data() {
 		return {
@@ -196,6 +302,10 @@ export default {
 			status: "",
 			title: "",
 			businessId: "",
+			returnId: "",
+			wareHouseId: '',
+			dataListHi: [],
+			dataListHiCollect: []
 		};
 	},
 };

src/views/home/components/TodoList2.vue

@@ -188,10 +188,12 @@
 						status: row.status,
 					})
 					.then((data) => {
-						var cs = "cs"
+						var cs = "cs2"
 						this.$router.push({
 							path: "/flowable/task/TaskForm",
 							query: {
+								wareHouseId: row.processDefinitionName === '物资管理-入库修改' ? data.businessId : '',
+								returnId: row.processDefinitionName === '物资管理-领用退回申请' ? data.businessId : '',
 								formTitle: `${row.vars.title}`,
 								title: `审批【${row.task.name || ""}】`,
 								cs: cs,

src/views/materialManagement/collect/CollectForm.vue

@@ -297,6 +297,7 @@
         this.inputForm.id = id
         this.visible = true
         this.loading = false
+		  this.$refs.uploadComponent.clearUpload()
         this.$nextTick(() => {
           if (this.commonJS.isEmpty(this.inputForm.handledByOffice)) {
             this.inputForm.handledByOffice = this.$store.state.user.office.id

src/views/materialManagement/collect/CollectReturnHiForm.vue

@@ -0,0 +1,851 @@
+<template>
+  <div>
+    <el-dialog
+      :title="title"
+      :close-on-click-modal="false"
+	  draggable
+      append-to-body
+      width="1300px"
+      @close="close"
+      v-model="visible">
+    <el-form :model="inputForm" ref="inputForm" v-loading="loading" :class="method==='view'?'readonly':''"  :disabled="status === 'audit' || status === 'taskFormDetail'"
+             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="collectNo">
+            <el-input placeholder="自动生成" v-model="inputForm.collectNo" :disabled="true"></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="`/system-server/sys/office/treeData?type=2`"
+              :value="inputForm.handledByOffice"
+              :accordion="true"
+              size="default"
+              @getValue="(value) => {inputForm.handledByOffice=value}"/>
+<!--            <el-input v-model="inputForm.handledByOffice" :disabled="true"></el-input>-->
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="领用时间" prop="collectTime" :rules="[{required: true, message:'请选择领用时间', trigger:'blur'}]">
+            <el-date-picker
+              :disabled="true"
+              v-model="inputForm.collectDate"
+              type="date"
+              placement="bottom-start"
+              value-format="YYYY-MM-DD"
+              style="width: 100%"
+              placeholder="选择日期">
+            </el-date-picker>
+          </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="请填写备注信息"
+                      :disabled="true"
+                      show-word-limit>
+            </el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
+
+      <el-divider content-position="left"><i class="el-icon-document"></i>
+        领用详情
+      </el-divider>
+      <el-row  :gutter="15" >
+        <el-col :span="24">
+			<vxe-table
+				border
+				show-footer
+				show-overflow
+				ref="detailTable"
+				class="vxe-table-element"
+				:data="inputForm.detailInfos"
+				style="margin-left: 5em"
+				:row-class-name="rowClassName"
+			>
+				<vxe-table-column field="recipientAgent" title="领用人" align="center">
+					<template #default="scope">
+						<span>{{scope.row.recipientAgent}}</span><span v-if="scope.row.isReturn === '1'">(已退回)</span>
+					</template>
+				</vxe-table-column>
+				<vxe-table-column field="recipientOffice" title="领用人部门" align="center"></vxe-table-column>
+				<vxe-table-column field="collectType" title="领用类型" align="center"></vxe-table-column>
+				<vxe-table-column field="goodsName" title="物品名称" align="center"></vxe-table-column>
+				<vxe-table-column field="collectNumber" title="领用数量" align="center"></vxe-table-column>
+				<vxe-table-column field="surplusNumber" title="库存数量" align="center"></vxe-table-column>
+				<vxe-table-column field="company" title="单位" align="center"></vxe-table-column>
+				<vxe-table-column field="remarks" title="备注" align="center"></vxe-table-column>
+				<vxe-table-column title="操作" width="170" align="center">
+					<template #default="scope">
+						<el-button type="primary" :disabled="false" @click="seeFileInfo(scope.$rowIndex)">附件</el-button>
+					</template>
+				</vxe-table-column>
+			</vxe-table>
+		</el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="24" style="margin-top: 20px">
+          <el-form-item label="退回原因" prop="returnCause">
+            <el-input v-model="inputForm.returnCause"
+                      type="textarea"
+                      :rows="5"
+                      maxlength="500"
+                      placeholder="请填写退回原因"
+                      :disabled="true"
+                      show-word-limit>
+            </el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
+
+    </el-form>
+    <PurchasePageForm  ref="purchasePageForm" @getProject="getContract"></PurchasePageForm>
+    <!-- 附件 -->
+    <MaterialManagementDialog ref="materialManagementDialog" @getUpload="getUpload"></MaterialManagementDialog>
+    <UpLoadComponent ref="uploadComponent"></UpLoadComponent>
+    <CwProgramPageForm ref="cwProgramPageForm" @getProgram="getProgram"></CwProgramPageForm>
+    <MaterialTypePullForm ref="materialTypePullForm" @getProgramForType="getProgramForType"></MaterialTypePullForm>
+    <UserPullForm ref="userPullForm" @getProgramForUser="getProgramForUser"></UserPullForm>
+      <template #footer>
+		  <span class="dialog-footer">
+			  <el-button  @click="close()" icon="el-icon-circle-close">关闭</el-button>
+		  </span>
+	  </template>
+
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+  import MaterialManagementDialog from '../file/MaterialManagementDialog'
+  import CollectService from '@/api/materialManagement/CollectService'
+  import UpLoadComponent from '@/views/common/UpLoadComponent'
+  import SelectTree from '@/components/treeSelect/treeSelect.vue'
+  import CwProgramPageForm from '@/views/cw/reimbursementApproval/info/CwProgramPageForm'
+  import MaterialTypePullForm from '../info/MaterialTypePullForm'
+  import UserPullForm from '@/views/finance/invoice/UserPullForm'
+  import PurchasePageForm from './PurchasePageForm'
+  import CommonApi from '@/api/cw/common/CommonApi'
+  export default {
+    data () {
+      return {
+        validRules: {
+          recipientAgent: [
+            {required: true, message: '领用人不能为空'}
+          ],
+          recipientOffice: [
+            {required: true, message: '领用人部门不能为空'}
+          ],
+          collectType: [
+            {required: true, message: '领用类型不能为空'}
+          ],
+          goodsName: [
+            {required: true, message: '物品名称不能为空'}
+          ],
+          collectNumber: [
+            {required: true, message: '领用数量不能为空'}
+          ]
+        },
+        title: '',
+        method: '',
+        visible: false,
+        loading: false,
+        indexRow: '',
+        inputForm: {
+          fileInfoLost: [],
+          handledByOffice: '',
+          handledBy: '',
+          handledById: '',
+          collectNo: '', // 领用编号
+          userId: '',
+          collectDate: '',
+          remarks: '',
+          detailInfos: [],
+          // amountInfos: [],
+          files: [], // 附件信息
+          procInsId: '',
+          statusReturn: '',
+          procInsIdReturn: '',
+          processDefinitionIdReturn: '',
+          returnId: '',
+          returnCause: '',
+          returnFiles: []
+        },
+        keyWatch: ''
+      }
+    },
+    collectService: null,
+    commonApi: null,
+    created () {
+      this.collectService = new CollectService()
+      this.commonApi = new CommonApi()
+    },
+    props: {
+      businessId: {
+        type: String,
+        default: ''
+      },
+      formReadOnly: {
+        type: Boolean,
+        default: false
+      },
+      status: {
+        type: String,
+        default: ''
+      }
+    },
+    components: {
+      MaterialManagementDialog,
+      UpLoadComponent,
+      SelectTree,
+      CwProgramPageForm,
+      MaterialTypePullForm,
+      UserPullForm,
+      PurchasePageForm
+    },
+    computed: {
+      bus: {
+        get () {
+          return this.businessId
+        },
+        set (val) {
+          this.businessId = val
+        }
+      },
+      name () {
+        return this.$store.state.user.name
+      },
+      officeName () {
+        return this.$store.state.user.office.name
+      },
+      userId () {
+        return this.$store.state.user.id
+      },
+      recipientAgentId () {
+        return this.$store.state.user.id
+      },
+      collectTypeId () {
+        return ''
+      }
+    },
+    watch: {
+      'keyWatch': {
+        handler (newVal) {
+          if (this.commonJS.isNotEmpty(this.bus)) {
+            this.init('', this.bus)
+          } else {
+            this.$nextTick(() => {
+              this.$refs.inputForm.resetFields()
+            })
+          }
+        }
+      },
+      'loading': {
+        handler (newVal) {
+          this.$emit('changeLoading', newVal)
+          this.$refs.uploadComponent.changeLoading(newVal)
+        }
+      }
+    },
+    methods: {
+      getKeyWatch (keyWatch) {
+        this.keyWatch = keyWatch
+      },
+      init (id) {
+        let method = 'view'
+        this.method = method
+        this.inputForm = {
+          fileInfoLost: [],
+          handledByOffice: '',
+          handledBy: this.$store.state.user.name,
+          handledById: this.$store.state.user.id,
+          collectNo: '', // 领用编号
+          userId: this.$store.state.user.id,
+          collectDate: new Date(),
+          remarks: '',
+          detailInfos: [],
+          // amountInfos: [],
+          files: [], // 附件信息
+          procInsId: '',
+          statusReturn: '',
+          procInsIdReturn: '',
+          processDefinitionIdReturn: '',
+          returnId: '',
+          returnCause: '',
+          returnFiles: []
+        }
+        this.title = '领用退回历史详情'
+        this.inputForm.id = id
+        this.visible = true
+        this.loading = false
+        this.$nextTick(() => {
+          if (this.commonJS.isEmpty(this.inputForm.handledByOffice)) {
+            this.inputForm.handledByOffice = this.$store.state.user.office.id
+          }
+          if (this.status === 'audit' || this.status === 'taskFormDetail') {
+            method = 'view'
+          }
+          this.loading = true
+          this.$refs.inputForm.resetFields()
+          this.collectService.findHiByHiId(this.inputForm.id).then((data) => {
+            this.$refs.uploadComponent.clearUpload()
+            if (this.inputForm.id !== 'false') {
+              this.inputForm = this.recover(this.inputForm, data)
+              this.inputForm = JSON.parse(JSON.stringify(this.inputForm))
+              if (this.commonJS.isEmpty(this.inputForm.handledByOffice)) {
+                this.inputForm.handledByOffice = this.$store.state.user.office.id
+              }
+              if (this.commonJS.isNotEmpty(data.recipientAgentId)) {
+                this.recipientAgentId = data.recipientAgentId
+              }
+              if (this.commonJS.isNotEmpty(data.collectTypeId)) {
+                this.collectTypeId = data.collectTypeId
+              }
+              if (this.commonJS.isNotEmpty(this.inputForm.detailInfos)) {
+                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
+                    }
+                  }
+                }
+              }
+              if (this.commonJS.isEmpty(this.inputForm.returnFiles)) {
+                this.inputForm.returnFiles = []
+              }
+              this.$refs.uploadComponent.newUpload('view', this.inputForm.returnFiles, 'collect_return')
+              this.inputForm = JSON.parse(JSON.stringify(this.inputForm))
+              this.loading = false
+            } else {
+              if (this.commonJS.isEmpty(this.inputForm.handledByOffice)) {
+                this.inputForm.handledByOffice = this.$store.state.user.office.id
+              }
+              if (this.commonJS.isEmpty(this.inputForm.handledBy)) {
+                this.inputForm.handledBy = this.$store.state.user.name
+              }
+              if (this.commonJS.isEmpty(this.inputForm.handledById)) {
+                this.inputForm.handledById = this.$store.state.user.id
+              }
+              if (this.commonJS.isEmpty(this.inputForm.collectDate)) {
+                this.inputForm.collectDate = new Date()
+              }
+              this.inputForm.detailInfos = []
+              this.loading = false
+            }
+          })
+        })
+      },
+      getUpload (p, index) {
+        p.then((list) => {
+          // list为返回数据
+          this.inputForm.detailInfos[index].fileInfoLost = list
+          this.inputForm.detailInfos[index].fileNumber = list.length
+          this.tableKeyClient = Math.random()
+        })
+      },
+      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)
+      },
+      sss (index) {
+        if (this.commonJS.isEmpty(this.inputForm.detailInfos[index].fileInfoLost)) {
+          this.inputForm.detailInfos[index].fileInfoLost = []
+        }
+        this.$refs.materialManagementDialog.newUpload(null, this.inputForm.detailInfos[index].fileInfoLost, null, null, null, null, null, false, index)
+      },
+      // 表单提交
+      doSubmit () {
+        this.$refs['inputForm'].validate((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.id = this.businessId
+            this.inputForm.files = this.$refs.uploadComponent.getDataList()
+            this.collectService.save(this.inputForm).then((data) => {
+              this.close()
+              this.$message.success(data)
+              this.$emit('refreshDataList')
+              this.loading = false
+            }).catch(() => {
+              this.loading = false
+            })
+          }
+        })
+      },
+      close () {
+        this.inputForm.detailInfos = []
+        // this.inputForm.amountInfos = []
+        this.$refs.uploadComponent.clearUpload()
+
+        this.visible = false
+        this.$refs.inputForm.resetFields()
+      },
+      // 删除
+      removeEvent (row, rowIndex, type) {
+        if (type === 'detail') {
+          this.$refs.detailTable.remove(row)
+          this.inputForm.detailInfos.splice(rowIndex, 1)
+        }
+        if (type === 'amount') {
+          this.$refs.amountTable.remove(row)
+          // this.inputForm.amountInfos.splice(rowIndex, 1)
+        }
+      },
+      // 新增
+      async insertEvent (type) {
+        if (type === 'detail') {
+          await this.$refs.detailTable.insert().then((data) => {
+            data.recipientAgent = this.$store.state.user.name
+            data.recipientAgentId = this.recipientAgentId
+            data.recipientOffice = this.officeName
+            this.inputForm.detailInfos.push(data)
+          })
+        }
+        if (type === 'amount') {
+          await this.$refs.amountTable.insert().then((data) => {
+            // this.inputForm.amountInfos.push(data)
+          })
+        }
+      },
+      reapplyForm (callback) {
+        this.loading = true
+        this.collectService.findById(this.inputForm.id).then((data) => {
+          if (data.statusReturn !== '4') { // 审核状态不是“驳回”，就弹出提示
+            this.loading = false
+            this.$message.error('任务数据已发生改变或不存在，请在待办任务中确认此任务是否存在')
+            throw new Error('任务数据已发生改变或不存在，请在待办任务中确认此任务是否存在')
+          } else {
+            this.startFormTrue(callback)
+          }
+        })
+      },
+      startForm (callback) {
+        this.loading = true
+        if (this.commonJS.isNotEmpty(this.inputForm.id)) {
+          this.collectService.findById(this.inputForm.id).then((data) => {
+            // 审核状态不是“未发起”或“暂存”或“撤回”，就弹出提示
+            if (this.commonJS.isNotEmpty(data.statusReturn) && data.statusReturn !== '0' && data.statusReturn !== '1' && data.statusReturn !== '3') {
+              this.loading = false
+              this.$message.error('任务数据已发生改变或不存在，请在待办任务中确认此任务是否存在')
+              throw new Error('任务数据已发生改变或不存在，请在待办任务中确认此任务是否存在')
+            } else {
+              this.startFormTrue(callback)
+            }
+          })
+        } else {
+          this.startFormTrue(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.statusReturn = '1'
+        this.collectService.saveReturn(this.inputForm).then((data) => {
+          callback()
+          this.$refs.inputForm.resetFields()
+          this.loading = false
+        }).catch(() => {
+          this.$refs.inputForm.resetFields()
+          this.loading = false
+        })
+      },
+      // 送审
+      async startFormTrue (callback) {
+        this.loading = true
+        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.detailInfos)) {
+              this.$message.error('至少填写一条领用详情信息')
+              this.loading = false
+              return
+            } else {
+              let i = this.inputForm.detailInfos.length
+              for (let j = 0; j < i; j++) {
+                let k = j + 1
+                if (this.commonJS.isEmpty(this.inputForm.detailInfos[j].recipientAgent)) {
+                  this.$message.error('领用详情第' + k + '行请选择领用人')
+                  this.loading = false
+                  return
+                }
+                if (this.commonJS.isEmpty(this.inputForm.detailInfos[j].collectType)) {
+                  this.$message.error('领用详情第' + k + '行请选择领用类型')
+                  this.loading = false
+                  return
+                }
+                if (this.commonJS.isEmpty(this.inputForm.detailInfos[j].goodsName)) {
+                  this.$message.error('领用详情第' + k + '行请选择物品名称')
+                  this.loading = false
+                  return
+                }
+                if (this.commonJS.isEmpty(this.inputForm.detailInfos[j].collectNumber)) {
+                  this.$message.error('领用详情第' + k + '行请输入领用数量')
+                  this.loading = false
+                  return
+                }
+              }
+            }
+            this.inputForm.files = this.$refs.uploadComponent.getDataList()
+            this.inputForm.statusReturn = '2'
+            this.collectService.saveReturn(this.inputForm).then((data) => {
+              this.inputForm.id = data.businessId
+              callback(data.businessTable, data.businessId, this.inputForm)
+              this.$refs.inputForm.resetFields()
+              this.loading = false
+            }).catch(() => {
+              this.$refs.inputForm.resetFields()
+              this.loading = false
+            })
+          } else {
+            this.loading = false
+          }
+        })
+      },
+      // 通过
+      async agreeForm (callback) {
+        this.loading = true
+        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()
+            // this.commonApi.getTaskNameByProcInsId(this.inputForm.procInsId).then((data) => {
+            //   if (this.commonJS.isNotEmpty(data)) {
+            //     if (data === '仓库管理员审核') {
+            //       this.inputForm.status = '5'
+            //     }
+            //   }
+            //   this.collectService.save(this.inputForm).then((data) => {
+            //     callback(data.businessTable, data.businessId, this.inputForm)
+            //     this.loading = false
+            //   }).catch(() => {
+            //     this.loading = false
+            //   })
+            // })
+            this.inputForm.statusReturn = '5'
+            this.collectService.saveReturnAgree(this.inputForm).then((data) => {
+              callback(data.businessTable, data.businessId, this.inputForm)
+              this.loading = false
+            }).catch(() => {
+              this.loading = false
+            })
+          } else {
+            this.loading = false
+          }
+        })
+      },
+      // 修改状态
+      async updateStatusById (type, callback) {
+        this.loading = true
+        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.statusReturn !== '2') { // status的值不等于“审核中”，就弹出提示
+                this.loading = false
+                this.$message.error('任务数据已发生改变或不存在，请在待办任务中确认此任务是否存在')
+                throw new Error()
+              } else {
+                if (type === 'reject') {
+                  // 驳回
+                  this.inputForm.statusReturn = '4'
+                }
+                if (type === 'reback') {
+                  // 撤回
+                  this.inputForm.statusReturn = '3'
+                }
+                if (type === 'reject' || type === 'reback') {
+                  let param = {status: this.inputForm.statusReturn, id: this.inputForm.id}
+                  this.collectService.updateStatusByIdReturn(param).then(() => {
+                    this.loading = false
+                    callback()
+                  })
+                }
+              }
+            })
+          } else if (type === 'hold') {
+            this.collectService.findById(this.inputForm.id).then((data) => {
+              if (data.statusReturn !== '4') { // status的值不等于“驳回”就弹出提示
+                this.loading = false
+                this.$message.error('任务数据已发生改变或不存在，请在待办任务中确认此任务是否存在')
+                throw new Error()
+              } else {
+                // 终止
+                this.collectService.returnRequest({id: this.inputForm.id}).then((data) => {
+                  this.loading = false
+                  callback()
+                })
+                // 终止
+                // let param = {status: '0', id: this.inputForm.id}
+                // this.collectService.updateStatusByIdReturn(param).then(() => {
+                //   this.loading = false
+                //   callback()
+                // })
+              }
+            })
+          }
+        }
+      },
+      // updateStatusById (type) {
+      //   if (type === 'reject') {
+      //     this.inputForm.status = '4'
+      //     this.collectService.updateStatusById(this.inputForm)
+      //   }
+      // },
+      // 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
+      // },
+      // 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, '') // 保留数字和小数点
+      // },
+      twoDecimalPlaces2 (num) {
+        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
+        str = str.replace(/[^\d^\.]+/g, '') // 保留数字和小数点
+        return str
+      },
+      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()
+      },
+      // 领用类型下拉弹窗
+      typePullForm (rowIndex) {
+        this.indexRow = rowIndex
+        this.$refs.materialTypePullForm.init()
+      },
+      getProgramForType (rows) {
+        this.inputForm.detailInfos[this.indexRow].collectTypeId = rows.id
+        this.inputForm.detailInfos[this.indexRow].collectType = rows.name
+        this.inputForm.detailInfos[this.indexRow].goodsName = ''
+        this.indexRow = ''
+        this.$forceUpdate()
+      },
+      // 领用人下拉弹窗
+      userPullListForm (rowIndex) {
+        this.indexRow = rowIndex
+        this.$refs.userPullForm.init()
+      },
+      getProgramForUser (rows) {
+        this.inputForm.detailInfos[this.indexRow].recipientAgentId = rows[0].id
+        this.inputForm.detailInfos[this.indexRow].recipientAgent = rows[0].name
+        this.inputForm.detailInfos[this.indexRow].deptId = rows[0].parentId
+        this.inputForm.detailInfos[this.indexRow].recipientOffice = rows[0].officeName
+        this.indexRow = ''
+        this.$forceUpdate()
+      },
+      getUserInfo (rows) {
+      },
+      openPurchasePageForm (rowIndex, row) {
+        if (this.commonJS.isEmpty(row.collectType)) {
+          this.$message.error('请选择领用类型')
+          return
+        }
+        this.indexRow = rowIndex
+        this.$refs.purchasePageForm.init(row.collectTypeId)
+      },
+      getContract (row) {
+        this.inputForm.detailInfos[this.indexRow].surplusNumber = row.tradeNumber
+        this.inputForm.detailInfos[this.indexRow].goodsName = row.tradeName
+        // 去除重复的领用详情
+        let i = this.inputForm.detailInfos.length
+        for (let j = 0; j < i; j++) {
+          console.log('进来了')
+          for (let k = j + 1; k < i; k++) {
+            if (this.inputForm.detailInfos[j].collectTypeId === this.inputForm.detailInfos[k].collectTypeId) {
+              if (this.commonJS.isNotEmpty(this.inputForm.detailInfos[j].goodsName) &&
+                this.commonJS.isNotEmpty(this.inputForm.detailInfos[k].goodsName) && this.inputForm.detailInfos[j].goodsName === this.inputForm.detailInfos[k].goodsName) {
+                // parseFloat(item.account).toFixed(2)
+                this.inputForm.detailInfos.splice(k, 1)
+                this.$message.warning(`同种领用类型的商品名称只能输入一条信息！`)
+              }
+            }
+          }
+        }
+        this.indexRow = ''
+        this.$forceUpdate()
+      },
+      // 值改变事件
+      changeValue () {
+        let i = this.inputForm.detailInfos.length
+        for (let j = 0; j < i; j++) {
+          if (this.commonJS.isEmpty(this.inputForm.detailInfos[j].surplusNumber)) {
+            this.$message.error('请选择领用物品名称')
+            return
+          }
+          if (this.commonJS.isNotEmpty(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
+            }
+          }
+        }
+      },
+      // 退回
+      returnCollect (index) {
+        this.inputForm.detailInfos[index].isReturn = '1'
+      },
+      // 取消退回
+      cancelReturn (index) {
+        this.inputForm.detailInfos[index].isReturn = '0'
+      },
+      // 列表行颜色
+      rowClassName ({ row, rowIndex }) {
+        if (row.isReturn === '1') { // 退回
+          return 'row-grey'
+        } else {
+          return ''
+        }
+      }
+    }
+  }
+</script>
+<style scoped>
+  .el-divider__text {
+    font-size: 16px;
+    font-weight: bold;
+  }
+  /deep/  .row-green {
+    /*background-color: #67c23ad1;*/
+    /*color: #fff;*/
+    font-weight: bold;
+  }
+  /deep/  .row-grey {
+    background-color: #b8b7b7;
+    color: #fff;
+  }
+  /deep/  .row-red {
+    background-color: #f56c6c66;
+    /*color: #fff;*/
+    font-weight: bold;
+  }
+</style>

src/views/materialManagement/purchase/PurchaseForm.vue

@@ -397,6 +397,7 @@
 				this.inputForm.id = id
 				this.visible = true
 				this.loading = false
+				this.$refs.uploadComponent.clearUpload()
 				this.$nextTick(() => {
 					if ((this.status === 'audit' || this.status === 'taskFormDetail') && this.businessId !== 'false') {
 						method = 'view'

src/views/materialManagement/supplier/SupplierForm.vue

@@ -280,9 +280,9 @@
           name: [
             {required: true, message: '姓名不可以为空'}
           ],
-          linkPhone: [
-            {required: true, message: '联系方式1不可以为空'}
-          ]
+          // linkPhone: [
+          //   {required: true, message: '联系方式1不可以为空'}
+          // ]
         },
         gridData: [],
         popKey: ''

src/views/sys/login/components/login-form.vue

@@ -169,6 +169,9 @@ import config from "@/config";
 import loginService from "@/api/auth/loginService";
 import userService from "@/api/sys/userService";
 import tenantService from "@/api/sys/tenantService";
+
+//在运用页面引入
+import { Base64 } from 'js-base64' //引入base64加密，用于记住密码
 export default {
 	data() {
 		return {
@@ -251,6 +254,8 @@ export default {
 		this.$store.commit("clearIframeList");
 	},
 	mounted() {
+
+		this.getCookie()
 		// this.getCaptcha();
 		if (this.inputForm.username) {
 			this.getLoginCodeNumber(this.inputForm.username)
@@ -264,6 +269,9 @@ export default {
 	methods: {
 		// 提交表单
 		async login() {
+			var checked = this.checked
+			var password = this.inputForm.password
+			var username = this.inputForm.username
 			this.$refs.loginForm.validate((valid) => {
 				if (valid) {
 					this.loading = true;
@@ -309,6 +317,17 @@ export default {
 							this.$TOOL.data.set("MENU", menuList);
 							this.$TOOL.data.set("PERMISSIONS", permissions);
 							this.$TOOL.data.set("DICT_LIST", dictList);
+
+							// let Base64 = require('js-base64').Base64
+							/* ------ 账号密码的存储 ------ */
+							if (checked) {
+								// eslint-disable-next-line no-undef
+								// let password = Base64.encode(passwordLogin) // base64加密
+								this.setCookie(Base64.encode(username), Base64.encode(password), 7)
+							} else {
+								this.setCookie('', '', -1) // 修改2值都为空，天数为负1天就好了
+							}
+							/* ------ http登录请求 ------ */
 							this.$notify({
 								title: "登录成功",
 								message: `欢迎回来！<br/>你上次的登录IP是 ${loginResp.oldLoginIp}，登录时间是 ${loginResp.oldLoginDate}。`,
@@ -370,6 +389,34 @@ export default {
 				}
 			})
 		},
+		// 设置cookie
+		setCookie (username, password, days) {
+			let date = new Date() // 获取时间
+			date.setTime(date.getTime() + 24 * 60 * 60 * 1000 * days) // 保存的天数
+			// 字符串拼接cookie
+			window.document.cookie =
+				'username' + '=' + username + ';path=/;expires=' + date.toGMTString()
+			window.document.cookie =
+				'password' + '=' + password + ';path=/;expires=' + date.toGMTString()
+		},
+
+		// 读取cookie 将用户名和密码回显到input框中
+		getCookie () {
+			// let Base64 = require('js-base64').Base64
+			if (document.cookie.length > 0) {
+				let arr = document.cookie.split('; ') // 分割成一个个独立的“key=value”的形式
+				for (let i = 0; i < arr.length; i++) {
+					let arr2 = arr[i].split('=') // 再次切割，arr2[0]为key值，arr2[1]为对应的value
+					if (arr2[0] === 'username') {
+						this.inputForm.username = Base64.decode(arr2[1])// base64解密
+					} else if (arr2[0] === 'password') {
+						// eslint-disable-next-line no-undef
+						this.inputForm.password = Base64.decode(arr2[1])// base64解密
+						this.checked = true
+					}
+				}
+			}
+		},
 		// 切换语言
 		changeLanguage(language) {
 			this.$TOOL.data.set("APP_LANG", language);