From 49477980de31f317a167063c599e80add06a166e Mon Sep 17 00:00:00 2001
From: xiaogang <905166056@qq.com>
Date: Tue, 20 Apr 2021 15:03:58 +0800
Subject: [PATCH] =?UTF-8?q?1.=E6=96=B0=E5=A2=9E=E5=AE=8C=E7=BB=93=E5=B7=A5?=
 =?UTF-8?q?=E5=8D=95=E6=9C=89=E5=81=BF=E6=9C=8D=E5=8A=A1=E8=87=AA=E5=AE=9A?=
 =?UTF-8?q?=E4=B9=89=E8=B4=B9=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../property/finishRepair/finishRepair.html   | 84 +++++++++++--------
 .../property/finishRepair/finishRepair.js     | 18 +++-
 2 files changed, 66 insertions(+), 36 deletions(-)

diff --git a/public/components/property/finishRepair/finishRepair.html b/public/components/property/finishRepair/finishRepair.html
index fb9015a32..da1005142 100644
--- a/public/components/property/finishRepair/finishRepair.html
+++ b/public/components/property/finishRepair/finishRepair.html
@@ -44,45 +44,61 @@
                                     </select>
                                 </div>
                             </div>
-                            <div class="form-group row"
-                                 v-if="finishRepairInfo.outLowPrice == finishRepairInfo.outHighPrice && finishRepairInfo.conditions.resId != '' && finishRepairInfo.maintenanceType != '1002'">
-                                <label class="col-sm-2 col-form-label">商品价格</label>
-                                <div class="col-sm-10">
-                                    <input placeholder="必填，请填写商品价格" cols="15" class="form-control" disabled="disabled"
-                                           v-model="finishRepairInfo.price">
+                            <div v-if="finishRepairInfo.conditions.resId != '' && finishRepairInfo.maintenanceType != '1002'">
+                                <div v-if="finishRepairInfo.isCustom">
+                                    <div class="form-group row">
+                                        <label class="col-sm-2 col-form-label">商品名</label>
+                                        <div class="col-sm-10">
+                                            <input placeholder="必填，请填写商品名" cols="15" class="form-control" v-model="finishRepairInfo.customGoodsName">
+                                        </div>
+                                    </div>
+                                    <div class="form-group row">
+                                        <label class="col-sm-2 col-form-label">自定义价格</label>
+                                        <div class="col-sm-10">
+                                            <input placeholder='必填，请填写自定义价格' cols="15" class="form-control" v-model="finishRepairInfo.price"
+                                                @input="singlePriceChanged()">
+                                        </div>
+                                    </div>
                                 </div>
-                            </div>
-                            <div class="form-group row"
-                                 v-if="finishRepairInfo.outLowPrice != finishRepairInfo.outHighPrice && finishRepairInfo.conditions.resId != '' && finishRepairInfo.maintenanceType != '1002'">
-                                <label class="col-sm-2 col-form-label">自定义价格</label>
-                                <div class="col-sm-10">
-                                    <input placeholder='必填，请填写自定义价格' cols="15" class="form-control"
-                                           v-model="finishRepairInfo.price" @input="singlePriceChanged()" >价格范围{{finishRepairInfo.outLowPrice}}-{{finishRepairInfo.outHighPrice}}
+                                <div v-else>
+                                    <div class="form-group row" v-if="finishRepairInfo.outLowPrice == finishRepairInfo.outHighPrice">
+                                        <label class="col-sm-2 col-form-label">商品价格</label>
+                                        <div class="col-sm-10">
+                                            <input placeholder="必填，请填写商品价格" cols="15" class="form-control" disabled="disabled"
+                                                v-model="finishRepairInfo.price">
+                                        </div>
+                                    </div>
+                                    <div class="form-group row" v-if="finishRepairInfo.outLowPrice != finishRepairInfo.outHighPrice">
+                                        <label class="col-sm-2 col-form-label">自定义价格</label>
+                                        <div class="col-sm-10">
+                                            <input placeholder='必填，请填写自定义价格' cols="15" class="form-control" v-model="finishRepairInfo.price"
+                                                @input="singlePriceChanged()">价格范围{{finishRepairInfo.outLowPrice}}-{{finishRepairInfo.outHighPrice}}
+                                        </div>
+                                    </div>
                                 </div>
-                            </div>
-                            <div class="form-group row"
-                                v-if="finishRepairInfo.conditions.resId != '' && finishRepairInfo.maintenanceType != '1002'">
-                                <label class="col-sm-2 col-form-label">商品数量</label>
-                                <div class="col-sm-10">
-                                    <div class="input-group">
-                                        <span class="input-group-btn">
-                                            <button class="btn btn-primary" type="button" v-on:click="_useNumDec()">-</button>
-                                        </span>
-                                        <input type="text" class="form-control" disabled="disabled" v-model="finishRepairInfo.useNumber" >
-                                        <span class="input-group-btn">
-                                            <button class="btn btn-primary" type="button" v-on:click="_useNumInc()">+</button>
-                                        </span>
+                                <div class="form-group row">
+                                    <label class="col-sm-2 col-form-label">商品数量</label>
+                                    <div class="col-sm-10">
+                                        <div class="input-group">
+                                            <span class="input-group-btn">
+                                                <button class="btn btn-primary" type="button" v-on:click="_useNumDec()">-</button>
+                                            </span>
+                                            <input type="text" class="form-control" disabled="disabled" v-model="finishRepairInfo.useNumber" >
+                                            <span class="input-group-btn">
+                                                <button class="btn btn-primary" type="button" v-on:click="_useNumInc()">+</button>
+                                            </span>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="form-group row">
+                                    <label class="col-sm-2 col-form-label">商品总金额</label>
+                                    <div class="col-sm-10">
+                                        <input cols="15" class="form-control" disabled="disabled"
+                                            v-model="finishRepairInfo.totalPrice">
                                     </div>
                                 </div>
                             </div>
-                            <div class="form-group row"
-                                v-if="finishRepairInfo.conditions.resId != '' && finishRepairInfo.maintenanceType != '1002'">
-                                <label class="col-sm-2 col-form-label">商品总金额</label>
-                                <div class="col-sm-10">
-                                    <input cols="15" class="form-control" disabled="disabled"
-                                        v-model="finishRepairInfo.totalPrice">
-                                </div>
-                            </div>
+
                             <div class="form-group row">
                                 <label class="col-sm-2 col-form-label">处理意见</label>
                                 <div class="col-sm-10">
diff --git a/public/components/property/finishRepair/finishRepair.js b/public/components/property/finishRepair/finishRepair.js
index 32ce99f25..8ecf8c151 100644
--- a/public/components/property/finishRepair/finishRepair.js
+++ b/public/components/property/finishRepair/finishRepair.js
@@ -24,7 +24,9 @@
                 selectedGoodsInfo: {},
                 useNumber: 1,
                 totalPrice: 0,
-                resId: ''
+                resId: '',
+                isCustom: false,
+                customGoodsName: ''
             }
         },
         _initMethod: function () {
@@ -184,6 +186,9 @@
                         var _goods = JSON.parse(json);
                         console.log("123")
                         console.log(_goods)
+                        if (vc.component.finishRepairInfo.conditions.goodsType == '1003') {
+                            _goods.data.push({'resName': '自定义', 'resId': 'custom'});
+                        }
                         vc.component.finishRepairInfo.resourceStores = _goods.data;
                     }, function (errInfo, error) {
                         console.log('请求失败处理');
@@ -194,6 +199,13 @@
             _chosePrice: function () {
                 var _that = this;
                 var select = document.getElementById("goodsPrice");
+                // 如果选择自定义商品
+                if(select.value == 'custom'){
+                    vc.component.finishRepairInfo.isCustom = true;
+                    return;
+                }else{
+                    vc.component.finishRepairInfo.isCustom = false;
+                }
                 vc.component.finishRepairInfo.conditions.resId = select.value;
                 vc.component.finishRepairInfo.resId = select.value;
                 // 保存选中的商品信息
@@ -281,7 +293,9 @@
                     selectedGoodsInfo: {},
                     useNumber: 1,
                     totalPrice: 0,
-                    resId: ''
+                    resId: '',
+                    isCustom: false,
+                    customGoodsName: ''
                 };
             }
         }