admingit/MicroCommunityWeb
1
0
Fork 0
mirror of https://gitee.com/java110/MicroCommunityWeb.git synced 2026-06-11 14:17:24 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

优化oa流程类bug

Browse Source
This commit is contained in:
wuxw 2022-12-25 06:08:13 +08:00
parent 9ec7b0a84c
commit 6ff6e18c56
5 changed files with 20 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
public/components/common/addResourceStore/addResourceStore.html
View File

@ -178,38 +178,26 @@
class="form-control" @change="decideAdd()">
</div>
</div>
<!-- <div class="form-group row">
<label class="col-sm-2 col-form-label"><span><vc:i18n name="是否在维修材料中显示" namespace="addResourceStore"></vc:i18n></span></label>
<div class="col-sm-10">
<select class="custom-select" v-model="addResourceStoreInfo.showMobile">
<option selected disabled value="">{{vc.i18n('必填','addResourceStore')}}，请选择是否在维修材料中显示</option>
<option value="Y">{{vc.i18n('是','addResourceStore')}}</option>
<option value="N">{{vc.i18n('否','addResourceStore')}}</option>
</select>
</div>
</div> -->
<div class="form-group row">
<label class="col-sm-2 col-form-label">
<label class="col-sm-2 col-form-label text-right">
<span><vc:i18n name="备注" namespace="addResourceStore"></vc:i18n></span>
</label>
<div class="col-sm-10">
<div class="col-sm-4">
<textarea :placeholder="vc.i18n('选填，请填写备注','addResourceStore')" class="form-control"
v-model="addResourceStoreInfo.remark">
</textarea>
</div>
</div>
<div class="form-group row">
<label class="col-sm-2 col-form-label">
<label class="col-sm-2 col-form-label text-right">
<span><vc:i18n name="描述" namespace="addResourceStore"></vc:i18n></span>
</label>
<div class="col-sm-10">
<div class="col-sm-4">
<textarea :placeholder="vc.i18n('选填，请填写描述','addResourceStore')" class="form-control"
v-model="addResourceStoreInfo.description">
</textarea>
</div>
</div>
<div class="form-group row">
<label class="col-sm-2 col-form-label">
<label class="col-sm-2 col-form-label text-right">
<span><vc:i18n name="上传图片" namespace="addResourceStore"></vc:i18n></span>
</label>
<div class="col-sm-10">

18
public/components/common/editResourceStore/editResourceStore.html
View File

@ -111,7 +111,7 @@
<div class="col-sm-4">
<select class="custom-select" v-model="editResourceStoreInfo.miniUnitCode" :disabled="editResourceStoreInfo.shType == '2807'">
<option selected disabled value="">
{{vc.i18n('必填','editResourceStore')}}，请选择物品最小计量单位
{{vc.i18n('必填，请选择物品最小计量单位','editResourceStore')}}
</option>
<option v-for="(item,index) in editResourceStoreInfo.unitCodes" :key="index"
v-bind:value="item.statusCd">
@ -135,33 +135,31 @@
</div>
</div>
<div class="form-group row">
<label class="col-sm-2 col-form-label">
<span><vc:i18n name="最高收费标准" namespace="editResourceStore"></vc:i18n></span>(最小计量单位)
<label class="col-sm-2 col-form-label text-right">
<span><vc:i18n name="最高收费标准(最小计量单位)" namespace="editResourceStore"></vc:i18n></span>
</label>
<div class="col-sm-10">
<input v-model="editResourceStoreInfo.outHighPrice" type="text" id="highPrice" :placeholder="vc.i18n('必填，请填写物品最小计量单位，最高收费标准','editResourceStore')" class="form-control" @change="decide()">
</div>
</div>
<div class="form-group row">
<label class="col-sm-2 col-form-label">
<label class="col-sm-2 col-form-label text-right">
<span><vc:i18n name="备注" namespace="editResourceStore"></vc:i18n></span>
</label>
<div class="col-sm-10">
<div class="col-sm-4">
<textarea :placeholder="vc.i18n('选填，请填写备注','editResourceStore')" class="form-control" v-model="editResourceStoreInfo.remark">
</textarea>
</div>
</div>
<div class="form-group row">
<label class="col-sm-2 col-form-label">
<label class="col-sm-2 col-form-label text-right">
<span><vc:i18n name="描述" namespace="editResourceStore"></vc:i18n></span>
</label>
<div class="col-sm-10">
<div class="col-sm-4">
<textarea :placeholder="vc.i18n('选填，请填写描述','editResourceStore')" class="form-control" v-model="editResourceStoreInfo.description">
</textarea>
</div>
</div>
<div class="form-group row">
<label class="col-sm-2 col-form-label">
<label class="col-sm-2 col-form-label text-right">
<span><vc:i18n name="图片" namespace="editResourceStore"></vc:i18n></span>
</label>
<div class="content-img col-sm-10">

2
public/pages/admin/myItemOutAuditOrders/myItemOutAuditOrders.html
View File

@ -34,7 +34,7 @@
<div style="display: inline-block;" v-if="auditOrdersInfo.procure == false">
<div class="btn-group" v-if="auditOrder.state == 1000 || auditOrder.state == 1001">
<button class="btn-white btn btn-xs" v-on:click="_openAuditOrderModel(auditOrder)"><span><vc:i18n name="审批" namespace="myItemOutAuditOrders"></vc:i18n></span>
</button>
</button>
</div>
<div class="btn-group" v-else>
<button class="btn-white btn btn-xs" v-on:click="_finishAuditOrder(auditOrder)"><span><vc:i18n name="结束" namespace="myItemOutAuditOrders"></vc:i18n></span>

4
public/pages/admin/myItemOutAuditOrders/myItemOutAuditOrders.js
View File

@ -145,10 +145,10 @@
}
};
//发送get请求
vc.http.apiGet('workflow.listWorkflowStepStaffs',
vc.http.apiGet('/workflow.listWorkflowStepStaffs',
param,
function(json, res) {
var _json = JSON.parse(json);
let _json = JSON.parse(json);
if (_json.data.length > 0) {
$that.auditOrdersInfo.procure = true;
}

7
public/pages/property/newOaWorkflow/newOaWorkflow.js
View File

@ -11,10 +11,11 @@
}
},
_initMethod: function () {
$that.newOaWorkflowInfo.switchValue = vc.getParam('switchValue');
//$that.newOaWorkflowInfo.switchValue = vc.getParam('switchValue');
let _switchValue = vc.getParam('switchValue');
if ($that.newOaWorkflowInfo.switchValue) {
$that.swatch($that.newOaWorkflowInfo.switchValue);
if (_switchValue) {
$that.swatch(_switchValue);
return;
}
$that.swatch('newOaWorkflowPool');