fix: 优化299

pages-approve/seal/addSeal.vue

@@ -209,7 +209,7 @@
 			}
 		},
 		onLoad() {
-			this.getBelongCompanyOptions()
+			this.getBelongCompanyOptions('add')
 		},
 		methods: {
 			// 选择合同 更新表单数据

pages-approve/seal/detail.vue

@@ -5,7 +5,7 @@
 			<view class="section-title require">归属公司
 				<span class="tip">(归属公司：申请用章公司)</span>
 			</view>
-			<view :class="opButton.CheckEdit?'section-select-box':null" :style="{color:belongCompany?'#333':'#999'}" @click="handleOperation('showPurpose')">{{belongCompany?belongCompany:'请选择'}}</view>
+			<view :class="opButton.CheckEdit?'section-select-box':null" :style="{color:belongCompany?'#333':'#999'}" @click="handleOperation('showBelongCompanyPop')">{{belongCompany?belongCompany:'请选择'}}</view>
 		</view><view class="section white-wrap">
 			<view class="section-title require">用印用途</view>
 			<view :class="opButton.CheckEdit?'section-select-box':null" :style="{color:newUse?'#333':'#999'}" @click="handleOperation('showPurpose')">{{newUse?newUse:'请选择'}}</view>
@@ -66,7 +66,7 @@
 			<textarea type="text" auto-height v-model="newRemark" placeholder="请填写备注" :disabled="!opButton.CheckEdit"></textarea>
 		</view>
 		<!-- 签回附件模块 -->
-		<view class="section white-wrap" v-if="checkBackFilesRes.length>0">
+		<view class="section white-wrap" v-if="checkBackFilesRes&&checkBackFilesRes.length>0">
 			<view class="section-title">签回附件</view>
 			<image 
 				v-for="item in checkBackFilesRes"
@@ -111,7 +111,8 @@
 
 		<!-- 归属公司 -->
 		<van-popup :show="showBelongCompanyPop" @close="showBelongCompanyPop=false" position="bottom">
-			<van-picker 
+			<van-picker
+				ref="howBelongCompanyRef" 
 				show-toolbar 
 				title="选择归属公司" 
 				:columns="belongCompanyOptions" 
@@ -122,7 +123,8 @@
 		
 		<!-- 用印用途 -->
 		<van-popup :show="showPurpose" @close="showPurpose=false" position="bottom">
-			<van-picker 
+			<van-picker
+				ref="showPurposeRef"
 				show-toolbar 
 				title="选择用印用途" 
 				:columns="purposeArr" 
@@ -587,8 +589,9 @@
 				// const flag3=this.newSealType.join(',')===this.detail.SealType
 				const flag3=this.isArrEqual(this.newSealType,this.detail.SealType.split(','))
 				const flag4=this.newRemark===this.detail.Remark
+				const flag6=this.belongCompany===this.detail.AffiliatedCompany
 				const flag5= JSON.stringify(this.fileList.map(file => file.url))===JSON.stringify(this.detail.FileUrls)
-				if(flag1&&flag2&&flag3&&flag4&&flag5){
+				if(flag1&&flag2&&flag3&&flag4&&flag5&&flag6){
 					this.handleApprovalPass()
 				}else{
 					this.handleApprovePassModify()
@@ -623,6 +626,13 @@
 					})
 					return
 				}
+				if(!this.belongCompany){
+					uni.showToast({
+						title:'请选择归属公司',
+						icon:"none"
+					})
+					return
+				}
 				if(!this.newUse){
 					uni.showToast({
 						title:'请选择用印用途',
@@ -640,6 +650,7 @@
 				const res=await apiApprovalPassModify({
 					FileNum:Number(this.newFileNum),
 					Remark:this.newRemark,
+					AffiliatedCompany:this.belongCompany,
 					SealId:Number(this.detail.SealId),
 					SealType:this.newSealType.join(','),
 					Use:this.newUse,
@@ -697,6 +708,17 @@
 			// 只有当 checkEdit 为true  即合规才能修改
 			handleOperation(key){
 				if(this.opButton.CheckEdit){
+					if(key==='showBelongCompanyPop'){
+						let index=this.belongCompanyOptions.findIndex(el=>el===this.belongCompany)
+						if(index>-1){
+							this.$refs.howBelongCompanyRef.setColumnIndex(0, index)
+						}
+					}else if(key==='showPurpose'){
+						let index=this.purposeArr.findIndex(el=>el===this.newUse)
+						if(index>-1){
+							this.$refs.showPurposeRef.setColumnIndex(0, index)
+						}
+					}
 					this[key]=true
 				}
 			},
@@ -884,7 +906,7 @@
 	.status-img{
 		position: absolute;
 		right: 0;
-		top: 50rpx;
+		top: 320rpx;
 		width: 220rpx;
 		height: 220rpx;
 		z-index: 10;

pages-approve/seal/mixin.js

@@ -80,10 +80,13 @@ export const sealMixin = {
         };
     },
     methods: {
-        async getBelongCompanyOptions() {
+        async getBelongCompanyOptions(type='') {
             const res = await getBelongCompany()
             if(res.code !==200 ) return
             this.belongCompanyOptions = res.data || []
+			if(type==='add'){
+				this.belongCompany=this.belongCompanyOptions.length?this.belongCompanyOptions[0]:''
+			}
         },
 
         //删除上传的附件