sale-client 4.2.113 → 4.2.114

package/build/dev-server.js

@@ -1,7 +1,7 @@
 var path = require('path')
 var checkVersion = require('./versionCheck.js')
 checkVersion()
-const [ serverRul, localUrl ] = ['http://121.36.106.17:31467/', 'http://121.36.106.17:31467/']
+const [ serverRul, localUrl ] = ['http://123.180.154.5:31467/', 'http://123.180.154.5:31467/']
 var merge = require('webpack-merge')
 var baseConfig = require('./webpack.dev.conf')
 var devConfig = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sale-client",
-  "version": "4.2.113",
+  "version": "4.2.114",
   "description": "收费模块前台组件",
   "main": "src/index.js",
   "scripts": {

package/src/components/revenue/base/leftview/ServiceRepair.vue

@@ -1,186 +1,206 @@
-<template>
-  <div class="panel panel-info auto">
-    <div class="panel-heading auto" style="height: 35px">
-      <h4 style="display:inline-block;margin-top: auto" title="参数:维修情况查询">维修情况</h4>
-    </div>
-    <table class="table table-striped table-bordered" v-if="this.pared==1" >
-      <thead>
-      <tr>
-        <th colspan="4" style="text-align: center;background-color: #8cbce2;">用户维修情况</th>
-      </tr>
-      </thead>
-      <tbody>
-      <tr>
-        <td  colspan="1" style="text-align: center;border: #E9E9E9 solid 1px;">维修时间:</td>
-        <td  colspan="3" style="text-align: center;border: #E9E9E9 solid 1px;">{{model.f_created_date }}</td>
-      </tr>
-      <tr>
-        <td  style="text-align: center;border: #E9E9E9 solid 1px;width: 17%">到达时间:</td>
-        <td  style="text-align: center;border: #E9E9E9 solid 1px;width: 33%">{{ model.f_date_come }}</td>
-        <td  style="text-align: center;border: #E9E9E9 solid 1px;width: 17%">离开时间:</td>
-        <td style="text-align: center;border: #E9E9E9 solid 1px;width: 33%">{{ model.f_date_leave }}</td>
-      </tr>
-      <tr>
-        <td  style="text-align: center;border: #E9E9E9 solid 1px;width: 17%">维修费用:</td>
-        <td  style="text-align: center;border: #E9E9E9 solid 1px;width: 33%">{{ model.f_money }}</td>
-        <td  style="text-align: center;border: #E9E9E9 solid 1px;width: 17%">维修结果:</td>
-        <td  style="text-align: center;border: #E9E9E9 solid 1px;width: 33%">{{ model.f_result_status }}</td>
-      </tr>
-      <tr>
-        <td  style="text-align: center;border: #E9E9E9 solid 1px;width: 17%">维修人:</td>
-        <td  style="text-align: center;border: #E9E9E9 solid 1px;width: 33%">{{ model.f_order_man }}</td>
-        <td  style="text-align: center;border: #E9E9E9 solid 1px;width: 17%">工单类型:</td>
-        <td  style="text-align: center;border: #E9E9E9 solid 1px;width: 33%">{{ model.f_workorder_type }}</td>
-      </tr>
-      <tr>
-        <td  style="text-align: center;border: #E9E9E9 solid 1px;width: 17%">工单进度:</td>
-        <td  style="text-align: center;border: #E9E9E9 solid 1px;width: 33%">{{ model.f_department }}</td>
-        <td  style="text-align: center;border: #E9E9E9 solid 1px;width: 17%">工单状态:</td>
-        <td  style="text-align: center;border: #E9E9E9 solid 1px;width: 33%">{{ model.f_orderstatus }}</td>
-      </tr>
-      </tbody>
-    </table>
-    <!-- 维修照片展示 -->
-    <table class="table table-striped table-bordered" v-if="pared == 1 && repairImages.length > 0">
-      <thead>
-      <tr>
-        <th colspan="4" style="text-align: center;background-color: #8cbce2;">维修照片</th>
-      </tr>
-      </thead>
-      <tbody>
-      <tr>
-        <td style="margin: auto;text-align: center">
-          <div class="container" style="background: #FFFFFF;margin:0;width:100%;">
-            <div class="img" v-for="img in repairImages">
-              <img-self v-if="img.android_file!='' && img.android_file!=null" :src="'rs/image/file/'+img.android_file" style="float: left" width="100" height="150"></img-self>
-            </div>
-          </div>
-        </td>
-      </tr>
-      </tbody>
-    </table>
-    <div class="auto info-content" v-if="pared == 0">
-      <div class="row">
-        <strong>暂无维修信息</strong>
-      </div>
-    </div>
-  </div>
-</template>
-<script>
-  /**
-   *用户信息
-   *维修情况
-   */
-
-  import {HttpResetClass} from 'vue-client'
-
-  export default {
-    title: '安检维修情况',
-    data () {
-      return {
-        model: {},
-        pared: 0,
-        repairImages: [] // 维修照片列表
-      }
-    },
-    props: ['data'],
-    ready () {
-      this.getServiceRepair()
-    },
-    methods: {
-      async getServiceRepair () {
-        if (this.data && this.data.f_userinfo_id) {
-          let data = {
-            f_userinfo_id: this.data.f_userinfo_id
-          }
-          let http = new HttpResetClass()
-          let res = await http.load('POST', 'api/af-revenue/sql/getServiceRepair', {data: data}, {resolveMsg: null, rejectMsg: null})
-          this.model = res.data[0]
-          console.log('看看维修情况', res, this.model)
-          if (this.model) {
-            this.pared = 1
-            await this.getRepairImages(this.model.id)
-          } else {
-            this.pared = 0
-            this.repairImages = []
-          }
-        } else {
-          this.pared = 0
-          this.repairImages = []
-        }
-      },
-      // 获取维修照片
-      async getRepairImages (workorderId) {
-        if (!workorderId) {
-          this.repairImages = []
-          return
-        }
-        try {
-          let http = new HttpResetClass()
-          let serviceWorkRes = await http.load('POST', 'api/af-revenue/sql/saleSingleTable', {
-            data: {
-              tablename: 't_servicework',
-              condition: `serviceid = '${workorderId}'`
-            }
-          }, {resolveMsg: null, rejectMsg: null})
-          if (serviceWorkRes.data && serviceWorkRes.data.length > 0) {
-            let serviceId = serviceWorkRes.data[0].id
-            let repairImgRes = await http.load('POST', 'api/af-revenue/sql/saleSingleTable', {
-              data: {
-                tablename: 't_repairimg',
-                condition: `serviceid = '${serviceId}'`
-              }
-            }, {resolveMsg: null, rejectMsg: null})
-            if (repairImgRes.data && repairImgRes.data.length > 0) {
-              this.repairImages = repairImgRes.data
-              console.log('this.repairImages', this.repairImages)
-            } else {
-              this.repairImages = []
-            }
-          } else {
-            this.repairImages = []
-          }
-        } catch (error) {
-          console.error('获取维修照片失败:', error)
-          this.repairImages = []
-        }
-      }
-    },
-    watch: {
-      'data' () {
-        console.log('维修情况', this.data)
-        this.getServiceRepair()
-      }
-    }
-  }
-</script>
-<style scoped>
-  .img {
-    border: 1px solid #9773ed;
-    width: auto;
-    height: auto;
-    float: left;
-    text-align: center;
-    margin: 6px;
-  }
-
-  img {
-    margin: 6px;
-  }
-
-
-  .container{
-    margin: 10px auto;
-    width: 80%;
-    height: auto;
-  }
-  div::-webkit-scrollbar {
-    width: 0 !important;
-    height: 0 !important;
-  }
-
-  div{
-    -ms-overflow-style: none;
-    overflow: -moz-scrollbars-none;
-  }
-</style>
+<template>
+  <div class="panel panel-info auto">
+    <div class="panel-heading auto" style="height: 35px">
+      <h4 style="display:inline-block;margin-top: auto" title="参数:维修情况查询">维修情况</h4>
+    </div>
+    <table class="table table-striped table-bordered" v-if="this.pared==1" >
+      <thead>
+      <tr>
+        <th colspan="4" style="text-align: center;background-color: #8cbce2;">用户维修情况</th>
+      </tr>
+      </thead>
+      <tbody>
+      <tr>
+        <td  colspan="1" style="text-align: center;border: #E9E9E9 solid 1px;">维修时间:</td>
+        <td  colspan="3" style="text-align: center;border: #E9E9E9 solid 1px;">{{model.f_created_date }}</td>
+      </tr>
+      <tr>
+        <td  style="text-align: center;border: #E9E9E9 solid 1px;width: 17%">到达时间:</td>
+        <td  style="text-align: center;border: #E9E9E9 solid 1px;width: 33%">{{ model.f_date_come }}</td>
+        <td  style="text-align: center;border: #E9E9E9 solid 1px;width: 17%">离开时间:</td>
+        <td style="text-align: center;border: #E9E9E9 solid 1px;width: 33%">{{ model.f_date_leave }}</td>
+      </tr>
+      <tr>
+        <td  style="text-align: center;border: #E9E9E9 solid 1px;width: 17%">维修费用:</td>
+        <td  style="text-align: center;border: #E9E9E9 solid 1px;width: 33%">{{ model.f_money }}</td>
+        <td  style="text-align: center;border: #E9E9E9 solid 1px;width: 17%">维修结果:</td>
+        <td  style="text-align: center;border: #E9E9E9 solid 1px;width: 33%">{{ model.f_result_status }}</td>
+      </tr>
+      <tr>
+        <td  style="text-align: center;border: #E9E9E9 solid 1px;width: 17%">维修人:</td>
+        <td  style="text-align: center;border: #E9E9E9 solid 1px;width: 33%">{{ model.f_order_man }}</td>
+        <td  style="text-align: center;border: #E9E9E9 solid 1px;width: 17%">工单类型:</td>
+        <td  style="text-align: center;border: #E9E9E9 solid 1px;width: 33%">{{ model.f_workorder_type }}</td>
+      </tr>
+      <tr>
+        <td  style="text-align: center;border: #E9E9E9 solid 1px;width: 17%">工单进度:</td>
+        <td  style="text-align: center;border: #E9E9E9 solid 1px;width: 33%">{{ model.f_department }}</td>
+        <td  style="text-align: center;border: #E9E9E9 solid 1px;width: 17%">工单状态:</td>
+        <td  style="text-align: center;border: #E9E9E9 solid 1px;width: 33%">{{ model.f_orderstatus }}</td>
+      </tr>
+      </tbody>
+    </table>
+    <!-- 维修照片展示 -->
+    <table class="table table-striped table-bordered" v-if="pared == 1 && repairImages.length > 0">
+      <thead>
+      <tr>
+        <th colspan="4" style="text-align: center;background-color: #8cbce2;">维修照片</th>
+      </tr>
+      </thead>
+      <tbody>
+      <tr>
+        <td style="margin: auto;text-align: center">
+          <div class="container" style="background: #FFFFFF;margin:0;width:100%;">
+            <div class="img" v-for="img in repairImages">
+              <img-self v-if="img.android_file!='' && img.android_file!=null" :src="'rs/image/file/'+img.android_file" style="float: left" width="100" height="150"></img-self>
+            </div>
+          </div>
+        </td>
+      </tr>
+      </tbody>
+    </table>
+    <div class="auto info-content" v-if="pared == 0">
+      <div class="row">
+        <strong>暂无维修信息</strong>
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+  /**
+   *用户信息
+   *维修情况
+   */
+
+  import {HttpResetClass} from 'vue-client'
+
+  export default {
+    title: '安检维修情况',
+    data () {
+      return {
+        model: {},
+        repairList: [], // 所有维修记录列表
+        pared: 0,
+        repairImages: [] // 维修照片列表
+      }
+    },
+    props: ['data'],
+    ready () {
+      this.getServiceRepair()
+    },
+    methods: {
+      async getServiceRepair () {
+        if (this.data && this.data.f_userinfo_id) {
+          let data = {
+            f_userinfo_id: this.data.f_userinfo_id
+          }
+          let http = new HttpResetClass()
+          let res = await http.load('POST', 'api/af-revenue/sql/getServiceRepair', {data: data}, {resolveMsg: null, rejectMsg: null})
+          console.log('看看维修情况', res, res.data)
+          if (res.data && res.data.length > 0) {
+            this.repairList = res.data
+            this.model = res.data[0]
+            this.pared = 1
+            await this.getAllRepairImages(res.data)
+          } else {
+            this.pared = 0
+            this.repairList = []
+            this.repairImages = []
+          }
+        } else {
+          this.pared = 0
+          this.repairList = []
+          this.repairImages = []
+        }
+      },
+      // 获取单个维修记录的照片
+      async getRepairImages (workorderId) {
+        if (!workorderId) {
+          return []
+        }
+        try {
+          let http = new HttpResetClass()
+          let serviceWorkRes = await http.load('POST', 'api/af-revenue/sql/saleSingleTable', {
+            data: {
+              tablename: 't_servicework',
+              condition: `serviceid = '${workorderId}'`
+            }
+          }, {resolveMsg: null, rejectMsg: null})
+          if (serviceWorkRes.data && serviceWorkRes.data.length > 0) {
+            let serviceId = serviceWorkRes.data[0].id
+            let repairImgRes = await http.load('POST', 'api/af-revenue/sql/saleSingleTable', {
+              data: {
+                tablename: 't_repairimg',
+                condition: `serviceid = '${serviceId}'`
+              }
+            }, {resolveMsg: null, rejectMsg: null})
+            if (repairImgRes.data && repairImgRes.data.length > 0) {
+              return repairImgRes.data
+            }
+          }
+          return []
+        } catch (error) {
+          console.error('获取维修照片失败:', error)
+          return []
+        }
+      },
+      // 获取所有维修记录的照片
+      async getAllRepairImages (repairList) {
+        if (!repairList || repairList.length === 0) {
+          this.repairImages = []
+          return
+        }
+        try {
+          let allImages = []
+          for (let repair of repairList) {
+            if (repair.id) {
+              let images = await this.getRepairImages(repair.id)
+              allImages = allImages.concat(images)
+            }
+          }
+          this.repairImages = allImages
+          console.log('所有维修照片', this.repairImages)
+        } catch (error) {
+          console.error('获取所有维修照片失败:', error)
+          this.repairImages = []
+        }
+      }
+    },
+    watch: {
+      'data' () {
+        console.log('维修情况', this.data)
+        this.getServiceRepair()
+      }
+    }
+  }
+</script>
+<style scoped>
+  .img {
+    border: 1px solid #9773ed;
+    width: auto;
+    height: auto;
+    float: left;
+    text-align: center;
+    margin: 6px;
+  }
+
+  img {
+    margin: 6px;
+  }
+
+
+  .container{
+    margin: 10px auto;
+    width: 80%;
+    height: auto;
+  }
+  div::-webkit-scrollbar {
+    width: 0 !important;
+    height: 0 !important;
+  }
+
+  div{
+    -ms-overflow-style: none;
+    overflow: -moz-scrollbars-none;
+  }
+</style>