1

api/jiazheng.js

@@ -280,4 +280,15 @@ export function jiazhengCheck(data = {}) {
 		data,
 		timeout: 20000
 	})
+}
+export function jiazhengKaozhengUpdate(data = {}) {
+	return request({
+		url: '/app/user/jiazheng/kaozheng/update',
+		headers: {
+			isToken: true
+		},
+		method: 'post',
+		data,
+		timeout: 20000
+	})
 }

pages/admin/Jiazheng/banzhengXinxi.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="jz-content-box">
-		<view  v-if="status =='add'" class="bzsm-tip-box form-top-margin">
+		<view v-if="status =='add'" class="bzsm-tip-box form-top-margin">
 			<view class="title-btn-box">
 				<view class="phone-line-title">说明</view>
 				<view @click="resetFun" class="reset-btn">重置</view>
@@ -11,8 +11,9 @@
 		<!-- 报证机构（picker 实现下拉选择） -->
 		<view class="form-label-select form-top-margin">
 			<view class="phone-form-label"><text class="form-label-require">*</text>报证机构</view>
-			<picker :disabled="status =='edit'" mode="selector" :range="jigouNames" @change="jigouChange" class="select-picker-box">
-				<view class="form-radio-select" :class="{'form-radio-disabled': status =='edit'}">
+			<picker :disabled="(status =='edit'&&localStatus=='')" mode="selector" :range="jigouNames"
+				@change="jigouChange" class="select-picker-box">
+				<view class="form-radio-select" :class="{'form-radio-disabled': (status =='edit'&&localStatus=='')}">
 					<view>{{ formData.baozhengJigouName || '请选择报证机构' }}</view>
 					<icon></icon>
 				</view>
@@ -21,7 +22,8 @@
 		<!-- 职业名称（picker 实现下拉选择） -->
 		<view class="form-label-select">
 			<view class="phone-form-label"><text class="form-label-require">*</text>职业名称</view>
-			<picker mode="selector" :range="zhiyeNames" range-key="name" @change="zhiyeChange" class="select-picker-box">
+			<picker mode="selector" :range="zhiyeNames" range-key="name" @change="zhiyeChange"
+				class="select-picker-box">
 				<view class="form-radio-select">
 					<view>{{ formData.zhiyeName || '请选择职业名称' }}</view>
 					<icon></icon>
@@ -91,7 +93,7 @@
 			</radio-group>
 		</view>
 		<view class="page-btn-box">
-
+			<button type="default" v-if="status!='add'" @click="goBack" class="phone-white-btn">返回</button>
 			<button type="default" @click="addSaveForm" class="phone-green-btn">保存</button>
 		</view>
 		<!-- 提交按钮 -->
@@ -132,7 +134,8 @@
 				zhiyelevelsOpt: [],
 				zhiyeNameOpt: [
 
-				]
+				],
+				localStatus: ''
 			};
 		},
 		props: {
@@ -153,11 +156,16 @@
 		},
 		created() {
 			this.getJigou()
+			this.localStatus = this.status
+
 		},
 		methods: {
+			goBack(){
+				this.$emit('goBack');	
+			},
 			editinfo(data) {
 				this.$nextTick(() => {
-					if(!data){
+					if (!data) {
 						return false
 					}
 					console.log('datssssa', data);
@@ -339,6 +347,12 @@
 			kaoshiChange(e) {
 				this.formData.needKaoshi = e.detail.value.toString();
 			},
+			currentMove(data) {
+				console.log('');
+				// currentMove 编辑状态下的新增
+				this.localStatus = data
+				console.log('localStatus', this.localStatus);
+			},
 			// 提交表单
 			addSaveForm() {
 				debugger
@@ -355,14 +369,15 @@
 					zyId: this.formData.zhiyeId,
 					zyLevel: this.formData.zhiyeLevelId,
 					jgType: this.formData.baozhengJigouType,
-					jgName:this.formData.baozhengJigouName,
-					zyName:this.formData.zhiyeName,
-					zyLevelName:this.formData.zhiyeLevelName				
+					jgName: this.formData.baozhengJigouName,
+					zyName: this.formData.zhiyeName,
+					zyLevelName: this.formData.zhiyeLevelName
 				}
 				console.log('req', req);
 
-				if (this.formData.baozhengJigouType == 1 && (this.formData.shicaochengji == '' || this.formData.zongkeshi ==
-					'' || this.formData.canxunshijian == '')) {
+				if (this.formData.baozhengJigouType == 1 && (this.formData.shicaochengji == '' || this.formData
+						.zongkeshi ==
+						'' || this.formData.canxunshijian == '')) {
 					uni.showToast({
 						title: '请填写参训时间,实操成绩,总课时',
 						icon: 'none'
@@ -372,21 +387,25 @@
 				if (req.jgId && req.zyId && req.zyLevel) {
 					if (this.status == 'add') {
 						this.$emit('addSave', req);
+					} else if (this.localStatus == 'editAdd') {
+						this.$emit('editSave', req, 'editAdd');
 					} else {
-						this.$emit('editSave', req);
+						this.$emit('editSave', req, 'edit');
 					}
 
 				} else if (req.jgId == '' && req.zyId == '' && req.zyLevel == '') {
 					if (this.status == 'add') {
 						this.$emit('addSave', '');
-					} else {
-						this.$emit('editSave', '');
+					} else if(this.localStatus == 'editAdd') {
+						//this.$emit('editSave', '');
 						// uni.showToast({
 						// 	title: '请选择保证机构,职业名称,职业等级',
 						// 	icon: 'none'
 						// });
 
 						// return false
+					}else{
+						
 					}
 				} else {
 					uni.showToast({

pages/admin/Jiazheng/jiazhengUserManager.vue

@@ -13,7 +13,7 @@
 		</qiuzhiXinxi>
 		<zhaopianZiliao ref="zhaopianZiliao" :status='status' @editSave="editSaveZhaopianziliao"
 			@goNext="goNextZhaopianZiliao" v-show="current ==2"></zhaopianZiliao>
-		<banzhengXinxi ref="banzhengXinxi" :status='status' @addSave="addSave" @editSave="editSave"
+		<banzhengXinxi ref="banzhengXinxi" :status='status' @goBack="goBack" @addSave="addSave" @editSave="editSave"
 			v-show="current ==3">
 		</banzhengXinxi>
 		<banzhengXinxiList :list="editInfo.kaozhengList" v-show="banzhengXinxiFlag" @editBanzheng="editBanzheng"
@@ -38,7 +38,8 @@
 		jiazhengAdd,
 		jiazhengUpdate,
 		jiazhengKaozhengAdd,
-		jiazhengKaozhengDelete
+		jiazhengKaozhengDelete,
+		jiazhengKaozhengUpdate
 	} from "@/api/jiazheng.js";
 	export default {
 		data() {
@@ -88,8 +89,8 @@
 				editInfo: {},
 				deleteConcent: '你确定要执行这个操作吗？',
 				deleteTitle: '删除',
-				deleteIndex:'',
-				deleteId:'',
+				deleteIndex: '',
+				deleteId: '',
 			}
 		},
 		components: {
@@ -106,17 +107,20 @@
 			this.dataHandle(pageInfo)
 		},
 		methods: {
-
+			goBack() {
+				this.banzhengXinxiFlag = true
+			},
 			editBanzheng(data, index) {
 				this.current = 3
 				this.banzhengXinxiFlag = false
 				this.$refs.banzhengXinxi.editinfo(data, index)
+				this.$refs.banzhengXinxi.currentMove('edit')
 			},
 			addBanzheng(data, index) {
 				this.banzhengXinxiFlag = false
 				this.current = 3
 				this.$refs.banzhengXinxi.resetFun()
-			//	this.$refs.banzhengXinxi.currentMove()
+				this.$refs.banzhengXinxi.currentMove('editAdd')
 			},
 			deleteBanzheng(data, index) {
 				console.log('data', data);
@@ -144,10 +148,9 @@
 							icon: 'none',
 							duration: 2000
 						})
-						this.editInfo.kaozhengList = this.editInfo.kaozhengList.splice(index, 1);
+						this.editInfo.kaozhengList.splice(this.deleteIndex, 1);
 						if (this.editInfo.kaozhengList.length == 0) {
-							this.banzhengXinxiFlag = false
-							this.current = 3
+							this.banzhengXinxiFlag = true
 						}
 					}
 				})
@@ -393,18 +396,13 @@
 				this.zhaopianziliaoDataHandle(data, 'edit')
 			},
 			addSave(data) {
-				if (data != '') {
-					this.allData.kaozhengList.push(data)
-				}
 				if (this.status == 'add') {
-					this.submitJiazheng()
-				} else {
-
-				}
+					this.submitJiazheng(data)
+				} else {}
 
 
 			},
-			submitJiazheng() {
+			submitJiazheng(data) {
 				console.log('this.allData', this.allData);
 				if (this.allData.kaozhengList.length > 0 && this.allData.icon == '') {
 					uni.showToast({
@@ -414,6 +412,9 @@
 					})
 					return false
 				}
+				if (data != '') {
+					this.allData.kaozhengList.push(data)
+				}
 				jiazhengAdd(this.allData).then(res => {
 					if (res.code == 0) {
 						uni.showToast({
@@ -436,19 +437,22 @@
 				})
 
 			},
-			editSave(data) {
+			editSave(data, flag) {
 				debugger
 				console.log('this.allData', this.allData);
 				console.log('this.editInfo', this.editInfo);
-				if (data == '' && this.status == 'edit') {
-					jiazhengUpdate(this.allData).then(res => {
-						uni.showToast({
-							title: "保存成功！",
-							icon: 'none',
-							duration: 2000
-						})
+				if (flag == 'edit') {
+					jiazhengKaozhengUpdate(data).then(res => {
+						if(res.code ==0){
+							uni.showToast({
+								title: "保存成功！",
+								icon: 'none',
+								duration: 2000
+							})
+						}
+					
 					})
-				} else if (data && this.status == 'edit') {
+				} else if (flag == 'editAdd') {
 					data.userId = this.userId
 					if (this.allData.icon == '') {
 						uni.showToast({

utils/request.js

@@ -18,7 +18,6 @@ const request = config => {
 	// 是否需要设置 token
 	// const isToken = (config.headers || {}).isToken === false
 	config.header = config.header || {}
-	console.log('config', config);
 
 	//  if (getToken() && !isToken) {
 	// config.headers['X-AUTH-SIGN'] = Md5.hashStr(JSON.stringify(config.data) +auth.secret);