From 6ff6e18c560d0da6b1e87a263b1a52c67a4cf67a Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: Sun, 25 Dec 2022 06:08:13 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96oa=E6=B5=81=E7=A8=8B=E7=B1=BB?=
 =?UTF-8?q?bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../addResourceStore/addResourceStore.html    | 22 +++++--------------
 .../editResourceStore/editResourceStore.html  | 18 +++++++--------
 .../myItemOutAuditOrders.html                 |  2 +-
 .../myItemOutAuditOrders.js                   |  4 ++--
 .../property/newOaWorkflow/newOaWorkflow.js   |  7 +++---
 5 files changed, 20 insertions(+), 33 deletions(-)

diff --git a/public/components/common/addResourceStore/addResourceStore.html b/public/components/common/addResourceStore/addResourceStore.html
index 07fe6da0f..546922d4c 100755
--- a/public/components/common/addResourceStore/addResourceStore.html
+++ b/public/components/common/addResourceStore/addResourceStore.html
@@ -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">
diff --git a/public/components/common/editResourceStore/editResourceStore.html b/public/components/common/editResourceStore/editResourceStore.html
index 9c28b2bd2..ad2afcb67 100755
--- a/public/components/common/editResourceStore/editResourceStore.html
+++ b/public/components/common/editResourceStore/editResourceStore.html
@@ -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">
diff --git a/public/pages/admin/myItemOutAuditOrders/myItemOutAuditOrders.html b/public/pages/admin/myItemOutAuditOrders/myItemOutAuditOrders.html
index e3496f0d8..cd0e13b67 100755
--- a/public/pages/admin/myItemOutAuditOrders/myItemOutAuditOrders.html
+++ b/public/pages/admin/myItemOutAuditOrders/myItemOutAuditOrders.html
@@ -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>
diff --git a/public/pages/admin/myItemOutAuditOrders/myItemOutAuditOrders.js b/public/pages/admin/myItemOutAuditOrders/myItemOutAuditOrders.js
index 1b2fdfa97..0003ab532 100755
--- a/public/pages/admin/myItemOutAuditOrders/myItemOutAuditOrders.js
+++ b/public/pages/admin/myItemOutAuditOrders/myItemOutAuditOrders.js
@@ -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;
                         }
diff --git a/public/pages/property/newOaWorkflow/newOaWorkflow.js b/public/pages/property/newOaWorkflow/newOaWorkflow.js
index 9104cf02a..13d7e8539 100644
--- a/public/pages/property/newOaWorkflow/newOaWorkflow.js
+++ b/public/pages/property/newOaWorkflow/newOaWorkflow.js
@@ -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');