From e75cd61218cfecbe66f4bd64e9ea1b37c6492449 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: Mon, 28 Nov 2022 15:23:41 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=87=87=E8=B4=AD=E7=9B=B8?=
 =?UTF-8?q?=E5=85=B3=20=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../chooseResourceStore4.html                 |  4 ++--
 .../viewResourceStoreInfo2.html               | 12 ++--------
 .../viewResourceStoreInfo4.html               | 22 ++++++++-----------
 .../property/addStorehouse/addStorehouse.html |  6 ++---
 .../property/addStorehouse/addStorehouse.js   |  2 +-
 .../common/itemOutManage/itemOutManage.html   |  2 +-
 .../purchaseApplyDetail.html                  |  4 ++--
 .../resourceStoreManage.html                  | 12 ++++------
 .../urgentPurchaseApplyStep.js                | 11 +++++-----
 .../storehouseManage/storehouseManage.html    |  2 +-
 10 files changed, 31 insertions(+), 46 deletions(-)

diff --git a/public/components/common/chooseResourceStore4/chooseResourceStore4.html b/public/components/common/chooseResourceStore4/chooseResourceStore4.html
index 4dc10fa77..d81d22b53 100644
--- a/public/components/common/chooseResourceStore4/chooseResourceStore4.html
+++ b/public/components/common/chooseResourceStore4/chooseResourceStore4.html
@@ -3,7 +3,7 @@
     <div class="modal-dialog modal-lg">
         <div class="modal-content">
             <div class="modal-header">
-                <h3 class="modal-title" id="chooseResourceStoreModelLabel2"><span><vc:i18n name="选择物品管理" namespace="chooseResourceStore4"></vc:i18n></span></h3>
+                <h3 class="modal-title" id="chooseResourceStoreModelLabel2"><span><vc:i18n name="选择物品" namespace="chooseResourceStore4"></vc:i18n></span></h3>
                 <button type="button" class="close" data-dismiss="modal" aria-label="Close">
                     <span aria-hidden="true">&times;</span>
                 </button>
@@ -75,7 +75,7 @@
                                         <th class="text-center"><span><vc:i18n name="物品名称" namespace="chooseResourceStore4"></vc:i18n></span></th>
                                         <th class="text-center"><span><vc:i18n name="物品规格" namespace="chooseResourceStore4"></vc:i18n></span></th>
                                         <th class="text-center"><span><vc:i18n name="物品编码" namespace="chooseResourceStore4"></vc:i18n></span></th>
-                                        <th class="text-center"><span><vc:i18n name="是否是固定物品" namespace="chooseResourceStore4"></vc:i18n></span></th>
+                                        <th class="text-center"><span><vc:i18n name="固定物品" namespace="chooseResourceStore4"></vc:i18n></span></th>
                                         <th class="text-center"><span><vc:i18n name="物品价格" namespace="chooseResourceStore4"></vc:i18n></span></th>
                                         <th class="text-center"><span><vc:i18n name="物品库存" namespace="chooseResourceStore4"></vc:i18n></span></th>
                                     </tr>
diff --git a/public/components/common/viewResourceStoreInfo2/viewResourceStoreInfo2.html b/public/components/common/viewResourceStoreInfo2/viewResourceStoreInfo2.html
index 6eaafd52b..21fc24427 100755
--- a/public/components/common/viewResourceStoreInfo2/viewResourceStoreInfo2.html
+++ b/public/components/common/viewResourceStoreInfo2/viewResourceStoreInfo2.html
@@ -21,17 +21,11 @@
                             <span><vc:i18n name="物品类型" namespace="viewResourceStoreInfo2"></vc:i18n></span>
                         </th>
                         <th class="text-center">
-                            <span><vc:i18n name="物品名称" namespace="viewResourceStoreInfo2"></vc:i18n></span>
+                            <span><vc:i18n name="物品名称(编码)" namespace="viewResourceStoreInfo2"></vc:i18n></span>
                         </th>
                         <th class="text-center">
                             <span><vc:i18n name="物品规格" namespace="viewResourceStoreInfo2"></vc:i18n></span>
                         </th>
-                        <th class="text-center">
-                            <span><vc:i18n name="物品编码" namespace="viewResourceStoreInfo2"></vc:i18n></span>
-                        </th>
-                        <th class="text-center">
-                            <span><vc:i18n name="是否是固定物品" namespace="viewResourceStoreInfo2"></vc:i18n></span>
-                        </th>
                         <th class="text-center">
                             <span><vc:i18n name="参考价格" namespace="viewResourceStoreInfo2"></vc:i18n></span>
                         </th>
@@ -58,12 +52,10 @@
                             {{resourceStore.parentRstName ? resourceStore.parentRstName : '-'}} >
                             {{resourceStore.rstName ? resourceStore.rstName : '-'}}
                         </td>
-                        <td class="text-center" style="vertical-align: inherit;">{{resourceStore.resName}}</td>
+                        <td class="text-center" style="vertical-align: inherit;">{{resourceStore.resName}}({{resourceStore.resCode}})</td>
                         <td class="text-center" style="vertical-align: inherit;">{{resourceStore.rssName ?
                             resourceStore.rssName : '-'}}
                         </td>
-                        <td class="text-center" style="vertical-align: inherit;">{{resourceStore.resCode}}</td>
-                        <td class="text-center" style="vertical-align: inherit;">{{resourceStore.isFixedName}}</td>
                         <td class="text-center" style="vertical-align: inherit;">{{resourceStore.price}}</td>
                         <td class="text-center" style="vertical-align: inherit;">
                             {{resourceStore.stock}}{{resourceStore.unitCodeName}}
diff --git a/public/components/common/viewResourceStoreInfo4/viewResourceStoreInfo4.html b/public/components/common/viewResourceStoreInfo4/viewResourceStoreInfo4.html
index 993f5783a..3ccd99e25 100644
--- a/public/components/common/viewResourceStoreInfo4/viewResourceStoreInfo4.html
+++ b/public/components/common/viewResourceStoreInfo4/viewResourceStoreInfo4.html
@@ -15,10 +15,8 @@
                     <thead>
                     <tr>
                         <th class="text-center"><span><vc:i18n name="物品类型" namespace="viewResourceStoreInfo4"></vc:i18n></span></th>
-                        <th class="text-center"><span><vc:i18n name="物品名称" namespace="viewResourceStoreInfo4"></vc:i18n></span></th>
+                        <th class="text-center"><span><vc:i18n name="名称(编码)" namespace="viewResourceStoreInfo4"></vc:i18n></span></th>
                         <th class="text-center"><span><vc:i18n name="物品规格" namespace="viewResourceStoreInfo4"></vc:i18n></span></th>
-                        <th class="text-center"><span><vc:i18n name="物品编码" namespace="viewResourceStoreInfo4"></vc:i18n></span></th>
-                        <th class="text-center"><span><vc:i18n name="是否是固定物品" namespace="viewResourceStoreInfo4"></vc:i18n></span></th>
                         <th class="text-center"><span><vc:i18n name="参考价格" namespace="viewResourceStoreInfo4"></vc:i18n></span></th>
                         <th class="text-center"><span><vc:i18n name="物品库存" namespace="viewResourceStoreInfo4"></vc:i18n></span></th>
                         <th class="text-center"><span><vc:i18n name="申请数量" namespace="viewResourceStoreInfo4"></vc:i18n></span></th>
@@ -34,35 +32,33 @@
                             {{resourceStore.parentRstName ? resourceStore.parentRstName : '-'}} >
                             {{resourceStore.rstName ? resourceStore.rstName : '-'}}
                         </td>
-                        <td class="text-center" style="vertical-align: inherit;">{{resourceStore.resName}}</td>
+                        <td class="text-center" style="vertical-align: inherit;">{{resourceStore.resName}}({{resourceStore.resCode}})</td>
                         <td class="text-center" style="vertical-align: inherit;">{{resourceStore.rssName ?
                             resourceStore.rssName : '-'}}
                         </td>
-                        <td class="text-center" style="vertical-align: inherit;">{{resourceStore.resCode}}</td>
-                        <td class="text-center" style="vertical-align: inherit;">{{resourceStore.isFixedName}}</td>
                         <td class="text-center" style="vertical-align: inherit;">{{resourceStore.price}}</td>
                         <td class="text-center" style="vertical-align: inherit;">
                             {{resourceStore.stock}}{{resourceStore.unitCodeName}}
                         </td>
-                        <td class="text-center" style="vertical-align: inherit;">
+                        <td class="text-center" style="vertical-align: inherit;width: 150px;">
                             <input v-model="resourceStore.quantity" type="number" :placeholder="vc.i18n('必填，请填写申请数量','viewResourceStoreInfo4')"
                                    class="form-control" style="width: 80%;display:inline; margin: auto">&nbsp;&nbsp;{{resourceStore.unitCodeName}}
                         </td>
-                        <td class="text-center" style="vertical-align: inherit;">
+                        <td class="text-center" style="vertical-align: inherit;width: 150px;">
                             <input v-model="resourceStore.urgentPrice" type="number" :placeholder="vc.i18n('必填，请填写采购单价','viewResourceStoreInfo4')"
                                    class="form-control" style="width: 100%;display:inline; margin: auto">
                         </td>
-                        <td class="text-center" style="vertical-align: inherit;">
+                        <td class="text-center" style="vertical-align: inherit;width: 150px;">
+                            <!--  v-if="item.shId != resourceStore.shId"  搞不明白不能当前仓库 紧急采购 -->
                             <select class="custom-select" v-model="resourceStore.shzId" style="width: 100%" @change="storeHousesChange($event,i)">
-                                <option value="">{{vc.i18n('必填','viewResourceStoreInfo4')}}，请选择目标仓库</option>
+                                <option value="">{{vc.i18n('必填，请选择目标仓库','viewResourceStoreInfo4')}}</option>
                                 <option v-for="(item,index) in viewResourceStoreInfo4.storehouses"
-                                        :key="index" v-bind:value="item.shId"
-                                        v-if="item.shId != resourceStore.shId">
+                                        :key="index" v-bind:value="item.shId">
                                     {{item.shName}}
                                 </option>
                             </select>
                         </td>
-                        <td class="text-center" style="vertical-align: inherit;">
+                        <td class="text-center" style="vertical-align: inherit;width: 150px;">
                             <input v-model="resourceStore.remark" type="text" class="form-control"
                                    :placeholder="vc.i18n('选填，请填写备注','viewResourceStoreInfo4')">
                         </td>
diff --git a/public/components/property/addStorehouse/addStorehouse.html b/public/components/property/addStorehouse/addStorehouse.html
index c8938d8d6..260dee8de 100644
--- a/public/components/property/addStorehouse/addStorehouse.html
+++ b/public/components/property/addStorehouse/addStorehouse.html
@@ -25,7 +25,7 @@
                                 <div class="col-sm-10">
                                     <select class="custom-select" v-model="addStorehouseInfo.shType">
                                         <option selected disabled value="">
-                                            {{vc.i18n('必填','addStorehouse')}}，请选择仓库类型
+                                            {{vc.i18n('必填，请选择仓库类型','addStorehouse')}}
                                         </option>
                                         <option v-for="(item,index) in addStorehouseInfo.shTypes" :key="index"
                                                 :value="item.statusCd">{{item.name}}
@@ -35,12 +35,12 @@
                             </div>
                             <div class="form-group row">
                                 <label class="col-sm-2 col-form-label">
-                                    <span><vc:i18n name="是否对外开放" namespace="addStorehouse"></vc:i18n></span>
+                                    <span><vc:i18n name="对外开放" namespace="addStorehouse"></vc:i18n></span>
                                 </label>
                                 <div class="col-sm-10">
                                     <select class="custom-select" v-model="addStorehouseInfo.isShow">
                                         <option selected disabled value="">
-                                            {{vc.i18n('必填','addStorehouse')}}，请选择是否对外开放
+                                            {{vc.i18n('必填，请选择是否对外开放','addStorehouse')}}
                                         </option>
                                         <option value="true">{{vc.i18n('是','addStorehouse')}}</option>
                                         <option value="false">{{vc.i18n('否','addStorehouse')}}</option>
diff --git a/public/components/property/addStorehouse/addStorehouse.js b/public/components/property/addStorehouse/addStorehouse.js
index 927185d2b..d2411b6f4 100644
--- a/public/components/property/addStorehouse/addStorehouse.js
+++ b/public/components/property/addStorehouse/addStorehouse.js
@@ -10,7 +10,7 @@
                 shName: '',
                 shType: '',
                 shDesc: '',
-                isShow: '',
+                isShow: 'true',
                 shTypes: []
             }
         },
diff --git a/public/pages/common/itemOutManage/itemOutManage.html b/public/pages/common/itemOutManage/itemOutManage.html
index e94dbc1a0..fafa9672e 100755
--- a/public/pages/common/itemOutManage/itemOutManage.html
+++ b/public/pages/common/itemOutManage/itemOutManage.html
@@ -60,7 +60,7 @@
                             <i class="fa fa-plus"></i>
                             <span><vc:i18n name="领用申请" namespace="itemOutManage"></vc:i18n></span>
                         </button>
-                        <button type="button" class="btn btn-primary btn-sm" v-on:click="_exportExcel()">
+                        <button type="button" class="btn btn-white btn-sm" v-on:click="_exportExcel()">
                             <i class="fa fa-plus"></i>
                             <span><vc:i18n name="导出" namespace="itemOutManage"></vc:i18n></span>
                         </button>
diff --git a/public/pages/common/purchaseApplyDetail/purchaseApplyDetail.html b/public/pages/common/purchaseApplyDetail/purchaseApplyDetail.html
index 872ffdc5a..6cb130833 100755
--- a/public/pages/common/purchaseApplyDetail/purchaseApplyDetail.html
+++ b/public/pages/common/purchaseApplyDetail/purchaseApplyDetail.html
@@ -107,11 +107,11 @@
                             <tr>
                                 <th class="text-center"><span><vc:i18n name="物品类型" namespace="purchaseApplyDetail"></vc:i18n></span></th>
                                 <th class="text-center"><span><vc:i18n name="物品名称" namespace="purchaseApplyDetail"></vc:i18n></span></th>
-                                <th class="text-center"><span><vc:i18n name="物品所属仓库" namespace="purchaseApplyDetail"></vc:i18n></span></th>
+                                <th class="text-center"><span><vc:i18n name="所属仓库" namespace="purchaseApplyDetail"></vc:i18n></span></th>
                                 <th class="text-center"><span><vc:i18n name="物品规格" namespace="purchaseApplyDetail"></vc:i18n></span></th>
                                 <th class="text-center"><span><vc:i18n name="供应商" namespace="purchaseApplyDetail"></vc:i18n></span></th>
                                 <th class="text-center"><span><vc:i18n name="物品编码" namespace="purchaseApplyDetail"></vc:i18n></span></th>
-                                <th class="text-center"><span><vc:i18n name="是否是固定物品" namespace="purchaseApplyDetail"></vc:i18n></span></th>
+                                <th class="text-center"><span><vc:i18n name="固定物品" namespace="purchaseApplyDetail"></vc:i18n></span></th>
                                 <th class="text-center"><span><vc:i18n name="参考单价" namespace="purchaseApplyDetail"></vc:i18n></span></th>
                                 <th class="text-center"><span><vc:i18n name="原有库存" namespace="purchaseApplyDetail"></vc:i18n></span></th>
                                 <th class="text-center"><span><vc:i18n name="现有库存" namespace="purchaseApplyDetail"></vc:i18n></span></th>
diff --git a/public/pages/common/resourceStoreManage/resourceStoreManage.html b/public/pages/common/resourceStoreManage/resourceStoreManage.html
index cd810faad..b6920faa6 100755
--- a/public/pages/common/resourceStoreManage/resourceStoreManage.html
+++ b/public/pages/common/resourceStoreManage/resourceStoreManage.html
@@ -146,19 +146,16 @@
                                 <span><vc:i18n name="物品类型" namespace="resourceStoreManage"></vc:i18n></span>
                             </th>
                             <th class="text-center">
-                                <span><vc:i18n name="物品名称" namespace="resourceStoreManage"></vc:i18n></span>
+                                <span><vc:i18n name="物品名称(编号)" namespace="resourceStoreManage"></vc:i18n></span>
                             </th>
                             <th class="text-center">
                                 <span><vc:i18n name="物品规格" namespace="resourceStoreManage"></vc:i18n></span>
                             </th>
                             <th class="text-center">
-                                <span><vc:i18n name="物品编码" namespace="resourceStoreManage"></vc:i18n></span>
+                                <span><vc:i18n name="固定物品" namespace="resourceStoreManage"></vc:i18n></span>
                             </th>
                             <th class="text-center">
-                                <span><vc:i18n name="是否固定物品" namespace="resourceStoreManage"></vc:i18n></span>
-                            </th>
-                            <th class="text-center">
-                                <span><vc:i18n name="采购参考价格" namespace="resourceStoreManage"></vc:i18n></span>
+                                <span><vc:i18n name="参考价格" namespace="resourceStoreManage"></vc:i18n></span>
                             </th>
                             <th class="text-center">
                                 <span><vc:i18n name="收费标准" namespace="resourceStoreManage"></vc:i18n></span>
@@ -192,9 +189,8 @@
                                 {{resourceStore.parentRstName}}{{resourceStore.rstName ? ' > ' + resourceStore.rstName :
                                 ''}}
                             </td>
-                            <td class="text-center">{{resourceStore.resName}}</td>
+                            <td class="text-center">{{resourceStore.resName}}({{resourceStore.resCode}})</td>
                             <td class="text-center">{{resourceStore.rssName ? resourceStore.rssName : '-'}}</td>
-                            <td class="text-center">{{resourceStore.resCode}}</td>
                             <td class="text-center">{{resourceStore.isFixedName}}</td>
                             <td class="text-center">{{'￥' + resourceStore.price}}</td>
                             <td class="text-center">{{resourceStore.outHighPrice == resourceStore.outLowPrice ? '￥' +
diff --git a/public/pages/common/urgentPurchaseApplyStep/urgentPurchaseApplyStep.js b/public/pages/common/urgentPurchaseApplyStep/urgentPurchaseApplyStep.js
index 34e1172f3..8e3638826 100644
--- a/public/pages/common/urgentPurchaseApplyStep/urgentPurchaseApplyStep.js
+++ b/public/pages/common/urgentPurchaseApplyStep/urgentPurchaseApplyStep.js
@@ -111,11 +111,12 @@
                         let _json = JSON.parse(json);
                         if (_json.code == 0) {
                             //关闭model
-                            if (vc.component.addPurchaseApplyStepInfo.purchaseApply.resOrderType == "10000") {
-                                vc.jumpToPage("/#/pages/common/purchaseApplyManage");
-                            } else {
-                                vc.jumpToPage("/#/pages/common/itemOutManage");
-                            }
+                            // if (vc.component.addPurchaseApplyStepInfo.purchaseApply.resOrderType == "10000") {
+                            //     vc.jumpToPage("/#/pages/common/purchaseApplyManage");
+                            // } else {
+                            //     vc.jumpToPage("/#/pages/common/itemOutManage");
+                            // }
+                            vc.goBack();
                             return;
                         }
                         vc.toast(_json.msg);
diff --git a/public/pages/property/storehouseManage/storehouseManage.html b/public/pages/property/storehouseManage/storehouseManage.html
index 5690545e8..f18ae1a42 100644
--- a/public/pages/property/storehouseManage/storehouseManage.html
+++ b/public/pages/property/storehouseManage/storehouseManage.html
@@ -95,7 +95,7 @@
                                 <span><vc:i18n name="描述" namespace="storehouseManage"></vc:i18n></span>
                             </th>
                             <th class="text-center">
-                                <span><vc:i18n name="是否对外开放" namespace="storehouseManage"></vc:i18n></span>
+                                <span><vc:i18n name="对外开放" namespace="storehouseManage"></vc:i18n></span>
                             </th>
                             <th class="text-center">
                                 <span><vc:i18n name="创建时间" namespace="storehouseManage"></vc:i18n></span>