apply-clients 4.1.62-weinan → 4.1.63-weinan

package/package.json

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

package/src/components/app_apply/materialshoufei.vue

@@ -1,243 +1,248 @@
-<template>
-  <div class="col-sm-12" style="margin: 20px 0px;">
-    <data-grid  :model="model" v-ref:grid class="list_area table_sy" style="padding: 0px">
-      <template partial='head'>
-        <tr>
-          <th>序号</th>
-          <th>材料名称</th>
-          <th>品名规格</th>
-          <th>型号</th>
-          <th>单价(元)</th>
-          <th>数量</th>
-          <th>金额</th>
-          <th>备注</th>
-          <th v-if="$parent.$parent.mark === 0">
-            <button type="button" class="btn btn-info head-but" @click="$parent.$parent.addshoufei()" >新增收费
-            </button>
-          </th>
-        </tr>
-      </template>
-      <template partial='body'>
-        <td style="text-align: center">{{ $index + 1}}</td>
-        <td style="text-align: center">{{ row.f_material_name}}</td>
-        <td style="text-align: center">{{ row.f_typename}}</td>
-        <td style="text-align: center">{{ row.f_typenumber}}</td>
-        <td style="text-align: center">{{ row.f_material_price}}</td>
-        <td style="text-align: center">{{ row.f_material_number}}</td>
-        <td style="text-align: center">{{ row.f_fee}}</td>
-        <td style="text-align: center">{{ row.f_remarks}}</td>
-        <td class="flex-around" v-if="$parent.$parent.mark === 0">
-          <button type="button" name="button" class="btn btn-link"
-                  @click.stop="$parent.$parent.modifyParam(row)">修改
-          </button>
-          <button type="button" name="button" class="btn btn-link"
-                  @click.stop="$parent.$parent.deleteItem(row)">删除
-          </button>
-        </td>
-      </template>
-    </data-grid>
-    <span>合计：{{ f_cost_sum }}元</span>
-  </div>
-
-  <modal :show.sync="showpay" v-ref:modal backdrop="false">
-    <header slot="modal-header" class="modal-header">
-      <button type="button" class="close" @click="close"><span>&times;</span></button>
-      <h4 class="modal-title">新增材料收费</h4>
-    </header>
-    <article slot="modal-body" class="modal-body">
-      <div class="from-group">
-        <label>材料名称</label>
-        <input-select
-          class="select select_list"
-          :value.sync="addItem.f_material_name"
-           v-model="addItem.f_material_name"
-          :options="positions"
-          @change="setTypename"
-          :valueSingle="true"></input-select>
-      </div>
-      <div class="from-group">
-        <label>品名规格</label>
-        <input-select
-          class="select select_list"
-          :value.sync="addItem.f_typename"
-          v-model="addItem.f_typename"
-          :options="typeNameList"
-          @change="setTypenumber"
-          :valueSingle="true"></input-select>
-      </div>
-      <div class="from-group">
-        <label>型号</label>
-        <input-select
-          class="select select_list"
-          :value.sync="addItem.f_typenumber"
-          v-model="addItem.f_typenumber"
-          :options="typeNumberList"
-          @change="setmaterialprice"
-          :valueSingle="true"></input-select>
-      </div>
-      <div class="from-group">
-        <label>单价(元)</label>
-        <input type="number" class="form-control" v-model="addItem.f_material_price" readonly>
-      </div>
-      <div class="from-group">
-        <label>数量</label>
-        <input type="number" class="form-control" v-model="addItem.f_material_number" >
-      </div>
-      <div class="from-group">
-        <label>金额</label>
-        <input type="number" class="form-control" v-model="addItem.f_fee" :value="smalltoBIG()" readonly>
-      </div>
-      <div class="from-group">
-        <label>备注</label>
-        <textarea type="text" rows="2" class="form-control" v-model="addItem.f_remarks"></textarea>
-      </div>
-    </article>
-    <footer slot="modal-footer" class="modal-footer">
-      <button v-show="showpay" type="button" class="btn btn-default" @click='close'>取消</button>
-      <button v-show="showpay" type="button" class="btn btn-success" @click='addpaydipetail' :disabled="!$v.valid">确认</button>
-    </footer>
-  </modal>
-</template>
-
-<script>
-import {HttpResetClass} from 'vue-client'
-import Vue from "vue";
-import $ from 'jquery'
-
-export default {
-  title: '材料收费',
-  data() {
-    return {
-      showpay: false, // 新增材料收费开关
-      model: {
-        rows: [] // 材料收费数据数组
-      },
-      addItem: {
-        f_material_price:0
-      },
-      f_cost_sum: 0,
-      positions:this.$appdata.getParam('品名及规格'),
-      typeNameList:null,
-      typeNumberList:null
-    }
-  },
-  props: {
-    selectdata: {
-      type: Object
-    },
-    mark: {
-      type: Number,
-      default: 0
-    }
-  },
-  ready() {
-    this.load()
-  },
-  methods: {
-    async load() {
-      let http = new HttpResetClass()
-      let data = {
-        tablename: 't_material_charges',
-        condition: `f_process_id = '${this.selectdata.f_process_id}'`
-      }
-      let res = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/sql/singleTable`, {data: data}, {resolveMsg: null, rejectMsg: '获取数据失败'})
-        .then((res) => {
-          this.model.rows = res.data
-          this.f_cost_sum = 0
-          for (var i = 0; i < this.model.rows.length; i++) {
-            this.f_cost_sum += Number(this.model.rows[i].f_fee)
-          }
-          this.$set('selectdata.f_cost_sum',this.f_cost_sum)
-        })
-    },
-    // 关闭模态框
-    close() {
-      this.showpay = false
-      this.addItem =  {
-        f_material_price:0
-      }
-    },
-    // 模态框确定按钮保存数据
-    async addpaydipetail() {
-      let http = new HttpResetClass()
-      this.addItem.f_process_id = this.selectdata.f_process_id
-      this.addItem.f_apply_num = this.selectdata.f_apply_num
-      this.addItem.f_operator = Vue.user.name
-      this.addItem.f_department = Vue.user.f_department_name
-      this.addItem.f_filiale = Vue.user.orgs
-      await http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/logic/addmaterialshoufei`, this.addItem, {resolveMsg: '保存成功', rejectMsg: '保存失败'})
-        .then((res) => {
-          this.close()
-          this.load()
-        })
-    },
-    deleteItem(row) {
-      let http = new HttpResetClass()
-      http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/logic/delectmaterialshoufei`, {data: row}, {resolveMsg: null, rejectMsg: '删除失败'})
-        .then((res) => {
-          this.load()
-        })
-    },
-    //新增收费 开启模态框
-    addshoufei() {
-      this.showpay = true
-    },
-    modifyParam(row) {
-      this.addItem = row
-      this.showpay = true
-    },
-    // 金额计算
-    smalltoBIG() {
-      let num =  Number(this.addItem.f_material_price) *  Number(this.addItem.f_material_number)
-      return num
-    },
-     setTypename (val) {
-      this.typeNameList = this.$appdata.getParam(val)
-    },
-    setTypenumber (val) {
-      this.typeNumberList = this.$appdata.getParam(val)
-    },
-    setmaterialprice(val){
-      if(val==null){
-        this.addItem.f_material_price = 0
-      }
-      this.addItem.f_material_price = this.$appdata.getSingleValue(val)
-    }
-  },
-  watch: {
-    'typeNumberList'(){
-     this.addItem.f_typenumber=null
-     this.addItem.f_material_price = 0
-     },
-    'typeNameList'() {
-      this.addItem.f_typename = null
-      this.addItem.f_typenumber = null
-      this.addItem.f_material_price = 0
-    }
-  }
-}
-
-</script>
-
-
-<style scoped>
-table {
-  border-collapse: collapse;
-  border-spacing: 0;
-  width: 100%;
-}
-
-table, td, th {
-  padding: 0;
-  border: 1px solid black
-}
-
-tr {
-  height: 34px;
-}
-
-#DynamicForm input {
-  text-align: center;
-}
-
-</style>
+<template>
+  <div class="col-sm-12" style="margin: 20px 0px;">
+    <data-grid  :model="model" v-ref:grid class="list_area table_sy" style="padding: 0px">
+      <template partial='head'>
+        <tr>
+          <th>序号</th>
+          <th>材料名称</th>
+          <th>品名规格</th>
+          <th>型号</th>
+          <th>单价(元)</th>
+          <th>数量</th>
+          <th>金额</th>
+          <th>备注</th>
+          <th v-if="$parent.$parent.mark === 0">
+            <button type="button" class="btn btn-info head-but" @click="$parent.$parent.addshoufei()" >新增收费
+            </button>
+          </th>
+        </tr>
+      </template>
+      <template partial='body'>
+        <td style="text-align: center">{{ $index + 1}}</td>
+        <td style="text-align: center">{{ row.f_material_name}}</td>
+        <td style="text-align: center">{{ row.f_typename}}</td>
+        <td style="text-align: center">{{ row.f_typenumber}}</td>
+        <td style="text-align: center">{{ row.f_material_price}}</td>
+        <td style="text-align: center">{{ row.f_material_number}}</td>
+        <td style="text-align: center">{{ row.f_fee}}</td>
+        <td style="text-align: center">{{ row.f_remarks}}</td>
+        <td class="flex-around" v-if="$parent.$parent.mark === 0">
+          <button type="button" name="button" class="btn btn-link"
+                  @click.stop="$parent.$parent.modifyParam(row)">修改
+          </button>
+          <button type="button" name="button" class="btn btn-link"
+                  @click.stop="$parent.$parent.deleteItem(row)">删除
+          </button>
+        </td>
+      </template>
+    </data-grid>
+    <span>合计：{{ f_cost_sum }}元</span>
+  </div>
+
+  <modal :show.sync="showpay" v-ref:modal backdrop="false">
+    <header slot="modal-header" class="modal-header">
+      <button type="button" class="close" @click="close"><span>&times;</span></button>
+      <h4 class="modal-title">新增材料收费</h4>
+    </header>
+    <article slot="modal-body" class="modal-body">
+      <div class="from-group">
+        <label>材料名称</label>
+        <input-select
+          class="select select_list"
+          :value.sync="addItem.f_material_name"
+           v-model="addItem.f_material_name"
+          :options="positions"
+          @change="setTypename"
+          :valueSingle="true"></input-select>
+      </div>
+      <div class="from-group">
+        <label>品名规格</label>
+        <input-select
+          class="select select_list"
+          :value.sync="addItem.f_typename"
+          v-model="addItem.f_typename"
+          :options="typeNameList"
+          @change="setTypenumber"
+          :valueSingle="true"></input-select>
+      </div>
+      <div class="from-group">
+        <label>型号</label>
+        <input-select
+          class="select select_list"
+          :value.sync="addItem.f_typenumber"
+          v-model="addItem.f_typenumber"
+          :options="typeNumberList"
+          @change="setmaterialprice"
+          :valueSingle="true"></input-select>
+      </div>
+      <div class="from-group">
+        <label>单价(元)</label>
+        <input type="number" class="form-control" v-model="addItem.f_material_price" readonly>
+      </div>
+      <div class="from-group">
+        <label style="color: red">数量</label>
+        <input type="number" class="form-control" v-model="addItem.f_material_number" >
+      </div>
+      <div class="from-group">
+        <label>金额</label>
+        <input type="number" class="form-control" v-model="addItem.f_fee" :value="smalltoBIG()" readonly>
+      </div>
+      <div class="from-group">
+        <label>备注</label>
+        <textarea type="text" rows="2" class="form-control" v-model="addItem.f_remarks"></textarea>
+      </div>
+    </article>
+    <footer slot="modal-footer" class="modal-footer">
+      <button v-show="showpay" type="button" class="btn btn-default" @click='close'>取消</button>
+      <button v-show="showpay" type="button" class="btn btn-success" @click='addpaydipetail' :disabled="!$v.valid">确认</button>
+    </footer>
+  </modal>
+</template>
+
+<script>
+import {HttpResetClass} from 'vue-client'
+import Vue from "vue";
+import $ from 'jquery'
+
+export default {
+  title: '材料收费',
+  data() {
+    return {
+      showpay: false, // 新增材料收费开关
+      model: {
+        rows: [] // 材料收费数据数组
+      },
+      addItem: {
+        f_material_price:0
+      },
+      f_cost_sum: 0,
+      positions:this.$appdata.getParam('品名及规格'),
+      typeNameList:null,
+      typeNumberList:null
+    }
+  },
+  props: {
+    selectdata: {
+      type: Object
+    },
+    mark: {
+      type: Number,
+      default: 0
+    }
+  },
+  ready() {
+    this.load()
+  },
+  methods: {
+    async load() {
+      let http = new HttpResetClass()
+      let data = {
+        tablename: 't_material_charges',
+        condition: `f_process_id = '${this.selectdata.f_process_id}'`
+      }
+      let res = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/sql/singleTable`, {data: data}, {resolveMsg: null, rejectMsg: '获取数据失败'})
+        .then((res) => {
+          this.model.rows = res.data
+          this.f_cost_sum = 0
+          for (var i = 0; i < this.model.rows.length; i++) {
+            this.f_cost_sum += Number(this.model.rows[i].f_fee)
+          }
+          this.$set('selectdata.f_cost_sum',this.f_cost_sum)
+        })
+    },
+    // 关闭模态框
+    close() {
+      this.showpay = false
+      this.addItem =  {
+        f_material_price:0
+      }
+    },
+    // 模态框确定按钮保存数据
+    async addpaydipetail() {
+      if( this.addItem.f_material_number==''|| Number(this.addItem.f_material_number)<0){
+        //提示数量不能为空
+        this.$showMessage('请输入数量必须大于0', 'warning')
+        return
+      }
+      let http = new HttpResetClass()
+      this.addItem.f_process_id = this.selectdata.f_process_id
+      this.addItem.f_apply_num = this.selectdata.f_apply_num
+      this.addItem.f_operator = Vue.user.name
+      this.addItem.f_department = Vue.user.f_department_name
+      this.addItem.f_filiale = Vue.user.orgs
+      await http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/logic/addmaterialshoufei`, this.addItem, {resolveMsg: '保存成功', rejectMsg: '保存失败'})
+        .then((res) => {
+          this.close()
+          this.load()
+        })
+    },
+    deleteItem(row) {
+      let http = new HttpResetClass()
+      http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/logic/delectmaterialshoufei`, {data: row}, {resolveMsg: null, rejectMsg: '删除失败'})
+        .then((res) => {
+          this.load()
+        })
+    },
+    //新增收费 开启模态框
+    addshoufei() {
+      this.showpay = true
+    },
+    modifyParam(row) {
+      this.addItem = row
+      this.showpay = true
+    },
+    // 金额计算
+    smalltoBIG() {
+      let num =  Number(this.addItem.f_material_price) *  Number(this.addItem.f_material_number)
+      return num
+    },
+     setTypename (val) {
+      this.typeNameList = this.$appdata.getParam(val)
+    },
+    setTypenumber (val) {
+      this.typeNumberList = this.$appdata.getParam(val)
+    },
+    setmaterialprice(val){
+      if(val==null){
+        this.addItem.f_material_price = 0
+      }
+      this.addItem.f_material_price = this.$appdata.getSingleValue(val)
+    }
+  },
+  watch: {
+    'typeNumberList'(){
+     this.addItem.f_typenumber=null
+     this.addItem.f_material_price = 0
+     },
+    'typeNameList'() {
+      this.addItem.f_typename = null
+      this.addItem.f_typenumber = null
+      this.addItem.f_material_price = 0
+    }
+  }
+}
+
+</script>
+
+
+<style scoped>
+table {
+  border-collapse: collapse;
+  border-spacing: 0;
+  width: 100%;
+}
+
+table, td, th {
+  padding: 0;
+  border: 1px solid black
+}
+
+tr {
+  height: 34px;
+}
+
+#DynamicForm input {
+  text-align: center;
+}
+
+</style>

package/src/components/product/Process/Processes/materialshoufei.vue

@@ -120,7 +120,7 @@ export default {
     },
     // 模态框确定按钮保存数据
     async addpaydipetail() {
-      if(this.addItem.f_material_number==''||this.addItem.f_material_number==null||this.addItem.f_material_number==0){
+      if( this.addItem.f_material_number==''|| Number(this.addItem.f_material_number)<0){
         //提示数量不能为空
         this.$showMessage('请输入数量必须大于0', 'warning')
         return