Merge pull request '网点费用申请取件方式调整' (#154) from master-dev into master

Reviewed-on: http://git.xdadan.loc/tanex/emis-frontend/pulls/154
This commit is contained in:
wuteng 2025-12-01 19:27:08 +08:00
commit 59f58963c7

View File

@ -224,7 +224,7 @@
</el-row>
</el-col>
<el-col :span="24" v-if="applyType&&(applyTypeArr.includes('13') || (applyTypeArr.includes('44') && form.pickupMethod=='2'))" >
<el-col :span="24" v-if="applyType&&(applyTypeArr.includes('13') || ( applyTypeArr.includes('44') && form.pickupMethod=='2' )|| ( applyTypeArr.includes('31') && form.pickupMethod=='2' )) " >
<el-row :gutter="0" class="md-row">
<el-col :span="3" class="md-title">
<span>取件员调整</span>
@ -241,7 +241,7 @@
</el-row>
</el-col>
<el-col :span="24" v-if="applyType&&(applyTypeArr.includes('34') || (applyTypeArr.includes('44') && form.pickupMethod=='1'))" >
<el-col :span="24" v-if="applyType&&(applyTypeArr.includes('34') || (applyTypeArr.includes('44') && form.pickupMethod=='1') || (applyTypeArr.includes('31') && form.pickupMethod=='1')) " >
<el-row :gutter="0" class="md-row">
<el-col :span="3" class="md-title">
<span>操作员调整</span>
@ -251,7 +251,7 @@
</el-col>
<el-col :span="14">
<el-form-item :label="$t('操作员')" prop="operateEmployeeCode" >
<EmisUserSimplePicker0 :placeholder="$t('操作员')" :siteCode="form.startSiteCode" v-model="form.operateEmployeeCode" postCode="OP" ></EmisUserSimplePicker0>
<EmisUserSimplePicker0 :placeholder="$t('操作员')" :siteCode="form.startSiteCode" v-model="form.operateEmployeeCode" postCode="OP" :disabled="form.pickupMethod!='1'"></EmisUserSimplePicker0>
</el-form-item>
</el-col>