apply-clients 3.2.50 → 3.2.53

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

@@ -0,0 +1,330 @@
+<template>
+  <div class="select-overspread" style="background-color: #ffffff;padding: 20px;overflow: scroll">
+    <form class="form-horizontal">
+      <div class="form-group">
+        <!-- 添加设备 -->
+        <validator name="v">
+          <div class="col-sm-12">
+            <data-grid :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>
+                  <th style="white-space: nowrap;">
+                    <button @click="$parent.$parent.openModal()" type="button" class="btn btn-info">
+                      <span class="glyphicon glyphicon-plus" aria-hidden="true"></span>
+                    </button>
+                    <a href="/download/秦华材料批量导入模板.xlsx" type="button" class="btn btn-info">模板下载</a>
+                    <button @click="$parent.$parent.showFile = !$parent.$parent.showFile" type="button" class="btn btn-info">批量导入</button>
+                  </th>
+                </tr>
+              </template>
+              <template partial='body'>
+                <tr>
+                  <td style="text-align: center;">{{$index+1}}</td>
+                  <td style="text-align: center;">{{row.f_qhmaterial_coding}}</td>
+                  <td style="text-align: center;">{{row.f_qhmaterial_name}}</td>
+                  <td style="text-align: center;">{{row.f_qhmaterial_model}}</td>
+                  <td style="text-align: center;">{{row.f_qhmaterial_norm}}</td>
+                  <td style="text-align: center;">{{row.f_qhunit}}</td>
+                  <td style="text-align: center;">{{row.f_qhremarks}}</td>
+                  <td style="text-align: center;">
+                    <button type="button" name="button" class="btn btn-link" @click="$parent.$parent.openUpdateFacility($index,row)">修改</button>
+                    <button type="button" name="button" class="btn btn-link" @click="$parent.$parent.deleteFacility($index)">删除</button>
+                  </td>
+                </tr>
+              </template>
+            </data-grid>
+          </div>
+          <div class="col-sm-12 form-group" style="text-align: center">
+            <button class="btn btn-primary" :disabled='!($v.valid && model.data.length > 0)' @click.prevent="addoldFacility()">保存</button>
+          </div>
+        </validator>
+
+        <validator name="mv">
+          <modal v-if="showFacility" :show.sync="showFacility" backdrop="false" large>
+            <header slot="modal-header" class="modal-header">
+              <button type="button" class="close" @click="closeModal()"><span>&times;</span></button>
+              <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_qhmaterial_coding.required ? 'has-error' : '']">
+                <label class="control-label col-sm-2">材料编码</label>
+                <div class="col-sm-9">
+                  <input class="form-control" type="text"  v-validate:f_qhmaterial_coding = "['required']" v-model="facility.f_qhmaterial_coding" :value="facility.f_qhmaterial_coding"/>
+                </div>
+              </div>
+              <div class="col-sm-12 form-group" :class="[$mv.f_qhmaterial_name.required ? 'has-error' : '']">
+                <label class="control-label col-sm-2">材料名称</label>
+                <div class="col-sm-9">
+                  <input class="form-control" type="text"  v-validate:f_unit = "['required']" v-model="facility.f_qhmaterial_name" :value="facility.f_qhmaterial_name"/>
+                </div>
+              </div>
+              <div class="col-sm-12 form-group" :class="[$mv.f_qhmaterial_model.required ? 'has-error' : '']">
+                <label class="control-label col-sm-2">材料型号</label>
+                <div class="col-sm-9">
+                  <input class="form-control" type="text" v-validate:f_unit = "['required']"  v-model="facility.f_qhmaterial_model" :value="facility.f_qhmaterial_model"/>
+                </div>
+              </div>
+              <div class="col-sm-12 form-group" :class="[$mv.f_qhmaterial_norm.required ? 'has-error' : '']">
+                <label class="control-label col-sm-2">材料规格</label>
+                <div class="col-sm-9">
+                  <input class="form-control" type="text" v-validate:f_unit = "['required']" v-model="facility.f_qhmaterial_norm" :value="facility.f_qhmaterial_norm"/>
+                </div>
+              </div>
+              <div class="col-sm-12 form-group" :class="[$mv.f_qhunit.required ? 'has-error' : '']">
+                <label class="control-label col-sm-2">单位</label>
+                <div class="col-sm-9">
+                  <input class="form-control" type="text" v-validate:f_unit = "['required']" v-model="facility.f_qhunit" :value="facility.f_qhunit"/>
+                </div>
+              </div>
+              <div class="col-sm-12 form-group" :class="[$mv.f_qhremarks.required ? 'has-error' : '']">
+                <label class="control-label col-sm-2">备注</label>
+                <div class="col-sm-9">
+                  <input class="form-control" type="text"  v-model="facility.f_qhremarks" :value="facility.f_qhremarks"/>
+                </div>
+              </div>
+            </article>
+            <footer slot="modal-footer" class="modal-footer">
+              <button class="btn btn-primary" type="button" @click.prevent="saveOrUpdateFacility()" :disabled='!$mv.valid'>确认</button>
+            </footer>
+          </modal>
+        </validator>
+        <modal :show.sync="showFile" v-ref:modal backdrop="true" title="选择文件">
+          <header slot="modal-header" class="modal-header">
+            <button type="button" class="close" @click="closeFile"><span>&times;</span></button>
+            <h4 class="modal-title">选择文件</h4>
+          </header>
+          <article slot="modal-body" class="modal-body">
+            <div class="form-group">
+              <file-upload class="my-file-uploader" name="useraddressUploadFile" action="rs/file/uploadFile" tagname="确定" multiple v-ref:file></file-upload>
+            </div>
+          </article>
+          <footer slot="modal-footer" class="modal-footer"></footer>
+        </modal>
+      </div>
+    </form>
+  </div>
+</template>
+
+<script>
+  import {HttpResetClass} from 'vue-client'
+  import {isEmpty} from '../../../../Util'
+  export default {
+    title: '设备信息',
+    data () {
+      return {
+        showFile:false,
+        contractList: [],
+        contract: {},
+        material: {},
+        contractFacility: [],
+        model: {
+          data: []
+        },
+        showFacility: false,
+        facility: {},
+        index: null
+      }
+    },
+    ready () {
+    },
+    methods: {
+      closeFile () {
+        this.showFile = false
+        // 将选的文件清空
+        this.$refs.file.$el.querySelector('input').value = ''
+      },
+      // 添加设备
+      addoldFacility () {
+        let data = {
+          contract: this.contract,
+          data: this.model.data
+        }
+        this.$dispatch('addoldFacility', data)
+      },
+      // 打开修改
+      async openUpdateFacility (index, facility) {
+        await this.getContractFacility()
+
+        this.index = index
+        this.facility = JSON.parse(JSON.stringify(facility))
+
+        this.showFacility = true
+      },
+      // 删除
+      async deleteFacility (index) {
+        this.index = index
+        await this.$showMessage('您确定要删除这条记录吗？').then((res) => {
+          if (res === 'confirm') {
+            this.model.data.splice(this.index, 1)
+          }
+        })
+        this.closeModal()
+      },
+      // 添加或修改
+      saveOrUpdateFacility () {
+        debugger
+          let flag = this.model.data.some(item => {
+            debugger
+            if (
+              item.f_qhmaterial_coding === this.facility.f_qhmaterial_coding &&
+              item.f_qhmaterial_name === this.facility.f_qhmaterial_name &&
+              item.f_qhmaterial_norm === this.facility.f_qhmaterial_norm &&
+              item.f_qhmaterial_model === this.facility.f_qhmaterial_model &&
+              item.f_qhunit === this.facility.f_qhunit
+            ) {
+              return true
+            }
+            return false
+          })
+          if (flag) {
+            if (isEmpty(i)) {
+              this.$showAlert('该材料已经存在！！！', 'warning', 3000)
+            } else {
+              throw `第${i}行材料已经存在！！！`
+            }
+
+          } else {
+            if (isEmpty(this.index)) {
+              this.model.data.push(this.facility)
+            } else {
+              this.model.data.splice(this.index, 1, this.facility)
+            }
+          }
+        this.closeModal()
+      },
+      // 关闭
+      closeModal () {
+        this.showFacility = false
+        this.index = null
+        this.facility = null
+        this.contractFacility = []
+      },
+      async openModal () {
+        this.showFacility = true
+      },
+      async getContractFacility () {
+        let data = {
+          tablename: 't_qinhua_material',
+          condition: `1=1`
+        }
+
+        let res = await this.$resetpost(
+          `rs/sql/singleTable`,
+          {data: data},
+          {resolveMsg: null, rejectMsg: '材料查询失败！！！'}
+        )
+debugger
+        res.data.forEach(item => {
+          this.contractFacility.push({
+            'label': `$${item.f_qhmaterial_coding}--${item.f_qhmaterial_name}$--${item.qhmaterial_model}--${item.f_qhmaterial_norm}--${item.f_qhunit}`,
+            'value': item
+          })
+        })
+      },
+    },
+    events: {
+      async 'onFileUpload'(file, result) {
+        let data = {
+          filepath: result.f_downloadpath
+        }
+        let res = await this.$resetpost(`rs/logic/addQhDaoru`, {data:data}, {resolveMsg: null, rejectMsg: '导入失败', silent: true}, 0)
+
+        console.log('----------解析内容--------------')
+        console.log(res.data)
+
+        let i = 1
+        for (const item of res.data) {
+          debugger
+            this.facility = item.qinhua_material
+
+          try {
+            this.saveOrUpdateFacility(i)
+          } catch (e) {
+            this.$showAlert(e, 'danger', 3000)
+            this.closeFile()
+            return
+          }
+          i++
+          }
+
+        this.$showAlert(`成功导入${i}条数据`, 'success', 3000)
+        this.closeFile()
+      }
+    }
+  }
+</script>
+
+<style scoped>
+  .item{
+    height: 40px;
+    margin-bottom: 20px;
+  }
+
+  th{
+    font-size: 15px !important;
+    text-align: center !important;
+    background-color: #dfedfb!important;
+    color: #666666 !important;
+    font-family: PINGFANG-BOLD !important;
+    font-weight: normal!important;
+  }
+  /*清除model中的浮动*/
+  .clearfix:after,.clearfix:before{
+    display: table;
+  }
+  .clearfix:after{
+    clear: both;
+  }
+
+  .input_view{
+    padding: 8px;
+    background-color: #ffffff;
+    border-radius: 2px;
+    border: solid 1px #c7c7c7!important;
+    color: #333333!important;
+    font-size: 15px!important;
+  }
+
+  .input_view[readonly]{
+    border: 1px solid #DDD!important;
+    /*background-color: #F5F5F5;*/
+    color:#ACA899!important;
+  }
+  .input_view:disabled{
+    border: 1px solid #DDD!important;
+    /*background-color: #F5F5F5;*/
+    color:#ACA899!important;
+  }
+
+  .control-label-justify {
+    display: inline-block;
+    vertical-align: top;
+    width: 110px;
+    text-align: justify;
+    font-family: PingFang-SC-Bold;
+  }
+
+  .control-label-justify::after {
+    content: "";
+    display: inline-block;
+    width: 70px;
+    overflow: hidden;
+    height: 0;
+  }
+
+  input::-webkit-outer-spin-button,
+  input::-webkit-inner-spin-button {
+    -webkit-appearance: none;
+  }
+
+  input[type="number"] {
+    -moz-appearance: textfield;
+  }
+</style>

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>