apply-clients 3.5.3-74 → 3.5.3-76

package/package.json

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

package/src/filiale/siyangRH/PC/ServiceControl.vue

@@ -520,7 +520,6 @@ export default {
 
     async checkfileBefore() {
       var num = await this.checkfile()
-      this.checkfile()
       if (num === 0) {
         this.$showAlert(`请上传${this.show_data.defname}附件！！！`, 'warning', 3000)
         throw null

package/src/filiale/siyangRH/PC/addMaterialScience.vue

@@ -6,11 +6,11 @@
           <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">使用材料数量</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>
             <button type="button" class="btn btn-info head-but" v-if="$parent.$parent.mark === 0"
@@ -32,7 +32,7 @@
             <nobr>{{row.f_material_style}}</nobr>
           </td>
           <td style="text-align: center;">
-            <nobr>{{row.f_material_price}}</nobr>
+            <nobr>{{row.f_material_unit}}</nobr>
           </td>
           <td style="text-align: center;">
             <nobr>{{row.f_material_number}}</nobr>
@@ -44,7 +44,7 @@
             <nobr>{{row.f_use_material_number}}</nobr>
           </td>
           <td style="text-align: center;">
-            <nobr>{{$parent.$parent.getprice(row)}}</nobr>
+            <nobr>{{row.f_material_code}}</nobr>
           </td>
           <td style="text-align: center;">
             <button type="button" class="button_search button_spacing" @click="$parent.$parent.updateMaterial($index,row)">修改</button>
@@ -124,16 +124,6 @@
               />
             </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_price"
-                     :value="item.f_material_price"
-              />
-            </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">
@@ -164,6 +154,16 @@
               />
             </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=""
+                     placeholder="材料标识"
+                     v-model="item.f_material_code"
+                     :value.sync="item.f_material_code"
+              />
+            </div>
+          </div>
         </div>
       </article>
       <footer slot="modal-footer" class="modal-footer">
@@ -180,7 +180,6 @@
 <script>
   import {HttpResetClass} from 'vue-client'
   import Vue from "vue";
-  import {number} from "echarts/lib/export";
   export default {
     name: 'addMaterialScience',
     props: {
@@ -212,7 +211,6 @@
             f_userinfo_code:'',
             f_ly_material_number:'',
             f_use_material_number:'',
-            f_material_price:'',
           }
         ],
         meterialOptions:[],
@@ -224,11 +222,6 @@
       this.getOnetoManyData()
     },
     methods: {
-      getprice(row){
-      let num=  Number(row.f_material_number)
-        let price= Number(row.f_material_price)
-        return Number(num*price).toFixed(2)
-      },
       async getOnetoManyData () {
         let data = {
           tablename: `t_material_apply`,
@@ -239,7 +232,6 @@
           {data: data},
           {resolveMsg: null, rejectMsg: 'onetomany查询失败'}
         )
-        debugger
         this.onetomany.rows = res.data
       },
       async openMaterialModal () {
@@ -257,7 +249,6 @@
             f_userinfo_code:'',
             f_ly_material_number:'',
             f_use_material_number:'',
-            f_material_price:''
           }
         ],
         this.showMaterialModal = true
@@ -313,7 +304,6 @@
         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_price = material.f_material_price
         this.materials[index].f_material_number = material.f_material_number
         this.materials[index].f_ly_material_number= material.f_ly_material_number
         this.materials[index].f_use_material_number= material.f_use_material_number
@@ -324,21 +314,6 @@
       async addMaterial () {
         console.log("登录信息：",this.$login.f)
         this.title = '新增'
-        for (let i = 0; i < this.materials.length; i++) {
-          if (this.materials[i].material === '') {
-            this.$showMessage('请选择材料!!!')
-            return
-          }
-          if(this.materials[i].f_use_material_number==''){
-            this.materials[i].f_use_material_number=0
-          }
-          if(this.materials[i].f_ly_material_number==''){
-            this.materials[i].f_ly_material_number=0
-          }
-          if(this.materials[i].f_material_number==''){
-            this.materials[i].f_material_number=0
-          }
-        }
         let data = {
           f_process_id : this.selectdata.f_process_id,
           f_operator_id: this.$login.f.id,
@@ -389,7 +364,6 @@
             f_material_unit:row.f_material_unit,
             f_material_number:row.f_material_number,
             f_ly_material_number:row.f_ly_material_number,
-            f_material_price:row.f_material_price,
             f_use_material_number:row.f_use_material_number,
             f_material_code:row.f_material_code,
             f_userinfo_code:row.f_userinfo_code,
@@ -409,14 +383,6 @@
         data.f_material_code = this.materials[0].f_material_code
         data.f_bjq_sid = this.materials[0].f_bjq_sid
         data.f_userinfo_code = this.materials[0].f_userinfo_code
-        if(Number(data.f_ly_material_number)>Number(data.f_material_number)){
-          this.$showMessage('领料数量不能大于计划数量!!!')
-          return '领料数量不能大于计划数量'
-        }
-        if(Number(data.f_use_material_number)>Number(data.f_ly_material_number)){
-          this.$showMessage('使用量不能大于领料数量!!!')
-          return '使用量数量不能大于领料数量'
-        }
         //报警器流程 设备编号检验
         await this.bjqCheck()
         if (this.bjqChecklag.length > 0){

package/src/filiale/siyangRH/android/AppServiceControl.vue

@@ -775,6 +775,13 @@ export default {
         }
       }))
     },
+    //手机端不校验
+    async checkfileBefore() {
+       return true
+    },
+    async designBefore() {
+      return true
+    },
     // 获取集收单位
     async getArea () {
       let data = {

package/src/filiale/yangchunboneng/android/AppServiceControl.vue

@@ -484,17 +484,17 @@ export default {
         'POST',
         `${this.$androidUtil.getProxyUrl()}/rs/sql/apply_singleTable`,
         {data: data},
-        {resolveMsg: null, rejectMsg: '集收单位查询失败！！！'}
+        {resolveMsg: null, rejectMsg: '小区查询失败！！！'}
       )
 
-      this.setLabelOptions('集收单位', res.data.map(item => {
+      this.setLabelOptions('小区', res.data.map(item => {
         return {
           label: item.f_residential_area,
           value: item.f_residential_area
         }
       }))
     },
-    // 获取集收单位
+    // 获取小区
     async getArea () {
       let data = {
         tablename: 't_area',
@@ -505,7 +505,7 @@ export default {
         'POST',
         `${this.$androidUtil.getProxyUrl()}/rs/sql/apply_singleTable`,
         {data: data},
-        {resolveMsg: null, rejectMsg: '集收单位查询失败！！！'}
+        {resolveMsg: null, rejectMsg: '小区查询失败！！！'}
       )
 
       return res.data.map(item => {
@@ -565,7 +565,7 @@ export default {
 
       for (const item of this.show_data.fields) {
         if (f_address_type === '民用市区') {
-          if (item.label === '区/县' || item.label === '街道/乡镇' || item.label === '集收单位' || item.label === '门牌号') {
+          if (item.label === '区/县' || item.label === '街道/乡镇' || item.label === '小区' || item.label === '门牌号') {
             item.hidden = false
             item.required = true
           }
@@ -578,7 +578,7 @@ export default {
           }
         }
         if (f_address_type === '民用乡镇') {
-          if (item.label === '区/县' || item.label === '街道/乡镇' || item.label === '集收单位' || item.label === '门牌号') {
+          if (item.label === '区/县' || item.label === '街道/乡镇' || item.label === '小区' || item.label === '门牌号') {
             item.hidden = false
             item.required = true
           }
@@ -599,7 +599,7 @@ export default {
             item.hidden = false
             item.required = true
           }
-          if (item.label === '集收单位') {
+          if (item.label === '小区') {
             item.hidden = false
             item.required = false
           }
@@ -1268,7 +1268,7 @@ export default {
         if (
           this.show_data.fields[index].label === '区/县' ||
           this.show_data.fields[index].label === '街道/乡镇' ||
-          this.show_data.fields[index].label === '集收单位' ||
+          this.show_data.fields[index].label === '小区' ||
           this.show_data.fields[index].label === '楼号/组' ||
           this.show_data.fields[index].label === '单元/排' ||
           this.show_data.fields[index].label === '楼层' ||
@@ -1276,7 +1276,7 @@ export default {
         ) {
           let f_pcd = this.getLableValue('区/县') || ''
           let f_street = this.getLableValue('街道/乡镇') || ''
-          let f_residential_area = this.getLableValue('集收单位') || ''
+          let f_residential_area = this.getLableValue('小区') || ''
           let f_building = this.getLableValue('楼号/组') || ''
           let f_building_suffix = f_building ? '号楼' : ''
           let f_unit = this.getLableValue('单元/排') || ''
@@ -1325,7 +1325,7 @@ export default {
         return
       }
 
-      this.setLabelValue('集收单位', null)
+      this.setLabelValue('小区', null)
 
       let data = {
         tablename: 't_area',
@@ -1336,10 +1336,10 @@ export default {
               'POST',
               `${this.$androidUtil.getProxyUrl()}/rs/sql/apply_singleTable`,
               {data: data},
-              {resolveMsg: null, rejectMsg: '集收单位查询失败！！！'}
+              {resolveMsg: null, rejectMsg: '小区查询失败！！！'}
       )
 
-      this.setLabelOptions('集收单位', res.data.map(item => {
+      this.setLabelOptions('小区', res.data.map(item => {
         return {
           label: item.f_residential_area,
           value: item.f_residential_area
@@ -1381,7 +1381,7 @@ export default {
       }
 
       this.setLabelValue('街道/乡镇', null)
-      this.setLabelValue('集收单位', null)
+      this.setLabelValue('小区', null)
 
 
 
@@ -1428,11 +1428,11 @@ export default {
     // 地址类型失去焦点
     'addressTypeChange' (index) {
       this.setLabelValue('街道/乡镇', null)
-      this.setLabelValue('集收单位', null)
+      this.setLabelValue('小区', null)
       let f_address_type = this.show_data.fields[index].value
       for (const item of this.show_data.fields) {
         if (f_address_type === '民用市区') {
-          if (item.label === '区/县' || item.label === '街道/乡镇' || item.label === '集收单位' || item.label === '门牌号') {
+          if (item.label === '区/县' || item.label === '街道/乡镇' || item.label === '小区' || item.label === '门牌号') {
             item.hidden = false
             item.required = true
             item.value = null
@@ -1448,7 +1448,7 @@ export default {
           }
         }
         if (f_address_type === '民用乡镇') {
-          if (item.label === '区/县' || item.label === '街道/乡镇' || item.label === '集收单位' || item.label === '门牌号') {
+          if (item.label === '区/县' || item.label === '街道/乡镇' || item.label === '小区' || item.label === '门牌号') {
             item.hidden = false
             item.required = true
             item.value = null
@@ -1474,7 +1474,7 @@ export default {
             item.required = true
             item.value = null
           }
-          if (item.label === '集收单位') {
+          if (item.label === '小区') {
             item.hidden = false
             item.required = false
             item.value = null
@@ -1502,14 +1502,14 @@ export default {
               'POST',
               `${this.$androidUtil.getProxyUrl()}/rs/sql/apply_singleTable`,
               {data: data},
-              {resolveMsg: null, rejectMsg: '集收单位查询失败！！！'}
+              {resolveMsg: null, rejectMsg: '小区查询失败！！！'}
       )
 
       if (res.data.length === 0) {
         return
       }
 
-      this.setLabelOptions('集收单位', res.data.map(item => {
+      this.setLabelOptions('小区', res.data.map(item => {
         return {
           label: item.f_residential_area,
           value: item.f_residential_area
@@ -1527,14 +1527,14 @@ export default {
               'POST',
               `${this.$androidUtil.getProxyUrl()}/rs/sql/apply_singleTable`,
               {data: data},
-              {resolveMsg: null, rejectMsg: '集收单位查询失败！！！'}
+              {resolveMsg: null, rejectMsg: '小区查询失败！！！'}
       )
 
       if (res.data.length === 0) {
         return
       }
 
-      this.setLabelOptions('集收单位', res.data.map(item => {
+      this.setLabelOptions('小区', res.data.map(item => {
         return {
           label: item.f_residential_area,
           value: item.f_residential_area