sale-client 4.3.99 → 4.4.1

package/build/dev-server.js

@@ -1,77 +1,71 @@
-var path = require('path')
-var checkVersion = require('./versionCheck.js')
-checkVersion()
-const [ serverRul, localUrl ] = ['http://192.168.50.67:31567/', 'http://localhost:9026']
-var merge = require('webpack-merge')
-var baseConfig = require('./webpack.dev.conf')
-var devConfig = {
-  devServer: {
-    contentBase: path.join(__dirname, 'src'),
-    hot: true,
-    publicPath: baseConfig.output.publicPath,
-    historyApiFallback: true,
-    host: '127.0.0.1',
-    port: 8089,
-    open: false,
-    stats: {
-      colors: false, // 配置控制台输出彩色日志
-      chunks: false, // 不输出构建 chunk 信息
-      children: false // 不输出子模块构建信息
-    },
-    proxy: {
-    // '/api/af-revenue/batchdeduction/all': {
-    //   pathRewrite: {
-    //     '/api/af-revenue/batchdeduction/all': '/batchdeduction/all'
-    //   },
-    //   target: localUrl
-    // },
-      '/api/af-revenue/logic': {
-        pathRewrite: {
-          '/api/af-revenue/logic': '/logic'
-        },
-        target: localUrl
-      },
-      // '/api/af-revenue/file': {
-      //   // pathRewrite: {
-      //   //   '/api/af-revenue/file': '/file'
-      //   // },
-      //   target: localUrl
-      // },
-      // '/weixin2/rs':{
-      //
-      //   target: 'http://410663id1ia4.vicp.fun'
-      // },
-      '/api/af-revenue/sql': {
-        pathRewrite: {
-          '/api/af-revenue/sql': '/sql'
-        },
-        target: localUrl
-      },
-      '/rs/pay': {
-        target: 'http://localhost:8080'
-      },
-      // '/api/af-revenue': {
-      //   pathRewrite: {
-      //     '/api/af-revenue': '/'
-      //   },
-      //   target: "http://localhost:9026"
-      // },
-      '/api': {
-        target: serverRul,
-        secure: false,
-        changeOrigin: true,
-      },
-      '/resource': {
-        target: serverRul,
-        secure: false,
-        changeOrigin: true
-      },
-      '/rs': {
-        target: serverRul,
-        secure: false,
-        changeOrigin: true,
-      }
-    }
-  }
-}
-module.exports = merge(baseConfig, devConfig)
+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/']
+var merge = require('webpack-merge')
+var baseConfig = require('./webpack.dev.conf')
+var devConfig = {
+  devServer: {
+    contentBase: path.join(__dirname, 'src'),
+    hot: true,
+    publicPath: baseConfig.output.publicPath,
+    historyApiFallback: true,
+    host: '127.0.0.1',
+    port: 8089,
+    open: false,
+    stats: {
+      colors: false, // 配置控制台输出彩色日志
+      chunks: false, // 不输出构建 chunk 信息
+      children: false // 不输出子模块构建信息
+    },
+    proxy: {
+    // '/api/af-revenue/batchdeduction/all': {
+    //   pathRewrite: {
+    //     '/api/af-revenue/batchdeduction/all': '/batchdeduction/all'
+    //   },
+    //   target: localUrl
+    // },
+    //   '/api/af-revenue/logic': {
+    //     pathRewrite: {
+    //       '/api/af-revenue/logic': '/logic'
+    //     },
+    //     target: localUrl
+    //   },
+      // '/api/af-revenue/file': {
+      //   // pathRewrite: {
+      //   //   '/api/af-revenue/file': '/file'
+      //   // },
+      //   target: localUrl
+      // },
+      // '/weixin2/rs':{
+      //
+      //   target: 'http://410663id1ia4.vicp.fun'
+      // },
+      // '/api/af-revenue/sql': {
+      //   pathRewrite: {
+      //     '/api/af-revenue/sql': '/sql'
+      //   },
+      //   target: localUrl
+      // },
+      '/rs/pay': {
+        target: 'http://localhost:8080'
+      },
+      // '/api/af-revenue': {
+      //   pathRewrite: {
+      //     '/api/af-revenue': '/'
+      //   },
+      //   target: "http://localhost:9026"
+      // },
+      '/api': {
+        target: serverRul
+      },
+      '/resource': {
+        target: serverRul
+      },
+      '/rs': {
+        target: serverRul
+      }
+    }
+  }
+}
+module.exports = merge(baseConfig, devConfig)

package/package.json

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

package/src/filiale/dexin/HiddenDangerInfo.vue

@@ -0,0 +1,152 @@
+<template>
+  <div class="panel panel-info auto">
+    <div class="panel-heading auto" style="height: 35px">
+      <h4 style="display:inline-block;margin-top: auto">未处理隐患</h4>
+    </div>
+
+    <table class="table table-striped table-bordered" v-if="hiddenDangerList.length > 0">
+      <tbody v-for="(index,row) in hiddenDangerList">
+        <tr>
+          <td colspan="4" style="text-align: center;background-color: #8cbce2;">未处理隐患{{index+1}}明细
+          </td>
+        </tr>
+        <tr>
+          <td colspan="1" style="text-align: center;border: #E9E9E9 solid 1px;">隐患名称:</td>
+          <td colspan="3" style="text-align: center;border: #E9E9E9 solid 1px;">{{ row.f_item_name }}</td>
+        </tr>
+        <tr>
+          <td colspan="1" style="text-align: center;border: #E9E9E9 solid 1px;">发现时间:</td>
+          <td colspan="3" style="text-align: center;border: #E9E9E9 solid 1px;">{{ row.f_offsite_time }}</td>
+        </tr>
+        <tr>
+          <td colspan="1" style="text-align: center;border: #E9E9E9 solid 1px;">发现人员:</td>
+          <td colspan="3" style="text-align: center;border: #E9E9E9 solid 1px;">{{ row.f_checker_name }}</td>
+        </tr>
+        <tr>
+          <td colspan="1" style="text-align: center;border: #E9E9E9 solid 1px;width: 17%">隐患照片:</td>
+          <td colspan="3" style="text-align: center;border: #E9E9E9 solid 1px;width: 33%">
+            <div class="img">
+              <img-self :src="row.f_path" width="150" height="150"></img-self>
+            </div>
+          </td>
+        </tr>
+        <tr v-if="row.f_p1_path">
+          <td colspan="1" style="text-align: center;border: #E9E9E9 solid 1px;width: 17%">隐患照片2:</td>
+          <td colspan="3" style="text-align: center;border: #E9E9E9 solid 1px;width: 33%">
+            <div class="img">
+              <img-self :src="'rs/image/file/' + row.f_p1_path" width="150" height="150"></img-self>
+            </div>
+          </td>
+        </tr>
+        <tr v-if="row.f_p2_path">
+          <td colspan="1" style="text-align: center;border: #E9E9E9 solid 1px;width: 17%">隐患照片3:</td>
+          <td colspan="3" style="text-align: center;border: #E9E9E9 solid 1px;width: 33%">
+            <div class="img">
+              <img-self :src="'rs/image/file/' + row.f_p2_path" width="150" height="150"></img-self>
+            </div>
+          </td>
+        </tr>
+        <tr v-if="row.f_p3_path">
+          <td colspan="1" style="text-align: center;border: #E9E9E9 solid 1px;width: 17%">隐患照片4:</td>
+          <td colspan="3" style="text-align: center;border: #E9E9E9 solid 1px;width: 33%">
+            <div class="img">
+              <img-self :src="'api/af-revenue/file/image/' + row.f_p3_path" width="150" height="150"></img-self>
+            </div>
+          </td>
+        </tr>
+      </tbody>
+    </table>
+
+    <div class="auto info-content" v-if="hiddenDangerList.length === 0">
+      <div class="row">
+        <strong>暂无未处理隐患信息</strong>
+      </div>
+    </div>
+  </div>
+
+</template>
+<script>
+/**
+ *用户信息
+ *安检信息
+ */
+
+import { HttpResetClass } from 'vue-client'
+import {runLogic} from 'vue-client/src/util/apiUtils'
+
+let getHiddenDangerGen = async function (self) {
+  try {
+    let http = new HttpResetClass()
+    let condition = `f_userinfoid = ${self.data.f_userinfo_id} and f_is_repaired = '隐患未处理'`
+    let getHiddenDanger = await http.load('POST', 'api/af-safecheck/sql/defectDetails', {
+      data: {
+        condition: condition,
+        f_filialeid: `('${self.$login.f.orgid}')`
+      }
+    }, {resolveMsg: null, rejectMsg: null})
+    console.log('getHiddenDanger', getHiddenDanger)
+    self.hiddenDangerList = getHiddenDanger.data
+    if (self.hiddenDangerList && self.hiddenDangerList.length > 0) {
+      for (let img of self.hiddenDangerList) {
+        if (img.f_path && img.f_path !== '') {
+          const filename = img.f_path.split('/')[img.f_path.split('/').length - 1]
+          try {
+            const res = await runLogic('getImageFileLogic', {filename}, 'af-telephone')
+            if (res && res.data && res.data.filepath) {
+              img.f_path = res.data.filepath
+            }
+          } catch (error) {
+            console.error('获取图片路径失败:', error)
+          }
+        }
+      }
+    }
+  } catch (error) {
+    console.error(error)
+  }
+}
+
+export default {
+  title: '安检信息',
+  data () {
+    return {
+      hiddenDangerList: [],
+      style: 'text-align: center;border: #E9E9E9 solid 1px;'
+    }
+  },
+  props: ['data'],
+  ready () {
+    if (this.data) {
+      getHiddenDangerGen(this)
+    }
+  },
+  methods: {},
+  computed: {},
+  watch: {
+    'data' () {
+      if (this.data == null) {
+        this.hiddenDangerList = []
+      } else {
+        getHiddenDangerGen(this)
+      }
+    }
+  }
+}
+</script>
+<style scoped>
+.img {
+  border: 1px solid #9773ed;
+  width: auto;
+  height: auto;
+  margin: 6px auto;
+  display: inline-block;
+  text-align: center;
+}
+
+img {
+  margin: 6px;
+  display: block;
+  margin-left: auto;
+  margin-right: auto;
+}
+</style>