apply-clients 3.2.50 → 3.2.51

package/src/components/product/Ledger/QinhuaMaterial/PickingRecord/PickingInformation.vue

@@ -12,6 +12,8 @@
                 :value.sync="model.f_cea_number"
                 v-model="model.f_cea_number"
                 :options="ceaList"
+                :timeout="500"
+                @select-search="select_search"
                 :valueSingle="true"></input-select>
             </div>
           </div>
@@ -28,7 +30,7 @@
                   <th style="white-space: nowrap;">数量</th>
                   <th style="white-space: nowrap;">备注</th>
                   <th style="white-space: nowrap;">
-                    <button :disabled="!model.f_cea_number" @click="$parent.$parent.showModal = !$parent.$parent.showModal" type="button" class="btn btn-info">
+                    <button :disabled="!model.f_cea_number" @click="$parent.$parent.showModal2()" type="button" class="btn btn-info">
                       <span class="glyphicon glyphicon-plus" aria-hidden="true"></span>
                     </button>
                   </th>
@@ -65,46 +67,43 @@
           <span class="modal-title"><font size="3">添加材料</font></span>
         </header>
         <article slot="modal-body" class="form-horizontal modal-body clearfix">
-          <div class="col-sm-12 form-group" :class="[$mv.f_material_name.required ? 'has-error' : '']">
-            <label class="control-label col-sm-2">材料名称</label>
+          <div class="col-sm-12 form-group" :class="[$mv.material.required ? 'has-error' : '']">
+            <label class="control-label col-sm-2">选择材料</label>
             <div class="col-sm-9">
-              <input type="text" v-show="false" v-model="material.f_material_name" v-validate:f_material_name = "['required']" >
+              <input type="text" v-show="false" v-model="material.id" v-validate:material = "['required']" >
               <input-select
                 class="select select_list"
-                :value.sync="material.f_material_name"
-                v-model="material.f_material_name"
-                :options="f_material_name"
+                :value.sync="material"
+                v-model="material"
+                :options="contractMaterial"
+                @change="changeMaterial()"
+                :timeout="500"
+                @select-search="select_material_search"
                 :valueSingle="true"></input-select>
             </div>
           </div>
+          <div class="col-sm-12 form-group" :class="[$mv.f_material_name.required ? 'has-error' : '']">
+            <label class="control-label col-sm-2">材料名称</label>
+            <div class="col-sm-9">
+              <input class="form-control" type="text" readonly v-validate:f_material_name = "['required']" v-model="material.f_material_name" :value="material.f_qhmaterial_name"/>
+            </div>
+          </div>
           <div class="col-sm-12 form-group" :class="[$mv.f_material_model.required ? 'has-error' : '']">
             <label class="control-label col-sm-2">材料型号</label>
             <div class="col-sm-9">
-              <input type="text" v-show="false" v-model="material.f_material_model" v-validate:f_material_model = "['required']" >
-              <input-select
-                class="select select_list"
-                :value.sync="material.f_material_model"
-                v-model="material.f_material_model"
-                :options="f_material_model"
-                :valueSingle="true"></input-select>
+              <input class="form-control" type="text" readonly v-validate:f_material_model = "['required']" v-model="material.f_material_model" :value="material.f_qhmaterial_model"/>
             </div>
           </div>
           <div class="col-sm-12 form-group" :class="[$mv.f_material_norm.required ? 'has-error' : '']">
             <label class="control-label col-sm-2">材料规格</label>
             <div class="col-sm-9">
-              <input type="text" v-show="false" v-model="material.f_material_norm" v-validate:f_material_norm = "['required']" >
-              <input-select
-                class="select select_list"
-                :value.sync="material.f_material_norm"
-                v-model="material.f_material_norm"
-                :options="f_material_norm"
-                :valueSingle="true"></input-select>
+              <input class="form-control" type="text" readonly v-validate:f_material_norm = "['required']" v-model="material.f_material_norm" :value="material.f_qhmaterial_norm"/>
             </div>
           </div>
           <div class="col-sm-12 form-group" :class="[$mv.f_unit.required ? 'has-error' : '']">
             <label class="control-label col-sm-2">单&emsp;&emsp;位</label>
             <div class="col-sm-9">
-              <input class="form-control" type="text" v-validate:f_unit = "['required']" v-model="material.f_unit" :value="material.f_unit" />
+              <input class="form-control" type="text" readonly  v-validate:f_unit = "['required']" v-model="material.f_unit" :value="material.f_qhunit" />
             </div>
           </div>
           <div class="col-sm-12 form-group" :class="[$mv.f_stock.required ? 'has-error' : '']">
@@ -139,26 +138,78 @@
 
 <script>
 import {isEmpty} from '../../../../Util'
+import {HttpResetClass} from "vue-client";
 
 export default {
   title: '材料详细信息',
   data () {
     return {
-      f_material_name:[{label:'全部',value:''},... this.$appdata.getParam('秦华材料名称')],
-      f_material_model:[{label:'全部',value:''},... this.$appdata.getParam('秦华材料型号')],
-      f_material_norm:[{label:'全部',value:''},... this.$appdata.getParam('秦华材料规格')],
+
+      // f_material_name:[{label:'全部',value:''},... this.$appdata.getParam('秦华材料名称')],
+      // f_material_model:[{label:'全部',value:''},... this.$appdata.getParam('秦华材料型号')],
+      // f_material_norm:[{label:'全部',value:''},... this.$appdata.getParam('秦华材料规格')],
       ceaList: [],
       model: {
         data: []
       },
       material: {},
       showModal: false,
+      contractMaterial: []
     }
   },
   ready () {
     this.getCEAList()
   },
   methods: {
+    select_material_search(text1){
+      debugger
+      console.log("----------------"+text1)
+      debugger
+      if(text1){
+        let clText=text1=`and f_qhmaterial_name like '%${text1}%'`
+        new HttpResetClass().load("POST", `${this.$androidUtil.getProxyUrl()}/rs/sql/singleTable`, {data:{items:"*",tablename:"t_qinhua_material",condition:`1=1 ${clText} `}}, {resolveMsg: null, rejectMsg: null}).then((res)=>{
+          console.log('请求发送完成！！！！！'+JSON.stringify(res))
+          if(res.data.length>0){
+            res.data.forEach((item)=>{
+
+              this.contractMaterial.push({
+                'label':  `${item.f_qhmaterial_name}--${item.f_qhmaterial_model}--${item.f_qhmaterial_norm}--${item.f_qhunit}`,
+                'value': item
+              })
+            })
+          }
+        })
+      }else{
+        this.getContractMaterial()
+      }
+    },
+    select_search(text){
+      debugger
+      console.log("----------------"+text)
+      debugger
+      if(text){
+        let pcdText=text=`and f_cea_number like '%${text}%'`
+        new HttpResetClass().load("POST", `${this.$androidUtil.getProxyUrl()}/rs/sql/singleTable`, {data:{items:"*",tablename:"t_apply",condition:`f_cea_number is not null and f_sub_state != '完工' ${pcdText} `}}, {resolveMsg: null, rejectMsg: null}).then((res)=>{
+          console.log('请求发送完成！！！！！'+JSON.stringify(res))
+          if(res.data.length>0){
+            res.data.forEach((item)=>{
+
+              this.ceaList.push({
+                'label': item.f_cea_number,
+                'value': {
+                  id: item.id,
+                  f_cea_number: item.f_cea_number,
+                  f_entry_name: item.f_entry_name,
+                  f_construction_team:item.f_construction_team
+                }
+              })
+            })
+          }
+        })
+      }else{
+        this.getCEAList()
+      }
+    },
     addMaterial () {
       this.$dispatch('addMaterial', this.model)
     },
@@ -169,6 +220,31 @@ export default {
 
       this.showModal = true
     },
+    async showModal2(){
+      this.showModal=!this.showModal
+      await this.getContractMaterial()
+
+      this.showMaterial = true
+    },
+    async getContractMaterial () {
+      debugger
+      let data = {
+        condition: `1=1`
+      }
+
+      let res = await this.$resetpost(
+        `rs/sql/getQhMaterial`,
+        {data: data},
+        {resolveMsg: null, rejectMsg: '秦华物料查询失败！！！'}
+      )
+debugger
+      res.data.forEach(item => {
+        this.contractMaterial.push({
+          'label': `${item.f_qhmaterial_name}--${item.f_qhmaterial_model}--${item.f_qhmaterial_norm}--${item.f_qhunit}`,
+          'value': item
+        })
+      })
+    },
     // 删除
     async delete (index) {
       this.index = index
@@ -211,10 +287,26 @@ export default {
 
       this.closeModal()
     },
+    changeMaterial () {
+      if (!isEmpty(this.material.id)) {
+        let flag = this.model.data.some(item => {
+          if (item.id === this.material.id) {
+            return true
+          }
+          return false
+        })
+        if (flag) {
+          this.$showAlert('该物料已经存在，如需再次添加，请进行修改操作！！！', 'warning', 3000)
+          this.closeModal()
+        }
+      }
+    },
     closeModal () {
+      debugger
       this.material = {}
       this.index = null
       this.showModal = false
+      this.contractMaterial = []
     },
     async getCEAList () {
       let data = {

package/src/components/product/Ledger/QinhuaMaterial/PickingRecord/PickingMaterialDepot.vue

@@ -0,0 +1,113 @@
+<template>
+  <div class="flex-row">
+    <div class="basic-main">
+      <div :class="showData ? 'top' : 'auto'">
+        <picking-material-list v-ref:query :show-data="showData"></picking-material-list>
+      </div>
+      <div v-if="showAdd" style="margin-top: 20px;height: 90%" >
+        <tabset v-ref:tabs :close="false">
+          <tab header='材料信息'>
+            <picking-adding-material></picking-adding-material>
+          </tab>
+        </tabset>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+
+  import {HttpResetClass} from 'vue-client'
+  import Vue from 'vue'
+  export default {
+    title: '添加材料',
+    data () {
+      return {
+        showData: true,
+        showtotal: false,
+        showAdd: false,
+        showAddold:false,
+        facility: {},
+        type: null
+      }
+    },
+    ready () {
+    },
+    methods: {
+    },
+    events: {
+      // 打开详情
+      'openViewFacility' (facility) {
+        this.type = 'view'
+        this.facility = facility
+        this.showData = false
+        this.showtotal = false
+        this.$refs.query.$refs.cp.pager = false
+
+        this.$nextTick(() => {
+          this.showtotal = true
+        })
+      },
+      // 添加设备
+      async 'addFacility' (data) {
+        data.user = this.$login.f
+
+        let res = await this.$resetpost('rs/logic/addFacility', {data: data}, {
+          resolveMsg: null,
+          rejectMsg: '添加设备失败！！！'
+        })
+
+        this.$refs.query.search()
+      },
+      // 添加老旧设备
+      async 'addoldFacility' (data) {
+        data.user = this.$login.f
+
+        let res = await this.$resetpost('rs/logic/addqhMaterial', {data: data}, {
+          resolveMsg: null,
+          rejectMsg: '添加材料失败！！！'
+        })
+
+        this.$refs.query.search()
+      },
+     // 打开添加设备
+      async 'openAddFacility' () {
+        this.showData = false
+        this.showtotal = false
+
+        this.$refs.query.$refs.cp.pager = false
+
+        this.showAdd = false
+        this.$nextTick(() => {
+          this.showAdd = true
+        })
+      },
+      // 打开添加老旧设备
+      async 'openAddoldFacility' () {
+        this.showData = false
+        this.showtotal = false
+
+        this.$refs.query.$refs.cp.pager = false
+
+        this.showAddold = false
+        this.$nextTick(() => {
+          this.showAddold = true
+        })
+      },
+      //查询
+      'search' () {
+        // 关闭详细
+        this.showtotal = false
+        // 显示列表数据
+        this.showData = true
+        // 显示分页
+        this.$refs.query.$refs.cp.pager = true
+        // 调用查询
+        this.$refs.query.$refs.cp.$refs.cri.search()
+      }
+    }
+  }
+</script>
+
+<style scoped>
+</style>

package/src/components/product/Ledger/QinhuaMaterial/PickingRecord/PickingMaterialList.vue

@@ -0,0 +1,143 @@
+<template>
+  <criteria-paged :model="model" v-ref:cp>
+    <criteria partial='criteria' @condition-changed='search' v-ref:cri>
+      <div class="form-horizontal select-overspread container-fluid auto" partial>
+        <div class="row">
+          <div class="form-group col-sm-3">
+            <label class="font_normal_body">材料名称：</label>
+            <input type="text" style="width: 60%" class="input_search" placeholder='材料名称' v-model="model.f_qhmaterial_name"
+                   v-on:keyup.enter="$parent.$parent.search()"
+                   condition="f_qhmaterial_name like '%{}%'">
+          </div>
+          <div class="form-group col-sm-3">
+            <label class="font_normal_body">材料编码：</label>
+            <input type="text" style="width: 60%" class="input_search" placeholder='材料名称' v-model="model.f_qhmaterial_coding"
+                   v-on:keyup.enter="$parent.$parent.search()"
+                   condition="f_qhmaterial_coding like '%{}%'">
+          </div>
+          <div class="form-group col-sm-3">
+            <label class="font_normal_body">材料型号：</label>
+            <input type="text" style="width: 60%" class="input_search" placeholder='材料型号' v-model="model.f_qhmaterial_model"
+                   v-on:keyup.enter="$parent.$parent.search()"
+                   condition="f_qhmaterial_model like '%{}%'">
+          </div>
+          <div class="form-group col-sm-3">
+            <label class="font_normal_body">材料规格：</label>
+            <input type="text" style="width: 60%" class="input_search" placeholder='材料规格' v-model="model.f_qhmaterial_norm"
+                   v-on:keyup.enter="$parent.$parent.search()"
+                   condition="f_qhmaterial_norm like '%{}%'">
+          </div>
+          <div class="form-group col-sm-3">
+            <label class="font_normal_body">单&emsp;&emsp;位：</label>
+            <input type="text" class="input_search" style="width: 60%" placeholder='单位' v-model="model.f_qhunit"
+                   v-on:keyup.enter="$parent.$parent.search()"
+                   condition="f_qhunit like '%{}%'">
+          </div>
+          <div class="form-group col-sm-3 button-range">
+            <button class="button_search button_spacing" @click="$parent.$parent.search()" v-el:cx>查询</button>
+            <button class="button_clear button_spacing"  @click="$parent.$parent.clear()">清空</button>
+            <button class="button_new button_spacing"  @click="$parent.$parent.openAddFacility()">添加材料</button>
+          </div>
+        </div>
+      </div>
+    </criteria>
+    <data-grid v-if="$parent.showData"  :model="model" partial='list' v-ref:grid style="overflow: auto" class="list_area table_sy">
+      <template partial='head'>
+        <tr>
+          <th style="white-space: nowrap;">序号</th>
+          <th style="white-space: nowrap;">材料编码</th>
+          <th style="white-space: nowrap;">材料名称</th>
+          <th style="white-space: nowrap;">材料型号</th>
+          <th style="white-space: nowrap;">材料规格</th>
+          <th style="white-space: nowrap;">单位</th>
+          <th style="white-space: nowrap;">备注</th>
+        </tr>
+      </template>
+      <template partial='body'>
+        <tr >
+          <td style="text-align: center;" @click="$parent.$parent.$parent.openViewFacility(row)">
+            <nobr><font>{{$index+1}}</font></nobr>
+          </td>
+          <td style="text-align: center;" @click="$parent.$parent.$parent.openViewFacility(row)">
+            <nobr><font>{{row.f_qhmaterial_coding}}</font></nobr>
+          </td>
+          <td style="text-align: center;" @click="$parent.$parent.$parent.openViewFacility(row)">
+            <nobr><font>{{row.f_qhmaterial_name}}</font></nobr>
+          </td>
+          <td style="text-align: center;" @click="$parent.$parent.$parent.openViewFacility(row)">
+            <nobr><font>{{row.f_qhmaterial_model}}</font></nobr>
+          </td>
+          <td style="text-align: center;" @click="$parent.$parent.$parent.openViewFacility(row)">
+            <nobr><font>{{row.f_qhmaterial_norm}}</font></nobr>
+          </td>
+          <td style="text-align: center;" @click="$parent.$parent.$parent.openViewFacility(row)">
+            <nobr><font>{{row.f_qhunit}}</font></nobr>
+          </td>
+          <td style="text-align: center;" @click="$parent.$parent.$parent.openViewFacility(row)">
+            <nobr><font>{{row.f_qhremarks}}</font></nobr>
+          </td>
+        </tr>
+      </template>
+    </data-grid>
+  </criteria-paged>
+</template>
+
+<script>
+  import {PagedList} from 'vue-client'
+  import {HttpResetClass} from 'vue-client'
+  // Date格式化
+  Date.prototype.Format = function (fmt) {
+    var o = {
+      'M+': this.getMonth() + 1, // 月份
+      'd+': this.getDate(), // 日
+      'H+': this.getHours(), // 小时
+      'm+': this.getMinutes(), // 分
+      's+': this.getSeconds(), // 秒
+      'q+': Math.floor((this.getMonth() + 3) / 3), // 季度
+      'S': this.getMilliseconds() // 毫秒
+    }
+    if (/(y+)/.test(fmt)) fmt = fmt.replace(RegExp.$1, (this.getFullYear() + '').substr(4 - RegExp.$1.length))
+    for (var k in o) {
+      if (new RegExp('(' + k + ')').test(fmt)) fmt = fmt.replace(RegExp.$1, (RegExp.$1.length === 1) ? (o[k]) : (('00' + o[k]).substr(('' + o[k]).length)))
+    }
+    return fmt
+  }
+  export default {
+    title: '材料列表',
+    props: ['showData'],
+    data () {
+      return {
+        model: new PagedList('rs/sql/getQhMaterial', 30, {
+          data: {
+            orgid: this.$login.f.orgid
+          }
+        }),
+        criteriaShow: false
+      }
+    },
+    ready () {
+      // 调用查询
+      this.search()
+    },
+    methods: {
+      // 打开添加设备
+      openAddFacility () {
+        this.$dispatch('openAddFacility')
+      },
+      clear () {
+        Object.keys(this.$refs.cp.$refs.cri.model).forEach((key) => {
+          this.$refs.cp.$refs.cri.model[key] = null
+        })
+      },
+      // 查询
+      search () {
+        this.$dispatch('search')
+      }
+    },
+    computed: {
+    }
+  }
+</script>
+
+<style scoped>
+</style>

package/src/components/product/Ledger/Supervisory/ProcessSupervisory.vue

@@ -154,6 +154,14 @@ export default {
       this.$refs.query.$refs.cp.pager = true
       // 调用查询
       this.$refs.query.$refs.cp.$refs.cri.search()
+    },
+    'comeback' () {
+      // 关闭详细
+      this.showtotal = false
+      // 显示列表数据
+      this.showData = true
+      // 显示分页
+      this.$refs.query.$refs.cp.pager = true
     }
   },