fix: 离职和供应商按钮处理

pages/hrm/resignation_form.vue

@@ -2,37 +2,41 @@
 <template>
 	<view class="container">
 		<scroll-view scroll-y style="padding-bottom: 180rpx;background-color: #fff;">
-			<uni-forms v-model="form" label-width="150rpx"  ref="customForm" :rules="customRules">
+			<uni-forms v-model="form" label-width="180rpx"  ref="customForm" :rules="customRules">
 				<ticketd :ticket_="form.ticket_"></ticketd>
 				<uni-forms-item label="姓名">
-					<uni-easyinput v-model="form.employee_name" placeholder="请输入姓名" :disabled="true"  v-if="mode!='show'"/>
+					<uni-easyinput v-model="form.employee_name" placeholder="请输入姓名" :disabled="true"/>
-					<span v-else>{{form.employee_name}}</span>
 				</uni-forms-item>
 				<uni-forms-item label="部门">
-					<uni-easyinput v-model="form.belong_dept_name" placeholder="请输入岗位" :disabled="true" v-if="mode!='show'"/>
+					<uni-easyinput v-model="form.belong_dept_name" placeholder="请输入岗位" :disabled="true"/>
-					<span v-else>{{form.belong_dept_name}}</span>
 				</uni-forms-item>
 				<uni-forms-item label="岗位">
-					<uni-easyinput v-model="form.post_name" placeholder="请输入岗位" :disabled="true" v-if="mode!='show'"/>
+					<uni-easyinput v-model="form.post_name" placeholder="请输入岗位" :disabled="true"/>
-					<span v-else>{{form.post_name}}</span>
 				</uni-forms-item>
 				<uni-forms-item label="离职时间" required>
 					<uni-datetime-picker type="date" :clear-icon="false" v-model="form.end_date" v-if="mode!='show'"/>
 					<span v-else>{{form.end_date}}</span>
 				</uni-forms-item>
-				<uni-forms-item label="离职原因" required>
+				<uni-forms-item label="离职原因：" label-width="750" required>
-					<textarea placeholder-style="color:#efefef" v-model="form.reason"  placeholder="离职原因" v-if="mode!='show'" style="width:100%; border: 2upx solid #e5e5e5;padding: 10upx;"/>
-					<span v-else>{{form.reason}}</span>			
 				</uni-forms-item>
-				<uni-forms-item label="办理离职交接日期" required v-if="form.ticket_?.state_?.name=='部门负责人'">
+				<uni-forms-item label-width="100">
+					<textarea placeholder-style="color:#efefef" v-model="form.reason"  placeholder="离职原因" style="width:100%; border: 2upx solid #e5e5e5;padding: 10upx;"/>
+				</uni-forms-item>
+				<uni-forms-item label="办理离职交接日期" required>
 					<uni-datetime-picker type="date" v-model="ticket_data.handle_date" v-if="form.ticket_?.state_?.name=='部门负责人'"/>
 					<span v-else>{{form.handle_date}}</span>
 				</uni-forms-item>
 			</uni-forms>
 		</scroll-view>
 		<view class="footer_fixed">
-			<ticketd_b :workflow_key="'wf_resignation'" :title="form.employee_name + '-离职审批'" :t_id="form.id" :ticket_="form.ticket_"
+			<button v-if="mode=='edit'" size="mini" @click="handleDel" :loading="saveLoading" :disabled="saveLoading" type="warn">
-				@success="submitSuccess" :submit_b_func="submit_b_func" ref="ticketd_b_start"></ticketd_b>
+				删除
+			</button>
+			<button v-if="mode!='show'" size="mini" @click="handleSave" :loading="saveLoading" :disabled="saveLoading" type="primary">
+				提交审批
+			</button>
+			<ticketd_b v-if="form.ticket_ && mode == 'show'" :t_id="form.id" :ticket_="form.ticket_" 
+			:ticket_data="ticket_data" @success="()=>{uni.navigateBack()}" ref="ticketd_b"></ticketd_b>
 		</view>
 	</view>
 </template>
@@ -104,16 +108,20 @@ import {actStateEnum} from "@/utils/enum.js"
 				this.form.employee = res.id;
 				this.mode = "add";
 			},
-			async submit_b_func(id){
+			async handleDel(){
 				let that = this;
-				if (that.mode != 'show') {
+				await that.$api.resignationDelete(that.form.id)
-					if(that.form.id) {
+				uni.navigateBack()
-						await that.$api.resignationUpdate(that.form.id, that.form);
+			},
-					}else{
+			async handleSave(){
-						let res = await that.$api.resignationCreate(that.form);
+				let that = this;
-						that.form.id = res.id;
+				that.$refs.customForm.validate().then(res => {
-					}
+					
-				}
+				}).catch(err => {
+					console.log('err', err);
+				})
+				await that.$api.resignationCreate(that.form)
+				uni.navigateBack()
 			},
 		}
 	}

pages/pum/supplieraudit_form.vue

@@ -5,38 +5,34 @@
 			<uni-forms v-model="form" label-width="150rpx"  ref="customForm" :rules="customRules">
 				<ticketd :ticket_="form.ticket_"></ticketd>
 				<uni-forms-item label="供应商名称" required>
-					<uni-easyinput v-model="form.name" placeholder="请输入供应商名称" v-if="mode!='show'"/>
+					<uni-easyinput v-model="form.name" placeholder="请输入供应商名称" :disabled="mode=='show'"/>
-					<span v-else>{{form.name}}</span>
 				</uni-forms-item>
 				<uni-forms-item label="物料分类" required>
-					<uni-easyinput v-model="form.material_cate" placeholder="请输入物料分类" v-if="mode!='show'"/>
+					<uni-easyinput v-model="form.material_type" placeholder="请输入物料分类" :disabled="mode=='show'"/>
-					<span v-else>{{form.material_cate}}</span>
 				</uni-forms-item>
 				<uni-forms-item label="物料名称" required>
-					<uni-easyinput v-model="form.material_name" placeholder="请输入物料名称" v-if="mode!='show'"/>
+					<uni-easyinput v-model="form.material_name" placeholder="请输入物料名称" :disabled="mode=='show'"/>
-					<span v-else>{{form.material_name}}</span>
 				</uni-forms-item>
-				<uni-forms-item label="调查表">
+				<uni-forms-item label="调查表" required>
-					<xtUpload v-model="form.survery_form" v-model:obj="form.survery_form_" xtype="id" v-if="mode!='show'"></xtUpload>
+					<xtUpload v-model="form.survery_form" v-model:obj="form.survery_form_" xtype="id" :disabled="mode=='show'"></xtUpload>
-					<view v-else>
-						<filePreview v-if="form.survery_form_" :url="form.survery_form_.file" :name="form.survery_form_.name" style="width: 100%;height: 30upx;"></filePreview>
-						<text v-else>无</text>
-					</view>
-					
 				</uni-forms-item>
-				<uni-forms-item label="营业执照">
+				<uni-forms-item label="营业执照" required>
-					<xtUpload v-model="form.business_license" v-model:obj="form.business_license_" xtype="id" v-if="mode!='show'"></xtUpload>
+					<xtUpload v-model="form.business_license" v-model:obj="form.business_license_" xtype="id" :disabled="mode=='show'"></xtUpload>
-					<filePreview v-if="mode=='show'&&form.business_license_" :url="form.business_license_.file" :name="form.business_license_.name" style="width: 100%;height: 30upx;"></filePreview>
 				</uni-forms-item>
-				<uni-forms-item label="质量证书">
+				<uni-forms-item label="质量证书" required>
-					<xtUpload v-model="form.quality_certificate" v-model:obj="form.quality_certificate_" xtype="id" v-if="mode!='show'"></xtUpload>
+					<xtUpload v-model="form.quality_certificate" v-model:obj="form.quality_certificate_" xtype="id" :disabled="mode=='show'"></xtUpload>
-					<filePreview v-if="mode=='show'&&form.quality_certificate_" :url="form.quality_certificate_.file" :name="form.quality_certificate_.name" style="width: 100%;height: 30upx;"></filePreview>
 				</uni-forms-item>
 			</uni-forms>
 		</scroll-view>
 		<view class="footer_fixed">
-			<ticketd_b :workflow_key="'wf_supplieraudit'" :title="'供应商'+form.name + '审批'" :t_id="form.id" :ticket_="form.ticket_"
+			<button v-if="mode=='edit'" size="mini" @click="handleDel" :loading="saveLoading" :disabled="saveLoading" type="warn">
-				@success="submitSuccess" :submit_b_func="submit_b_func" ref="ticketd_b_start"></ticketd_b>
+				删除
+			</button>
+			<button v-if="mode!='show'" size="mini" @click="handleSave" :loading="saveLoading" :disabled="saveLoading" type="primary">
+				提交审批
+			</button>
+			<ticketd_b v-if="form.ticket_ && mode == 'show'" :t_id="form.id" :ticket_="form.ticket_" 
+			:ticket_data="ticket_data" @success="()=>{uni.navigateBack()}" ref="ticketd_b"></ticketd_b>
 		</view>
 	</view>
 </template>
@@ -46,9 +42,8 @@ import ticketd_b from "../wf/ticketd_b.vue"
 import ticketd from "../wf/ticketd.vue"
 import {actStateEnum} from "@/utils/enum.js"
 import xtUpload from "@/components/xtUpload.vue"
-import filePreview from "@/components/filePreview.vue"
 	export default {
-		components: { ticketd_b, ticketd, xtUpload,filePreview },
+		components: { ticketd_b, ticketd, xtUpload },
 		data(){
 			return{
 				saveLoading: false,
@@ -56,16 +51,10 @@ import filePreview from "@/components/filePreview.vue"
 				t_id: null,
 				form:{
 					name:"",
-					material_cate:"",
+					material_type:"",
 					material_name:"",
-					survery_form:"",
-					business_license:"",
-					quality_certificate:"",
 				},
 				userInfo:{},
-				survery_form:{},
-				business_license:{},
-				quality_certificate:{},
 				type:0,
 				header:"",
 				customRules: {
@@ -100,21 +89,143 @@ import filePreview from "@/components/filePreview.vue"
 			}
 		},
 		methods:{
-			async submit_b_func(id){
+			uploadSuccess(type, e){
+				console.log('type', type, e);
+				console.log('form.material_type',this.form.material_type)
+			},
+			progress(e){
+				console.log(e)
+			},
+			async handleSave(id){
 				let that = this;
-				if (that.mode != 'show') {
+				that.$refs.customForm.validate().then(res => {
-					if(that.form.id) {
+					
-						await that.$api.supplierauditUpdate(that.form.id, that.form);
+				}).catch(err => {
+					console.log('err', err);
+				})
+				let res = await that.$api.supplierauditCreate(that.form)
+			},
+		}
+	}
+</script>
+
+<style scoped>
+	.uni-data-checklist .checklist-group .checklist-box{
+		margin: 10px 0!important;
+	}
+	.flex_file_picker>.uni-file-picker__files{
+		flex-direction: row;
+	}
+	.flex_file_picker{
+		width: 90px;
+		flex: none;
+	}
+</style><!-- 供应商 -->
+<template>
+	<view class="container">
+		<scroll-view scroll-y style="padding-bottom: 180rpx;background-color: #fff;">
+			<uni-forms v-model="form" label-width="150rpx"  ref="customForm" :rules="customRules">
+				<ticketd :ticket_="form.ticket_"></ticketd>
+				<uni-forms-item label="供应商名称" required>
+					<uni-easyinput v-model="form.name" placeholder="请输入供应商名称" :disabled="mode=='show'"/>
+				</uni-forms-item>
+				<uni-forms-item label="物料分类" required>
+					<uni-easyinput v-model="form.material_type" placeholder="请输入物料分类" :disabled="mode=='show'"/>
+				</uni-forms-item>
+				<uni-forms-item label="物料名称" required>
+					<uni-easyinput v-model="form.material_name" placeholder="请输入物料名称" :disabled="mode=='show'"/>
+				</uni-forms-item>
+				<uni-forms-item label="调查表" required>
+					<xtUpload v-model="form.survery_form" v-model:obj="form.survery_form_" xtype="id" :disabled="mode=='show'"></xtUpload>
+				</uni-forms-item>
+				<uni-forms-item label="营业执照" required>
+					<xtUpload v-model="form.business_license" v-model:obj="form.business_license_" xtype="id" :disabled="mode=='show'"></xtUpload>
+				</uni-forms-item>
+				<uni-forms-item label="质量证书" required>
+					<xtUpload v-model="form.quality_certificate" v-model:obj="form.quality_certificate_" xtype="id" :disabled="mode=='show'"></xtUpload>
+				</uni-forms-item>
+			</uni-forms>
+		</scroll-view>
+		<view class="footer_fixed">
+			<button v-if="mode=='edit'" size="mini" @click="handleDel" :loading="saveLoading" :disabled="saveLoading" type="warn">
+				删除
+			</button>
+			<ticketd_b v-if="form.ticket_" :t_id="form.id" :ticket_="form.ticket_" 
+			:ticket_data="ticket_data" @success="()=>{uni.navigateBack()}" ref="ticketd_b"></ticketd_b>
+			<button v-else size="mini" @click="handleSave" :loading="saveLoading" :disabled="saveLoading" type="primary">
+				提交审批
+			</button>
+		</view>
+	</view>
+</template>
+
+<script>
+import ticketd_b from "../wf/ticketd_b.vue"
+import ticketd from "../wf/ticketd.vue"
+import {actStateEnum} from "@/utils/enum.js"
+import xtUpload from "@/components/xtUpload.vue"
+	export default {
+		components: { ticketd_b, ticketd, xtUpload },
+		data(){
+			return{
+				saveLoading: false,
+				mode:"add",
+				t_id: null,
+				form:{
+					name:"",
+					material_type:"",
+					material_name:"",
+				},
+				userInfo:{},
+				type:0,
+				header:"",
+				customRules: {
+					filename: {
+						rules: [{
+							required: true,
+							errorMessage: '姓名不能为空'
+						}]
+					},
+					age: {
+						rules: [{
+							required: true,
+							errorMessage: '年龄不能为空'
+						}]
+					},
+				},
+			}
+		},
+		async onLoad(options) {
+			let that = this;
+			that.mode = options.mode?options.mode:'show';
+			that.t_id = options.t_id?options.t_id:null;
+			if(that.mode != "add"){
+				if(that.t_id) {
+					that.form = await that.$api.supplierauditItem(that.t_id);
+					if(that.form.ticket_.state_.type == 1 && that.form.create_by == uni.getStorageSync("userInfo").id ) {
+						that.mode = "edit";
 					}else{
-						let res = await that.$api.supplierauditCreate(that.form);
+						that.mode = "show";
-						that.form.id = res.id;
+					}
 				}
 			}
 		},
-			submitSuccess(){
+		methods:{
-				uni.navigateTo({
+			uploadSuccess(type, e){
-					url: "/pages/index/index"
+				console.log('type', type, e);
+				console.log('form.material_type',this.form.material_type)
+			},
+			progress(e){
+				console.log(e)
+			},
+			async handleSave(id){
+				let that = this;
+				that.$refs.customForm.validate().then(res => {
+					
+				}).catch(err => {
+					console.log('err', err);
 				})
+				let res = await that.$api.supplierauditCreate(that.form)
 			},
 		}
 	}