fix:押金详情

src/views/deposit_home/components/deposit-apply-surrender.vue

@@ -80,6 +80,14 @@
             </div>
           </el-col>
           <el-col :xs="24" :sm="24" :lg="24" class="item">
+              <div class="label">格力内部资料备注</div>
+              <div class="value">{{ details.geLiInnerDataNote }}</div>
+            </el-col>
+            <el-col :xs="24" :sm="24" :lg="24" class="item">
+              <div class="label">订单格力内部备注</div>
+              <div class="value">{{ details.orderGeLiInnerNote }}</div>
+            </el-col>
+          <el-col :xs="24" :sm="24" :lg="24" class="item">
             <div class="label">使用单位</div>
             <div class="value">{{ details.refUseUnit }}</div>
           </el-col>
@@ -693,6 +701,8 @@ export default {
           item.sums2 = ['price', 'refundDepositAmount', 'depositAmount']
         })
         res.data.items = arr
+        res.data.realUseUnit =res.data.realUseUnit || res.data.refUseUnit
+          res.data.realInstallAddress =   res.data.realInstallAddress ||res.data.refInstallAddress
         this.details = res.data
       })
     },

src/views/deposit_home/components/deposit_list-detail.vue

@@ -82,6 +82,14 @@
                 <el-input v-model="details.geLiInerNote" placeholder="格力内部备注" />
               </div>
             </el-col>
+            <el-col :xs="24" :sm="24" :lg="24" class="item">
+              <div class="label">格力内部资料备注</div>
+              <div class="value">{{ details.geLiInnerDataNote }}</div>
+            </el-col>
+            <el-col :xs="24" :sm="24" :lg="24" class="item">
+              <div class="label">订单格力内部备注</div>
+              <div class="value">{{ details.orderGeLiInnerNote }}</div>
+            </el-col>
             <el-col :xs="24" :sm="24" :lg="12" class="item">
               <div class="label">使用单位</div>
               <div class="value">{{ details.refUseUnit }}</div>
@@ -118,17 +126,17 @@
               </div>
             </el-col>
             <el-col :xs="24" :sm="24" :lg="8" class="item">
-              <div class="label">实际使用单位</div>
-              <div class="value">
-                {{ details.realUseUnit }}
-              </div>
-            </el-col>
-            <el-col :xs="24" :sm="24" :lg="8" class="item">
-              <div class="label">实际安装地址</div>
-              <div class="value">
-                {{ details.realInstallAddress }}
-              </div>
-            </el-col>
+            <div class="label">实际使用单位</div>
+            <div class="value">
+              <el-input v-model="details.realUseUnit" placeholder="实际使用单位" />
+            </div>
+          </el-col>
+          <el-col :xs="24" :sm="24" :lg="8" class="item">
+            <div class="label">实际安装地址</div>
+            <div class="value">
+              <el-input v-model="details.realInstallAddress" placeholder="实际使用单位" />
+            </div>
+          </el-col>
             <el-col :xs="24" :sm="24" :lg="8" class="item">
               <div class="label">项目编号</div>
               <div class="value">
@@ -189,6 +197,7 @@
                 {{ details.refOtherAnnexResult }}
               </div>
             </el-col>
+            
             <!--            <el-col :xs="24" :sm="24" :lg="8" class="item">-->
             <!--              <div class="label">寄厂日期</div>-->
             <!--              <div class="value" style="padding: 0">-->
@@ -1092,6 +1101,8 @@ export default {
           res.data.items = arr
           this.amendData = res.data.dataList.filter(k => k.dataPosition == 'AMEND')
           this.original = res.data.dataList.filter(k => k.dataPosition != 'AMEND')
+          res.data.realUseUnit =res.data.realUseUnit || res.data.refUseUnit
+          res.data.realInstallAddress =   res.data.realInstallAddress ||res.data.refInstallAddress
           this.details = res.data
         })
       } else if (this.engineering == '工程订单信息') {

src/views/deposit_home/components/deposit_replenish.vue

@@ -82,6 +82,14 @@
                 <el-input v-model="details.geLiInerNote" placeholder="格力内部备注"></el-input>
               </div>
             </el-col>
+            <el-col :xs="24" :sm="24" :lg="24" class="item">
+              <div class="label">格力内部资料备注</div>
+              <div class="value">{{ details.geLiInnerDataNote }}</div>
+            </el-col>
+            <el-col :xs="24" :sm="24" :lg="24" class="item">
+              <div class="label">订单格力内部备注</div>
+              <div class="value">{{ details.orderGeLiInnerNote }}</div>
+            </el-col>
             <el-col :xs="24" :sm="24" :lg="12" class="item">
               <div class="label">使用单位</div>
               <div class="value">{{ details.refUseUnit }}</div>
@@ -1127,6 +1135,8 @@ item.sums2 = [ 'price', 'refundDepositAmount', 'depositAmount']
           res.data.items = arr
           this.amendData = res.data.dataList.filter(k => k.dataPosition == 'AMEND')
           this.original = res.data.dataList.filter(k => k.dataPosition != 'AMEND')
+          res.data.realUseUnit =res.data.realUseUnit || res.data.refUseUnit
+          res.data.realInstallAddress =   res.data.realInstallAddress ||res.data.refInstallAddress
           this.details = res.data
         })
       } else if (this.engineering == '工程订单信息') {

src/views/deposit_home/components/refund_list-detail.vue

@@ -201,7 +201,7 @@
             />
           </div>
         </el-col>
-        <el-col v-if="!isCustomer" :xs="24" :sm="24" :lg="16" class="item">
+        <el-col v-if="!isCustomer" :xs="24" :sm="24" :lg="24" class="item">
           <div class="label">格力内部备注</div>
           <!-- <div class="value">{{  detailList.geLiInerNote}}</div> -->
           <div class="value">
@@ -212,6 +212,14 @@
             />
           </div>
         </el-col>
+        <el-col :xs="24" :sm="24" :lg="24" class="item">
+              <div class="label">格力内部资料备注</div>
+              <div class="value">{{ detailList.geLiInnerDataNote }}</div>
+            </el-col>
+            <el-col :xs="24" :sm="24" :lg="24" class="item">
+              <div class="label">订单格力内部备注</div>
+              <div class="value">{{ detailList. orderGeLiInnerNote }}</div>
+            </el-col>
         <el-col :xs="24" :sm="24" :lg="8" class="item">
           <div class="label">提交保证函</div>
           <!-- <div class="value">{{ detailList.remark }}</div> -->
@@ -1403,6 +1411,8 @@ item.sums2 = [ 'price', 'refundDepositAmount', 'depositAmount']
       res.data.items = arr
       this.amendData = res.data.dataList.filter(k => k.dataPosition == 'AMEND')
       this.original = res.data.dataList.filter(k => k.dataPosition != 'AMEND')
+      res.data.realUseUnit =res.data.realUseUnit || res.data.refUseUnit
+          res.data.realInstallAddress =   res.data.realInstallAddress ||res.data.refInstallAddress
       this.detailList = res.data
       if (res.data.examineStatus == 'SAVE' || res.data.examineStatus == 'OK' || res.data.examineStatus == 'FAIL') {
         this.title = '详情'

src/views/deposit_home/components/refund_reexamine.vue

@@ -201,7 +201,7 @@
             />
           </div>
         </el-col>
-        <el-col v-if="!isCustomer" :xs="24" :sm="24" :lg="16" class="item">
+        <el-col v-if="!isCustomer" :xs="24" :sm="24" :lg="24" class="item">
           <div class="label">格力内部备注</div>
           <!-- <div class="value">{{  detailList.geLiInerNote}}</div> -->
           <div class="value">
@@ -212,6 +212,14 @@
             />
           </div>
         </el-col>
+        <el-col :xs="24" :sm="24" :lg="24" class="item">
+              <div class="label">格力内部资料备注</div>
+              <div class="value">{{ detailList.geLiInnerDataNote }}</div>
+            </el-col>
+            <el-col :xs="24" :sm="24" :lg="24" class="item">
+              <div class="label">订单格力内部备注</div>
+              <div class="value">{{ detailList. orderGeLiInnerNote }}</div>
+            </el-col>
         <el-col :xs="24" :sm="24" :lg="8" class="item">
           <div class="label">提交保证函</div>
           <!-- <div class="value">{{ detailList.remark }}</div> -->
@@ -1206,7 +1214,8 @@ item.sums2 = [ 'price', 'refundDepositAmount', 'depositAmount']
       res.data.items = arr
       this.amendData = res.data.dataList.filter(k => k.dataPosition == 'AMEND')
       this.original = res.data.dataList.filter(k => k.dataPosition != 'AMEND')
-
+      res.data.realUseUnit =res.data.realUseUnit || res.data.refUseUnit
+          res.data.realInstallAddress =   res.data.realInstallAddress ||res.data.refInstallAddress
       this.detailList = res.data
 
       if (res.data.examineStatus == 'SAVE' || res.data.examineStatus == 'OK' || res.data.examineStatus == 'FAIL') {

src/views/deposit_home/components/refund_replenish.vue

@@ -201,7 +201,7 @@
             />
           </div>
         </el-col>
-        <el-col v-if="!isCustomer" :xs="24" :sm="24" :lg="16" class="item">
+        <el-col v-if="!isCustomer" :xs="24" :sm="24" :lg="24" class="item">
           <div class="label">格力内部备注</div>
           <!-- <div class="value">{{  detailList.geLiInerNote}}</div> -->
           <div class="value">
@@ -212,6 +212,14 @@
             />
           </div>
         </el-col>
+        <el-col :xs="24" :sm="24" :lg="24" class="item">
+              <div class="label">格力内部资料备注</div>
+              <div class="value">{{ detailList.geLiInnerDataNote }}</div>
+            </el-col>
+            <el-col :xs="24" :sm="24" :lg="24" class="item">
+              <div class="label">订单格力内部备注</div>
+              <div class="value">{{ detailList. orderGeLiInnerNote }}</div>
+            </el-col>
         <el-col :xs="24" :sm="24" :lg="8" class="item">
           <div class="label">提交保证函</div>
           <!-- <div class="value">{{ detailList.remark }}</div> -->
@@ -1447,6 +1455,8 @@ item.sums2 = [ 'price', 'refundDepositAmount', 'depositAmount']
       res.data.items = arr
       this.amendData = res.data.dataList.filter(k => k.dataPosition == 'AMEND')
       this.original = res.data.dataList.filter(k => k.dataPosition != 'AMEND')
+      res.data.realUseUnit =res.data.realUseUnit || res.data.refUseUnit
+          res.data.realInstallAddress =   res.data.realInstallAddress ||res.data.refInstallAddress
       this.detailList = res.data
       if (res.data.examineStatus == 'SAVE' || res.data.examineStatus == 'OK' || res.data.examineStatus == 'FAIL') {
         this.title = '详情'