apply-clients 3.4.82 → 3.4.83-2

package/build/dev-server.js

@@ -1,120 +1,119 @@
-var express = require('express')
-var webpack = require('webpack')
-var config = require('./webpack.dev.conf')
-var proxyMiddleware = require('http-proxy-middleware')
-// var httpProxy = require('http-proxy')
-var app = express()
-var compiler = webpack(config)
-// var proxy = httpProxy.createProxyServer()
-// var ldap = 'http://121.36.79.201:8400'
-// var applyinstall = 'http://121.36.79.201:8400'
-var ldap = 'http://221.193.244.147:8400'
-var applyinstall = 'http://221.193.244.147:8400'
-
-var proxyTable = {
-
-  '/rs/logic/getSaleInitData': {
-    target: ldap
-  },
-  '/rs/workflow': {
-    target: applyinstall
-  },
-  '/rs/vue': {
-    target: ldap
-  },
-  // 查找资源服务数据
-  '/rs/search': {
-    target: ldap
-  },
-  // 街道查询
-  '/rs/sql/address_getstreetlist': {
-    target: ldap
-  },
-  // 创建街道
-  '/rs/logic/address_updatestreet': {
-    target: ldap
-  },
-  // 创建小区
-  '/rs/logic/address_updatearea': {
-    target: ldap
-  },
-  // 用户登录服务地址
-  '/rs/user': {
-    target: ldap
-  },
-  '/rs/logic/getInitData': {
-    target: ldap?ldap:applyinstall
-  },
-  '/rs/logic/getLogin': {
-    target: ldap
-  },
-  '/rs/file': {    // 文件上传
-    target: applyinstall
-  },
-  '/project': {    // 文件回显
-    target: applyinstall
-  },
-  '/rs': {
-    target: applyinstall
-  },
-  '/ws': {
-    target: applyinstall,
-    ws: true // 代理webSocket
-  }
-}
-
-var devMiddleware = require('webpack-dev-middleware')(compiler, {
-  publicPath: config.output.publicPath,
-  stats: {
-    colors: true,
-    chunks: false
-  }
-})
-
-var hotMiddleware = require('webpack-hot-middleware')(compiler)
-// force page reload when html-webpack-plugin template changes
-compiler.plugin('compilation', function (compilation) {
-  compilation.plugin('html-webpack-plugin-after-emit', function (data, cb) {
-    hotMiddleware.publish({action: 'reload'})
-    cb()
-  })
-})
-
-// proxy api requests
-Object.keys(proxyTable).forEach(function (context) {
-  var options = proxyTable[context]
-  if (typeof options === 'string') {
-    options = {target: options}
-  }
-  app.use(proxyMiddleware(context, options))
-})
-
-// handle fallback for HTML5 history API
-app.use(require('connect-history-api-fallback')())
-// app.use(function (req, res, next) {
-//   res.header('Access-Control-Allow-Origin', '*')
-//   res.header('Access-Control-Allow-Headers', 'X-Requested-With')
-//   res.header('Access-Control-Allow-Methods', 'PUT, POST, GET,DELETE, OPTIONS')
-//   res.header('X-Powered-By', '3,2,1')
-//   res.header('Access-Control-Allow-Credentials', 'true')
-//   res.header('Content-Type', 'application/json;charset=utf-8')
-//   next()
-// })
-
-// serve webpack bundle output
-app.use(devMiddleware)
-
-// enable hot-reload and state-preserving
-// compilation error display
-app.use(hotMiddleware)
-
-// serve pure static assets
-app.use('/static', express.static('./static'))
-
-module.exports = app.listen(8300, function (err) {
-  if (err) {
-    console.log(err)
-    return
-  }
-  console.log('Listening at http://localhost:8300')
-})
+var express = require('express')
+var webpack = require('webpack')
+var config = require('./webpack.dev.conf')
+var proxyMiddleware = require('http-proxy-middleware')
+// var httpProxy = require('http-proxy')
+var app = express()
+var compiler = webpack(config)
+// var proxy = httpProxy.createProxyServer()
+// var ldap = 'http://121.36.79.201:8400'
+// var applyinstall = 'http://121.36.79.201:8400'
+var ldap = 'http://219.138.226.181:8401'
+var applyinstall = 'http://219.138.226.181:8401'
+
+var proxyTable = {
+  '/rs/logic/getSaleInitData': {
+    target: ldap
+  },
+  '/rs/workflow': {
+    target: applyinstall
+  },
+  '/rs/vue': {
+    target: ldap
+  },
+  // 查找资源服务数据
+  '/rs/search': {
+    target: ldap
+  },
+  // 街道查询
+  '/rs/sql/address_getstreetlist': {
+    target: ldap
+  },
+  // 创建街道
+  '/rs/logic/address_updatestreet': {
+    target: ldap
+  },
+  // 创建小区
+  '/rs/logic/address_updatearea': {
+    target: ldap
+  },
+  // 用户登录服务地址
+  '/rs/user': {
+    target: ldap
+  },
+  '/rs/logic/getInitData': {
+    target: ldap?ldap:applyinstall
+  },
+  '/rs/logic/getLogin': {
+    target: ldap
+  },
+  '/rs/file': {    // 文件上传
+    target: applyinstall
+  },
+  '/project': {    // 文件回显
+    target: applyinstall
+  },
+  '/rs': {
+    target: applyinstall
+  },
+  '/ws': {
+    target: applyinstall,
+    ws: true // 代理webSocket
+  }
+}
+
+var devMiddleware = require('webpack-dev-middleware')(compiler, {
+  publicPath: config.output.publicPath,
+  stats: {
+    colors: true,
+    chunks: false
+  }
+})
+
+var hotMiddleware = require('webpack-hot-middleware')(compiler)
+// force page reload when html-webpack-plugin template changes
+compiler.plugin('compilation', function (compilation) {
+  compilation.plugin('html-webpack-plugin-after-emit', function (data, cb) {
+    hotMiddleware.publish({action: 'reload'})
+    cb()
+  })
+})
+
+// proxy api requests
+Object.keys(proxyTable).forEach(function (context) {
+  var options = proxyTable[context]
+  if (typeof options === 'string') {
+    options = {target: options}
+  }
+  app.use(proxyMiddleware(context, options))
+})
+
+// handle fallback for HTML5 history API
+app.use(require('connect-history-api-fallback')())
+// app.use(function (req, res, next) {
+//   res.header('Access-Control-Allow-Origin', '*')
+//   res.header('Access-Control-Allow-Headers', 'X-Requested-With')
+//   res.header('Access-Control-Allow-Methods', 'PUT, POST, GET,DELETE, OPTIONS')
+//   res.header('X-Powered-By', '3,2,1')
+//   res.header('Access-Control-Allow-Credentials', 'true')
+//   res.header('Content-Type', 'application/json;charset=utf-8')
+//   next()
+// })
+
+// serve webpack bundle output
+app.use(devMiddleware)
+
+// enable hot-reload and state-preserving
+// compilation error display
+app.use(hotMiddleware)
+
+// serve pure static assets
+app.use('/static', express.static('./static'))
+
+module.exports = app.listen(8300, function (err) {
+  if (err) {
+    console.log(err)
+    return
+  }
+  console.log('Listening at http://localhost:8300')
+})

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "apply-clients",
-  "version": "3.4.82",
+  "version": "3.4.83-2",
   "description": "报建前端模块",
   "main": "src/index.js",
   "directories": {

package/src/filiale/hongda/android/AppAddMaterialScience.vue

@@ -0,0 +1,393 @@
+<template>
+  <div>
+    <data-grid :model="onetomany" class="list_area table_sy">
+      <template partial='head'>
+        <tr>
+          <th class="textNoLineBreak">序号</th>
+          <th class="textNoLineBreak">材料名称</th>
+          <th class="textNoLineBreak">材料型号</th>
+          <th class="textNoLineBreak">材料单位</th>
+          <th class="textNoLineBreak">材料数量</th>
+          <th class="textNoLineBreak">材料价格</th>
+          <th class="textNoLineBreak">材料状态</th>
+          <th class="textNoLineBreak">
+            <button class="button_new button_spacing" type="button" @click="$parent.$parent.openMaterialModal()">添加
+            </button>
+          </th>
+        </tr>
+      </template>
+      <template partial='body'>
+        <tr>
+          <td style="text-align: center;">
+            <nobr>{{$index+1}}</nobr>
+          </td>
+          <td style="text-align: center;">
+            <nobr>{{row.f_material_name}}</nobr>
+          </td>
+          <td style="text-align: center;">
+            <nobr>{{row.f_material_style}}</nobr>
+          </td>
+          <td style="text-align: center;">
+            <nobr>{{row.f_material_unit}}</nobr>
+          </td>
+          <td style="text-align: center;">
+            <nobr>{{row.f_material_number}}</nobr>
+          </td>
+          <td style="text-align: center;">
+            <nobr>{{row.f_material_price}}</nobr>
+          </td>
+          <td style="text-align: center;">
+            <nobr>{{row.f_material_type}}</nobr>
+          </td>
+          <td style="text-align: center;">
+            <button type="button" class="button_search button_spacing"
+                    @click="$parent.$parent.updateMaterial($index,row)">修改
+            </button>
+            <button type="button" class="button_delete button_spacing" @click="$parent.$parent.deleteMaterial(row)">删除
+            </button>
+          </td>
+        </tr>
+      </template>
+    </data-grid>
+    <modal v-if="showMaterialModal" :show.sync="showMaterialModal" v-ref:modal :large="true"
+           :backdrop="false" :title="title">
+      <header slot="modal-header" class="modal-header">
+        <button type="button" class="close" @click="closeMaterials"><span>&times;</span></button>
+        <h4 class="modal-title">{{title}}</h4>
+      </header>
+      <article slot="modal-body" class="modal-body clearfix">
+        <div v-for="(i,item) in materials" class="form-group col-sm-12 panel panel-info">
+          <div class="panel-heading head col-sm-12" style="background-color: #e8f4ff;margin-bottom: 10px">
+            <div class="col-sm-6 text-left">材料{{$index+1}}信息</div>
+            <div class="col-sm-6 text-right">
+              <button
+                class="button_delete button_spacing"
+                @click.prevent="deleteDevicesinfo(i)"
+                v-if="title === '新增'"
+              >删除
+              </button>
+            </div>
+          </div>
+          <div class="form-group col-sm-6">
+            <label class="col-sm-4 control-label">选择材料：</label>
+            <div class="col-sm-8">
+              <input-select
+                class="select select_list"
+                :value.sync="item.material"
+                v-model="item.material"
+                :options="meterialOptions"
+                :disable="mark === 1"
+                @change="modifyOtherValue(i)"
+                :valueSingle="true"></input-select>
+            </div>
+          </div>
+          <div class="form-group col-sm-6" :class="[item.f_material_name ? '' : 'has-error']">
+            <label class="col-sm-4 control-label">材料名称：</label>
+            <div class="col-sm-8">
+              <input class="form-control input_view" style="" type="text"
+                     placeholder="材料名称"
+                     v-model="item.f_material_name"
+                     :value="item.f_material_name"
+              />
+            </div>
+          </div>
+          <div class="form-group col-sm-6" :class="[item.f_material_style ? '' : 'has-error']">
+            <label class="col-sm-4 control-label">材料型号：</label>
+            <div class="col-sm-8">
+              <input class="form-control input_view" style="" type="text"
+                     placeholder="材料型号"
+                     v-model="item.f_material_style"
+                     :value="item.f_material_style"
+              />
+            </div>
+          </div>
+          <div class="form-group col-sm-6" :class="[item.f_material_unit ? '' : 'has-error']">
+            <label class="col-sm-4 control-label">材料单位：</label>
+            <div class="col-sm-8">
+              <input class="form-control input_view" style="" type="text"
+                     placeholder="材料单位"
+                     v-model="item.f_material_unit"
+                     :value="item.f_material_unit"
+              />
+            </div>
+          </div>
+          <div class="form-group col-sm-6" :class="[item.f_material_number ? '' : 'has-error']">
+            <label class="col-sm-4 control-label">材料数量：</label>
+            <div class="col-sm-8">
+              <input class="form-control input_view" style="" type="number"
+                     placeholder="设备数量"
+                     v-model="item.f_material_number"
+                     :value="item.f_material_number"
+              />
+            </div>
+          </div>
+          <div class="form-group col-sm-6">
+            <label class="col-sm-4 control-label">材料价格：</label>
+            <div class="col-sm-8">
+              <input class="form-control input_view" style="" type="text"
+                     placeholder="材料价格"
+                     v-model="item.f_material_price"
+                     :value="item.f_material_price"
+              />
+            </div>
+          </div>
+          <div class="form-group col-sm-6">
+            <label class="col-sm-4 control-label"></label>
+            <div class="col-sm-8">
+
+            </div>
+          </div>
+          <div class="form-group col-sm-6">
+            <label class="col-sm-4 control-label"></label>
+            <div class="col-sm-8">
+
+            </div>
+          </div>
+          <div class="form-group col-sm-6">
+            <label class="col-sm-4 control-label"></label>
+            <div class="col-sm-8">
+
+            </div>
+          </div>
+          <div class="form-group col-sm-6">
+            <label class="col-sm-4 control-label"></label>
+            <div class="col-sm-8">
+
+            </div>
+          </div>
+          <div class="form-group col-sm-6">
+            <label class="col-sm-4 control-label"></label>
+            <div class="col-sm-8">
+
+            </div>
+          </div>
+          <div class="form-group col-sm-6">
+            <label class="col-sm-4 control-label"></label>
+            <div class="col-sm-8">
+
+            </div>
+          </div>
+          <div class="form-group col-sm-6">
+            <label class="col-sm-4 control-label"></label>
+            <div class="col-sm-8">
+
+            </div>
+          </div>
+        </div>
+      </article>
+      <footer slot="modal-footer" class="modal-footer">
+        <template v-if="mark !== 1">
+          <button type="button" class="btn btn-primary" v-if="title==='新增'" @click="pushMaterial()">添加材料</button>
+          <button type="button" class="btn btn-primary" v-if="title==='新增'" @click="addMaterial()"
+                  :disabled="!$v.valid">确认添加
+          </button>
+          <button type="button" class="btn btn-primary" v-if="title==='修改'" @click="updateConfirm()"
+                  :disabled="!$v.valid">确认修改
+          </button>
+        </template>
+      </footer>
+    </modal>
+  </div>
+</template>
+
+<script>
+  import Vue from 'vue'
+  import {HttpResetClass} from 'vue-client'
+
+  export default {
+    name: 'addMaterialScience',
+    props: {
+      selectdata: {
+        type: Object
+      }
+    },
+    data() {
+      return {
+        onetomany: {
+          rows: []
+        },
+        title: '新增',
+        showMaterialModal: false,
+        materials: [
+          {
+            material: '',
+            f_material_name: '',
+            f_material_style: '',
+            f_material_unit: '',
+            f_material_number: '',
+            f_material_price:''
+          }
+        ],
+        meterialOptions: [],
+        row: {},
+        bjqChecklag:[],
+        fmaterialname:{},
+        isShow:[false]
+      }
+    },
+    ready() {
+      this.getOnetoManyData()
+    },
+    methods: {
+      async getOnetoManyData () {
+        let http = new HttpResetClass()
+        let data = {
+          tablename: `t_material_apply`,
+          condition: `f_process_id='${this.selectdata.f_process_id}'`
+        }
+        let res = await http.load(
+          'POST',
+          `${this.$androidUtil.getProxyUrl()}/rs/sql/apply_singleTable?aaa=123`,
+          {data: data},
+          {resolveMsg: null, rejectMsg: 'onetomany查询失败'}
+        )
+        this.onetomany.rows = res.data
+      },
+      async openMaterialModal() {
+        this.getMateralNames()
+        this.title = '新增'
+        this.materials = [
+          {
+            material: '',
+            f_material_name: '',
+            f_material_style: '',
+            f_material_unit: '',
+            f_material_number: '',
+            f_material_price:''
+          }
+        ],
+          this.showMaterialModal = true
+        this.isShow = [false]
+      },
+      deleteDevicesinfo(index) {
+        this.materials.splice(index, 1)
+        this.isShow.splice(index, 1)
+      },
+      pushMaterial() {
+        this.materials.push({
+          material: '',
+          f_material_name: '',
+          f_material_style: '',
+          f_material_unit: '',
+          f_material_number: '',
+          f_material_price:''
+        })
+        this.isShow.push(false)
+      },
+      // 获取模态框材料
+      async getMateralNames() {
+        let data = {
+          condition: `1=1`
+        }
+        let http = new HttpResetClass()
+        let res = await http.load(
+          'POST',
+          `${this.$androidUtil.getProxyUrl()}/rs/sql/getStockMaterial`,
+          {data: data},
+          {resolveMsg: null, rejectMsg: '材料查询失败！！！'}
+        )
+
+        this.meterialOptions = res.data.map(item => {
+          return {
+            'label': `${item.f_material_name}--${item.f_material_style}`,
+            'value': item
+          }
+        })
+      },
+      modifyOtherValue(index) {
+        console.log("进来了", index)
+        console.log("dddd", this.materials[index].material)
+        let material = this.materials[index].material
+        this.materials[index].f_material_name = material.f_material_name
+        this.materials[index].f_material_style = material.f_material_style
+        this.materials[index].f_material_unit = material.f_material_unit
+        this.materials[index].f_material_number = material.f_material_number
+        this.materials[index].f_material_price = material.f_material_price
+        if (material.f_material_name === "报警器-汉威") {
+          this.isShow[index] = true
+        } else {
+          this.isShow[index] = false
+        }
+        this.isShow.splice(0, 1, this.isShow[0])
+      },
+      // 新增材料
+      async addMaterial() {
+        this.title = '新增'
+        let data = {
+          f_process_id: this.selectdata.f_process_id,
+          f_operator_id: Vue.user.id,
+          f_operator: Vue.user.name,
+          f_operation_date: new Date().Format('yyyy-MM-dd HH:mm:ss'),
+          f_orgid: Vue.user.orgid,
+          f_orgname: Vue.user.orgs,
+          materials: this.materials
+        }
+        let http = new HttpResetClass()
+        let res = await http.load(
+          'POST',
+          `${this.$androidUtil.getProxyUrl()}/rs/logic/saveMaterials`,
+          data
+        )
+        this.closeMaterials()
+      },
+      async deleteMaterial(row) {
+        debugger
+        var show1 =  window.confirm('您确定要删除这条记录吗?')
+        if(show1 != true){
+          this.closeMaterials()
+        }else{
+          let http = new HttpResetClass()
+          let res = await http.load(
+            'POST',
+            `${this.$androidUtil.getProxyUrl()}/rs/logic/deleteMaterial`,
+            {data: row},
+            {resolveMsg: null, rejectMsg: '材料删除失败！！！'}
+          )
+          this.closeMaterials()
+        }
+      }
+      ,
+      async updateMaterial(index, row) {
+        this.title = '修改'
+        this.row = row
+        this.getMateralNames()
+        this.materials = [
+          {
+            material: '',
+            f_material_name: row.f_material_name,
+            f_material_style: row.f_material_style,
+            f_material_unit: row.f_material_unit,
+            f_material_number: row.f_material_number,
+            f_material_price: row.f_material_price
+          }
+        ]
+        this.showMaterialModal = true
+      },
+      async updateConfirm() {
+        let data = this.row
+        data.f_material_name = this.materials[0].f_material_name
+        data.f_material_style = this.materials[0].f_material_style
+        data.f_material_unit = this.materials[0].f_material_unit
+        data.f_material_number = this.materials[0].f_material_number
+        data.f_material_price = this.materials[0].f_material_price
+
+        let http = new HttpResetClass()
+        let res = await http.load(
+          'POST',
+          `${this.$androidUtil.getProxyUrl()}/rs/entity/t_material_apply`,
+          data
+        )
+        this.closeMaterials()
+      },
+      closeMaterials() {
+        this.getOnetoManyData()
+        this.showMaterialModal = false
+      }
+    }
+  }
+
+</script>
+
+<style scoped>
+
+</style>