apply-clients 3.0.4 → 3.0.5-ys

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

@@ -1,25 +1,19 @@
 <template>
   <div class="auto">
-    <div class="form-inline auto" style="margin-bottom: 5px;">
+    <div class="form-inline auto" style="margin-bottom: 5px;width: 100%" v-if="refreshed">
       <form novalidate class="auto" partial>
-        <div class="col-sm-10">
-
+        <div class="col-sm-12">
           <div class="col-sm-2">
             <div class="col-sm-10">
-              <input type="text" class="form-control" v-model="f_material_operator" v-on:keyup.enter="search"
-                     condition="f_user_name like '{}%'" placeholder="操作人">
+              <v-select :options="f_user_name" placeholder='操作人' condition="f_user_type  = '{}'"
+                        v-model="f_material_operator" :value.sync="f_material_operator" close-on-select>
+              </v-select>
             </div>
           </div>
-
-          <div class="col-sm-1">
-
-          </div>
-
-
           <div class="col-sm-2 ">
-            <div class="col-sm-11 pull-right" >
-              <v-select  :options="f_effective_state" placeholder='有效状态' condition="f_user_type  like '{}%'"
-                         v-model="f_effective_stated"  :value.sync="f_effective_stated"  close-on-select>
+            <div class="col-sm-11 pull-right">
+              <v-select :options="f_effective_state" placeholder='有效状态' condition="f_user_type  = '{}'"
+                        v-model="f_effective_stated" :value.sync="f_effective_stated" close-on-select>
               </v-select>
             </div>
           </div>
@@ -30,29 +24,30 @@
           <!--</v-select>-->
           <!--</div>-->
           <!--</div>-->
-
           <div class="col-sm-1">
             <center>
               <div class="col-sm-12  pull-right">
-                <button type="button" class="btn btn-primary" @click="filterParams(f_material_operator,f_effective_stated,f_picking_stated)">查询</button>
+                <button type="button" class="btn btn-primary"
+                        @click="filterParams(f_material_operator,f_effective_stated,f_picking_stated)">查询
+                </button>
               </div>
-
             </center>
           </div>
-          <div class="col-sm-1">
+          <div class="col-sm-4" style="float: right">
             <center>
-
-              <!--<div class="col-sm-12  pull-right">
-                <button type="button" class="btn btn-warning add-postition" @click="impexcel()" v-show="edit">导入</button>
-              </div>-->
-              <div class="col-sm-12  pull-right">
-                <button type="button" class="btn btn-warning add-postition" @click="addmaterial()" v-show="edit">添加批次</button>
+              <div class="col-sm-6  pull-right">
+                <button type="button" class="btn btn-warning add-postition" @click="addmaterial()"
+                        v-show="edit && showprint">添加批次材料
+                </button>
+              </div>
+              <div class="col-sm-6  pull-right">
+                <button type="button" class="btn btn-warning add-postition" @click="impexcel()" v-show="edit">导入批次材料
+                </button>
               </div>
             </center>
           </div>
         </div>
       </form>
-
       <!-- <button type="button" class="btn btn-primary" @click="filterParams(param)">查询</button>-->
       <!--<button type="button" class="btn btn-warning" @click="add()" v-show="edit">新增</button>-->
       <!--  <div class="form-inline" style="float: right">
@@ -69,20 +64,27 @@
                 <th>报建编号</th>
                 <th>批次操作人</th>
                 <th>导入时间</th>
-                <th >操作</th>
+                <th>操作</th>
               </tr>
             </template>
-            <template partial='body' >
+            <template partial='body'>
               <td @click="$parent.$parent.$parent.showdetail(row.id,row.f_effective_state)">{{$index+1}}</td>
-              <td @click="$parent.$parent.$parent.showdetail(row.id,row.f_effective_state)">{{row.f_effective_state}}</td>
+              <td @click="$parent.$parent.$parent.showdetail(row.id,row.f_effective_state)">{{row.f_effective_state}}
+              </td>
               <!--<td @click="$parent.$parent.$parent.showdetail(row.id)">{{row.f_picking_state}}</td>-->
               <td @click="$parent.$parent.$parent.showdetail(row.id,row.f_effective_state)">{{row.f_apply_num}}</td>
-              <td @click="$parent.$parent.$parent.showdetail(row.id,row.f_effective_state)">{{row.f_material_operator}}</td>
-              <td @click="$parent.$parent.$parent.showdetail(row.id,row.f_effective_state)">{{row.f_batch_importdate}}</td>
+              <td @click="$parent.$parent.$parent.showdetail(row.id,row.f_effective_state)">
+                {{row.f_material_operator}}
+              </td>
+              <td @click="$parent.$parent.$parent.showdetail(row.id,row.f_effective_state)">{{row.f_batch_importdate}}
+              </td>
 
               <!--<td>{{row.f_remarks}}</td>-->
-              <td v-show="edit"><input type="checkbox" v-model="row.f_pay" @click="$parent.$parent.$parent.paychange(row)"/></td>
-              <td class="">
+              <!--<td v-show="$parent.$parent.$parent.edit"><input type="checkbox" v-model="row.f_pay" @click="$parent.$parent.$parent.paychange(row)"/></td>-->
+              <td class="" v-show="$parent.$parent.$parent.showprint">
+                <button type="button" name="button" class="btn btn-link" :disabled="row.f_effective_state == '无效'"
+                @click.stop="$parent.$parent.$parent.export(row)">导出
+                </button>
                 <button type="button" name="button" class="btn btn-link" :disabled="row.f_effective_state == '无效'"
                         @click.stop="$parent.$parent.$parent.tovoid(row)">作废
                 </button>
@@ -97,62 +99,50 @@
       </div>
 
 
-
-
-
-
-
-
-
-
-      <div class="col-sm-12 span recordTable" style="margin-top: 10px;height:auto;" v-if="isShowdetail" >
-        <p class="text-center" style="padding: 8px;font-size: 20px">材料清单
-
-          <button type="button" class="close" @click="isShowdetail=false" aria-hidden="true">&times;</button>
-        </p>
-        <button type="button" class="btn btn-warning add-postition" @click="addDetailed()">添加明细</button>
-        <partial-view v-ref:single-load>
-          <data-grid :model="batchmodel"  v-ref:batchgrid>
-            <template partial='head'>
-              <tr>
-                <th>序号</th>
-                <th>材料名称</th>
-                <th>材料类型</th>
-                <th>材料编码</th>
-                <th>材料规格</th>
-                <th>数量</th>
-                <th>材料单位</th>
-                <th>单价</th>
-                <th v-show="edit">是否缴费</th>
-                <th >操作</th>
-              </tr>
-            </template>
-            <template partial='body'>
-              <td>{{$index+1}}</td>
+      <div class="col-sm-12 span recordTable" style="margin-top: 10px;height:auto;" v-if="isShowdetail">
+        <div style="width: 100%;height: auto">
+          <button type="button" class="btn btn-warning add-postition" v-show="isbuttonshow && showprint"
+                  style="float: right" @click="addDetailed()">添加明细
+          </button>
+        </div>
+        <div style="width: 100%;height: auto;float: left">
+          <table class="table table-bordered table-striped table-hover">
+            <tr style="background-color: #88C78E">
+<!--              <th><font color="white"><nobr>材料编码</nobr></font></th>-->
+              <th><font color="white"><nobr>材料名称</nobr></font></th>
+<!--              <th><font color="white"><nobr>材料类型</nobr></font></th>-->
+<!--              <th><font color="white"><nobr>材料型号</nobr></font></th>-->
+<!--              <th><font color="white"><nobr>材料规格</nobr></font></th>-->
+              <th><font color="white"><nobr>单位</nobr></font></th>
+              <th><font color="white"><nobr>数量</nobr></font></th>
+<!--              <th><font color="white"><nobr>材料单位</nobr></font></th>-->
+              <th><font color="white"><nobr>是否收费</nobr></font></th>
+              <!--<th v-show="$parent.$parent.$parent.edit">是否缴费</th>-->
+              <th>操作</th>
+            </tr>
+            <tr v-for="(j,row) in batchmodel.rows">
+<!--              <td>{{row.f_batch_code}}</td>-->
               <td>{{row.f_batch_name}}</td>
-              <td>{{row.f_batch_type}}</td>
-              <td>{{row.f_batch_code}}</td>
-              <td>{{row.f_batch_norms}}</td>
-              <td>{{row.f_budget_num}}</td>
+<!--              <td>{{row.f_batch_type}}</td>-->
+<!--              <td>{{row.f_batch_version}}</td>-->
+<!--              <td>{{row.f_batch_norms}}</td>-->
               <td>{{row.f_batch_company}}</td>
-              <td>{{row.f_batch_price}}</td>
+              <td>{{row.f_budget_num}}</td>
+
               <!--<td>{{row.f_remarks}}</td>-->
-              <td v-show="edit"><input type="checkbox" v-model="row.f_pay" @click="$parent.$parent.$parent.paychange(row)"/></td>
-              <td class="">
+              <!--<td v-show="$parent.$parent.$parent.edit"><input type="checkbox" v-model="row.f_pay" @click="$parent.$parent.$parent.paychange(row)"/></td>-->
+              <td class="" v-show="showprint">
                 <button type="button" name="button" class="btn btn-link"
-                        @click.stop="$parent.$parent.$parent.modifyParam(row)">修改
+                        @click.stop="modifyParam(row)">修改
+                </button>
+                <button type="button" name="button" class="btn btn-link"
+                @click.stop="deleteItem(row)" >删除
                 </button>
-                <!-- <button type="button" name="button" class="btn btn-link"
-                         @click.stop="$parent.$parent.$parent.deleteItem(row)" >删除
-                 </button>-->
-              </td>
-            </template>
-          </data-grid>
-
-
-
 
-        </partial-view>
+              </td>
+            </tr>
+          </table>
+        </div>
       </div>
     </div>
     <modal :show.sync="addshow" v-ref:modal backdrop="false">
@@ -160,24 +150,17 @@
         <button type="button" class="close" @click="addclose"><span>&times;</span></button>
         <h4 class="modal-title">添加明细</h4>
       </header>
-      <article slot="modal-body" class="modal-body">
-        <div class="col-sm-3 form-group form-input-group" style="width: 100%">
-          <label class="control-label">材料名称</label>
-         <!-- <input type="text" class="form-control" placeholder="材料名称" v-model="model.f_batch_name">-->
-          <v-select :value.sync="model.f_batch_name" v-model="model.f_batch_name"
-                    :options='material' placeholder='请选择' style="width: 50%"
-                    close-on-select search="" >
-          </v-select>
-        </div>
-
-        <div class="col-sm-3 form-group form-input-group" style="width: 100%">
-          <label style="float: left" class="control-label">材料数量</label>
-          <input type="number" class="form-control" placeholder="材料数量" style="width: 50%;float: left" v-model="model.f_budget_num">
+      <article slot="modal-body" class="modal-body" style="max-height: 80vh">
+        <div>
+          <span>输入材料名称搜索</span>
+          <input type="text" v-model="searchName" />
+          <button @click="searchByName" class="btn-info">查询</button>
         </div>
+        <tree2 v-ref:tree2 v-if="addshowm" :menulist="menulist" :scrolltop = "scrollTop"></tree2>
       </article>
-      <footer slot="modal-footer" class="modal-footer">
-        <button type="button" class="btn btn-default" @click='addclose'>取消</button>
-        <button type="button" class="btn btn-success" @click='addconfirm'>确认</button>
+      <footer slot="modal-footer" class="modal-footer flex">
+        <!--<button type="button" class="btn btn-default" @click='addclose'>取消</button>-->
+        <!--<button type="button" class="btn btn-success" @click='addconfirm'>确认</button>-->
       </footer>
     </modal>
     <modal :show.sync="show" v-ref:modal backdrop="false">
@@ -205,31 +188,33 @@
         <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="materialExcel"
+          <file-upload class="my-file-uploader" :name="'materialExcelsxq'+flag"
                        action="rs/file/uploadFile" tagname="文件导入" :headers="headers" v-ref:file></file-upload>
         </div>
       </article>
 
-
       <footer slot="modal-footer" class="modal-footer"></footer>
     </modal>
   </div>
 </template>
 
 <script>
+  import { PagedList } from 'vue-client'
   import {HttpResetClass} from 'vue-client'
   import co from 'co'
+
   let insert = async function (self) {
     let param = {
       processid: self.selectdata.f_process_id,
       f_apply_num: self.selectdata.f_apply_num,
-      f_filiale:self.selectdata.f_filiale,
-      f_parentname:self.$login.f.f_parentname,
-      f_material_operator:self.$login.f.name,
-      f_effective_state:'有效',
-      f_picking_state:'未领完'
+      f_filiale: self.selectdata.f_filiale,
+      f_parentname: self.$login.f.f_parentname,
+      f_material_operator: self.$login.f.name,
+      f_effective_state: '有效',
+      f_picking_state: '未领完'
     }
     console.log('新增批次', param)
     self.$resetpost('rs/entity/t_material_batch', param).then(() => {
@@ -241,45 +226,53 @@
 
   }
   let insertdetail = async function (self) {
-    let data={
-      f_batch_name:self.model.f_batch_name[0],
+    let data = {
+      f_batch_name: self.model.f_batch_name[0],
+      f_batch_code: self.model.f_batch_code[0],
       f_apply_num: self.selectdata.f_apply_num,
       f_batch_id: self.batch_id,
     }
-    console.log('判断数据：',data)
-    self.$resetpost('rs/logic/insertdetail', data , {resolveMsg: null, rejectMsg: null}).then((res) => {
+    console.log('判断数据：', data)
+    return await  self.$resetpost('rs/logic/insertdetail', data, {resolveMsg: null, rejectMsg: null}).then((res) => {
       // this.params.rows.splice(index, 1)
-      console.log('更新成功！',res)
-      if (res.data.batch.length>0){
+      console.log('更新成功！', res)
+      if (res.data.batch.length > 0) {
         self.$showMessage("已添加过此材料，请勿重复添加，若要修改数量请点击修改！")
-      } else{
-        if (res.data.array.length>0){
+        return false
+      } else {
+        if (res.data.array.length > 0) {
           let param = {
             f_batch_id: self.batch_id,
             f_apply_num: self.selectdata.f_apply_num,
-            f_filiale:self.selectdata.f_filiale,
-            f_parentname:self.$login.f.f_parentname,
-            f_material_operator:self.$login.f.name,
-            f_batch_name:self.model.f_batch_name[0],
-            f_budget_num:self.model.f_budget_num,
-            f_surplus_num:self.model.f_budget_num,
-            f_add_receive:0,
-            f_receive_num:0,
-            f_revenue_id:res.data.array[0].id,
-            f_batch_type:res.data.array[0].f_type,
-            f_batch_code:res.data.array[0].f_num,
-            f_batch_norms:res.data.array[0].f_format,
-            f_batch_company:res.data.array[0].f_unit,
-            f_batch_price:res.data.array[0].f_price
+            f_filiale: self.selectdata.f_filiale,
+            f_parentname: self.$login.f.f_parentname,
+            f_material_operator: self.$login.f.name,
+            f_batch_name: self.model.f_batch_name[0],
+            f_budget_num: self.model.f_budget_num,
+            f_surplus_num: self.model.f_budget_num,
+            f_add_receive: 0,
+            f_receive_num: 0,
+            f_revenue_id: res.data.array[0].id,
+            f_batch_type: res.data.array[0].f_type,
+            f_batch_code: res.data.array[0].f_code,
+            f_batch_version: res.data.array[0].f_num,
+            f_batch_norms: res.data.array[0].f_format,
+            f_batch_company: res.data.array[0].f_unit,
+            f_batch_price: res.data.array[0].f_price
           }
-          console.log('添加明细：',param)
+          console.log('添加明细：', param)
           self.$resetpost('rs/entity/t_material_list', param).then(() => {
             // this.params.rows.splice(index, 1)
             console.log('更新成功！')
-            self.showdetail(self.batch_id,'有效')
+            self.showdetail(self.batch_id, '有效')
+            self.model.f_batch_name = []
+            self.model.f_batch_code = []
+            self.model.f_batch_version = []
+            self.model.f_batch_norms = []
+            self.model.f_budget_num = ''
             self.addshow = false
           })
-        }else {
+        } else {
           self.$showMessage('此种材料系统中不存在！请检查材料名称')
         }
       }
@@ -289,11 +282,11 @@
 
 
   }
-  let getInfo = async function (self,isbatchdetail,batchid,istoVoidBatch) {
+  let getInfo = async function (self, isbatchdetail, batchid, istoVoidBatch) {
     if (!self.selectdata)
       return
 
-    if (isbatchdetail==1){
+    if (isbatchdetail == 1) {
       let data = {
         tablename: 't_material_list',
         condition: `f_apply_num = '${self.selectdata.f_apply_num}' and f_batch_id ='${batchid}' `
@@ -302,23 +295,24 @@
       await reset.load('POST', 'rs/sql/singleTable', {data: data}, {resolveMsg: null, rejectMsg: '获取材料信息失败'})
         .then((res) => {
           console.log('查询完毕,返回res.data=>' + JSON.stringify(res.data))
+          self.batchmodel.rows = []
           self.batchmodel.rows = res.data
           // 备份用于查询
           /* self.params = res.data*/
-          if (istoVoidBatch){
+          if (istoVoidBatch) {
             console.log('进入istovoidBatch')
-            let num=0
+            let num = 0
             for (var i = 0; i < self.batchmodel.rows.length; i++) {
-              num+=self.batchmodel.rows[i].f_add_receive
-              console.log(i+'f_add_receive'+self.batchmodel.rows[i].f_add_receive)
+              num += self.batchmodel.rows[i].f_add_receive
+              console.log(i + 'f_add_receive' + self.batchmodel.rows[i].f_add_receive)
             }
-            if (num>0){
+            if (num > 0) {
               self.$showMessage('累计领取数量大于0,不能作废！')
-            }else{
+            } else {
               self.$showMessage('作废后不可恢复，确认作废吗？', ['confirm', 'cancel']).then((res) => {
                 if (res === 'confirm') {
-                  self.$resetpost('rs/logic/tovoidbatch',{id: batchid}).then((res) => {
-                    getInfo(self,0,0,false)
+                  self.$resetpost('rs/logic/tovoidbatch', {id: batchid}).then((res) => {
+                    getInfo(self, 0, 0, false)
                   })
                 }
               })
@@ -328,7 +322,7 @@
 
         })
 
-    } else{
+    } else {
 
       let data = {
         tablename: 't_material_batch',
@@ -345,8 +339,6 @@
     }
 
 
-
-
   }
 
 
@@ -372,60 +364,100 @@
   }
   export default {
     title: '材料信息',
-    props: ['selectdata','edit'],
+    props: {
+      flag:{
+        type: String,
+        default: 'cl'
+      },
+      selectdata: {
+        type: Object
+      },
+      edit: {
+        type: Boolean,
+        default: true
+      },
+      state: {
+        type: Number
+      },
+      showprint: {
+        type: Boolean,
+        default: true
+      }
+    },
     data() {
       return {
+        scrollTop:0, // 添加材料模态框的高度
+        searchName:null,
+        addshowm:true,
+        menulist: null,
+        refreshed: true,
+        guigeoptions: [],
+        xinhaooptions: [],
+        materialItem: [],
+        codeOptions: [],
         fmaterialtype: [],
         fmaterialname: [],
         fmaterialspec: [],
         fmaterialprice: [],
-        headers: {'username': this.$login.f.name, 'blodid': this.selectdata.f_process_id,'fusetype':'报建execl导入材料'},
+        headers: {'username': this.$login.f.name, 'blodid': this.selectdata.f_process_id, 'fusetype': '报建execl导入材料'},
         params: null,
         record: {},
         selectItem: {},
+        isbuttonshow: true,
         model: {
           rows: []
         },
         // istoVoidBatch:false,
-        f_material_operator:'',
+        f_material_operator: '',
         f_picking_stated: '',
-        f_effective_stated:'',
-        f_picking_state:[
+        f_effective_stated: '',
+        f_picking_state: [
           {label: '未领完', value: '未领完'},
-          {label:'已领完', value: '已领完'},
-          {label:'全部', value: ''}
+          {label: '已领完', value: '已领完'},
+          {label: '全部', value: ''}
         ],
-        f_effective_state:[
+        f_effective_state: [
           {label: '有效', value: '有效'},
-          {label:'无效', value: '无效'},
-          {label:'全部', value: ''}
+          {label: '无效', value: '无效'},
+          {label: '全部', value: ''}
         ],
-        batchmodel:{
-          rows:[]
+        batchmodel: {
+          rows: []
         },
         show: false,
         isShow: false,
-        isShowdetail:false,
-        addshow:false,
+        isShowdetail: false,
+        addshow: false,
         batch_id: 0,
-        material:[]
+        material: [],
+        optionsx: [],
+        f_user_name: []
       }
     },
     async ready() {
+      // 获取材料数据
+      this.guige()
+      this.isShowdetail = false
       this.load()
-      getInfo(this,0,0,false)
+      getInfo(this, 0, 0, false)
       this.getname()
     },
     watch: {
       'selectdata.f_process_id'() {
+        this.isShowdetail = false
         this.headers.blodid = this.selectdata.f_process_id
-        getInfo(this,0,0,false)
+        getInfo(this, 0, 0, false)
       },
-      deep:true
+      'state'() {
+        this.f_material_operator = ''
+        this.f_picking_stated = ''
+        this.f_effective_stated = ''
+      },
+      deep: true
     },
     computed: {
-      async fprice(){
-        if(this.selectItem.f_material_type && this.selectItem.f_material_name && this.selectItem.f_material_spec){
+      async fprice() {
+        if (this.selectItem.f_material_type && this.selectItem.f_material_name && this.selectItem.f_material_spec) {
           this.fmaterialprice = []
           let http = new HttpResetClass()
           let data = {
@@ -494,60 +526,215 @@
       }
     },
     methods: {
-      async getname(){
-        let data = await this.$resetpost('rs/sql/SingleTable', {data: {tablename: 't_material_class',condition: `1=1`}}, {resolveMsg: null, rejectMsg: null})
+      //使用a标签下载--推荐使用
+      commDownload(url) {
+          //  url += "?";
+          // for(let key in params) {
+          //        url += key + "=" + params[key] + "&";
+          //    }
+          //  url = url.substr(0, url.length - 1);
+           $("<a href=" + url + " />")[0].click();
+       },
+      async searchByName(){
+
+        console.log('搜索材料名车')
+        let http = new HttpResetClass()
+        let data2 = {
+          columnname: `f_type`,
+          tablename: 't_material_class',
+          condition: ` f_name like '%${this.searchName}%'`
+        }
+        let resTypes = await http.load('POST', 'rs/sql/getdistinct', {data: data2}, {
+          resolveMsg: null,
+          rejectMsg: "获取f_material_name失败"
+        }, {silent: true})
+
+
+        let data = {
+          columnname: `f_name,f_type`,
+          tablename: 't_material_class',
+          condition: ` f_name like '%${this.searchName}%'`
+        }
+        let res = await this.$resetpost('rs/sql/getdistinct', {data: data}, {
+          resolveMsg: null,
+          rejectMsg: '搜索材料名称失败'
+        })
+        this.menulist = []
+        for(let i=0;i<resTypes.data.length;i++){
+          this.menulist.push({catename:resTypes.data[i].f_type,expanded: true,type:'材料类型'})
+        }
+        for(let i=0;i<this.menulist.length;i++){
+          let _child = []
+          for(let j=0;j<res.data.length;j++){
+            if(this.menulist[i].catename == res.data[j].f_type){
+              _child.push({catename:res.data[j].f_name,expanded: false,type:'材料名称'})
+            }
+          }
+          this.menulist[i]._child=_child
+        }
+        this.addshowm = false
+        this.$nextTick(()=> {
+          this.addshowm = true
+        })
+        console.log('menulist',this.menulist)
+      },
+      async export(row) {
+        console.log("导出",row)
+        let exportdata = {
+            body:{
+              data:{
+                condition:`f_apply_num = '${this.selectdata.f_apply_num}' and f_batch_id ='${row.id}' `,  // 查询条件
+                items:"f_batch_code,f_batch_name,f_batch_type,f_batch_version,f_batch_norms,f_budget_num,f_batch_company"
+              },
+              field:["f_batch_code:材料编码","f_batch_name:材料名称","f_batch_type:材料类型","f_batch_version:材料型号","f_batch_norms:材料规格","f_budget_num:数量","f_batch_company:材料单位"],
+              sqlName:"materialExport",
+              templateName:"材料导出"
+            }
+        }
+        let httpExport = new HttpResetClass()
+        let res = await httpExport.load('POST', 'rs/logic/exportfile', {data: exportdata}, {
+          resolveMsg: null,
+          rejectMsg: "材料导出失败"
+        }, {silent: true})
+        //res :[{"filename":"/D:/服务文件/apache-5002/webapps/manage/excel/流程监控全部导出.xlsx"}]
+        let downloadPath = res.data[0].filename
+        let downloadURL = "http://" + location.host + "/excel" + downloadPath.split('excel')[1]
+        // js 下载
+        let aTag = document.createElement('a')
+        aTag.download = "材料导出.xlsx"
+        aTag.href = downloadURL
+        aTag.click()
+        URL.revokeObjectURL(aTag.href)
+        // $("<a href=" + downloadURL + " />")[0].click()
+      },
+      async deleteItem(row) {
+        let res = await this.$showMessage('删除后不可恢复，确认删除吗？', ['confirm', 'cancel'])
+        if (res === 'confirm') {
+          let http = new HttpResetClass()
+          http.load('DELETE', `rs/entity/t_material_list/${row.id}`).then((res)=>{
+            for(let i=0;i<this.batchmodel.rows.length;i++){
+              if(this.batchmodel.rows[i].id == row.id){
+                this.batchmodel.rows.splice(i,1)
+              }
+            }
+          })
+        }
+
+      },
+      async xinhao() {
+        if (!this.model.f_batch_norms[0]) {
+          return
+        }
+        let temp = []
+        for (let row of this.optionsx) {
+          if (this.model.f_batch_norms[0] == row.f_format) {
+            temp.push({label: row.f_num, value: row.f_num})
+          }
+        }
+        this.xinhaooptions = temp
+      },
+      async bianma() {
+        let temp = []
+        for (let row of this.optionsx) {
+          if (this.model.f_batch_norms[0] && this.model.f_batch_norms[0] == row.f_format && this.model.f_batch_version[0] && this.model.f_batch_version[0] == row.f_num) {
+            temp.push({label: row.f_code, value: row.f_code})
+          } else if (this.model.f_batch_norms[0] && this.model.f_batch_norms[0] == row.f_format) {
+            temp.push({label: row.f_code, value: row.f_code})
+          }
+        }
+        this.codeOptions = temp
+      },
+      async guige() {
+        // let http = new HttpResetClass()
+        let data = {
+          columnname: `f_type`,
+          tablename: 't_material_class',
+          condition: `1=1`
+        }
+        let http = new HttpResetClass()
+
+        let res = await http.load('POST','rs/sql/getdistinct', {data: data}, {
+          resolveMsg: null,
+          rejectMsg: '获取材料类型失败'
+        })
+        this.menulist = []
+        for(let i=0;i<res.data.length;i++){
+          this.menulist.push({catename:res.data[i].f_type,expanded: false,type:'材料类型'})
+        }
+        console.log('menulist',this.menulist)
+      },
+      async getname() {
+        let http = new HttpResetClass()
+        let data = await http.load('POST', 'rs/logic/getMaterialAddItem', {data: {condition: `f_apply_num = '${this.selectdata.f_apply_num}'  `}}, {
+          resolveMsg: null,
+          rejectMsg: null
+        })
+        console.log('查询到的选项', data)
         let house = []
-        for (let row of data.data){
-          house.push({label: row.f_name,value: row.f_name})
+        let codeOptionstemp = []
+        for (let row of data.data.f_name) {
+          // codeOptionstemp.push({label: row.f_code,value: row.f_code})
+          house.push({label: row.f_name, value: row.f_name})
         }
+        // this.codeOptions = codeOptionstemp
+        this.material = []
         this.material = house
+        let house2 = [{label: '全部', value: ''}]
+        for (let row of data.data.f_user_name) {
+          house2.push({label: row.f_material_operator, value: row.f_material_operator})
+        }
+        this.f_user_name = []
+        this.f_user_name = house2
       },
-      addDetailed(){
+      addDetailed() {
         this.addshow = true
       },
-      addclose(){
+      addclose() {
         this.addshow = false
+        // this.model = {}
       },
-      async addconfirm(){
-        if(!this.model.f_batch_name){
-          this.$showAlert("请输入材料名称","warning", 1500)
+      async addconfirm() {
+        if (!this.model.f_batch_name) {
+          this.$showAlert("请输入材料名称", "warning", 1500)
           return
         }
-        if(!this.model.f_budget_num){
-          this.$showAlert("请输入材料数量","warning", 1500)
+        if (!this.model.f_batch_code) {
+          this.$showAlert("请选择材料编码", "warning", 1500)
           return
         }
-        await this.$showMessage(`是否确认添加新的明细`, ['confirm', 'cancel']).then((res) => {
-          if (res === 'confirm') {
-            insertdetail(this)
-          }
-        })
+        if (!this.model.f_budget_num) {
+          this.$showAlert("请输入材料数量", "warning", 1500)
+          return
+        }
+        return await insertdetail(this)
+
       },
       // 父组件更新子组件属性
       updateData(val) {
         this.headers.blodid = val.f_process_id
         this.selectdata = val
       },
-      addmaterial(){
+      addmaterial() {
         this.$showMessage(`是否确认添加批次`, ['confirm', 'cancel']).then((res) => {
           if (res === 'confirm') {
             insert(this)
           }
         })
       },
-      showdetail(val,f_effective_state) {
-        if (f_effective_state === '无效'){
-          this.isShowdetail=false
-        } else{
-          console.log('查询明细')
-          console.log(val)
-          this.batch_id = val
-          this.isShowdetail=true
-          getInfo(this,1,val,false)
+      showdetail(val, f_effective_state) {
+        if (f_effective_state === '无效') {
+          this.isbuttonshow = false
+        } else {
+          this.isbuttonshow = true
         }
-
+        console.log('查询明细')
+        console.log(val)
+        this.batch_id = val
+        this.isShowdetail = true
+        getInfo(this, 1, val, false)
       },
-      async load(){
+      async load() {
+
         let http = new HttpResetClass()
         let data = {
           columnname: 'f_material_type',
@@ -572,7 +759,8 @@
         //判断当前节点的状态（开始活动/完工）
         var entryName = this.model.f_entry_name //项目名称
         var ename = this.selectdata.f_entry_name
-        this.$resetpost('rs/sql/findProcessState', {data: {actid:this.selectdata.actid}}, {
+        let http = new HttpResetClass()
+        http.load('POST', 'rs/sql/findProcessState', {data: {actid: this.selectdata.actid}}, {
           resolveMsg: null,
           rejectMsg: '提交错误！'
         }).then((res) => {
@@ -581,10 +769,11 @@
             this.reset()
           } else {
             //通过数据校验再进行下一步判断
-            if (this.verification())  {
-              if(name == null){
+            if (this.verification()) {
+              if (name == null) {
                 //项目名称唯一性判断
-                this.$resetpost('rs/sql/findByEntryName', {data: {entryName: entryName}}, {
+                let http2 = new HttpResetClass()
+                http2.load('POST', 'rs/sql/findByEntryName', {data: {entryName: entryName}}, {
                   resolveMsg: null,
                   rejectMsg: '提交错误！'
                 }).then((res) => {
@@ -599,7 +788,7 @@
                     console.log('co(getgen)')
                   }
                 })
-              }else{
+              } else {
                 let getGen = gen(this, this.model)
                 co(getGen)
               }
@@ -634,19 +823,21 @@
       },
       tovoid(row) {
         console.log('作废')
-        getInfo(this,1,row.id,true)
+        getInfo(this, 1, row.id, true)
       },
-      async filterParams(f_material_operator,f_effective_stated,f_picking_stated) {
+      async filterParams(f_material_operator, f_effective_stated, f_picking_stated) {
+        this.isShowdetail = false
         let data = {
           tablename: 't_material_batch',
           condition: `f_apply_num = '${this.selectdata.f_apply_num}' and  f_material_operator like '%${f_material_operator}%'
           and f_effective_state like '%${f_effective_stated}%' and f_picking_state like '%${f_picking_stated}%'
           `
         }
+        console.log('condition:', data.condition)
         let reset = new HttpResetClass()
         await reset.load('POST', 'rs/sql/singleTable', {data: data}, {resolveMsg: null, rejectMsg: '获取材料信息失败'})
           .then((res) => {
-            console.log('查询结果：',res)
+            console.log('查询结果：', res)
 
             this.model.rows = []
             this.model.rows = res.data
@@ -665,6 +856,7 @@
         this.$set('selectItem.f_surplus_num', row.f_surplus_num)
         this.$set('selectItem.f_batch_type', row.f_batch_type)
         this.$set('selectItem.f_batch_code', row.f_batch_code)
+        this.$set('selectItem.f_batch_version', row.f_batch_version)
         this.$set('selectItem.f_batch_name', row.f_batch_name)
         this.$set('selectItem.f_batch_norms', row.f_batch_norms)
         this.$set('selectItem.f_batch_company', row.f_batch_company)
@@ -679,8 +871,8 @@
       // 缴费情况修改
       paychange(row) {
         let http = new HttpResetClass()
-        row.f_pay=!row.f_pay
-        http.load('POST','rs/logic/saveentity', {data:{tablename:'t_material',parameters:row}}, {
+        row.f_pay = !row.f_pay
+        http.load('POST', 'rs/logic/saveentity', {data: {tablename: 't_material', parameters: row}}, {
           resolveMsg: null,
           rejectMsg: "缴费状态更新失败"
         }, {silent: true})
@@ -691,11 +883,11 @@
           tablename: 't_material_list',
           parameters: this.selectItem
         }
-        let this1=this
+        let this1 = this
         this.$resetpost('rs/logic/saveentity', {data: data}).then((res) => {
           this.show = false
           // 如果没有id，需要在数组中添加
-          getInfo(this,1,this.selectItem.f_batch_id,false)
+          getInfo(this, 1, this.selectItem.f_batch_id, false)
           this.selectItem = {}
 
         })
@@ -707,7 +899,7 @@
         this.selectItem = {}
       },
 
-      async getaaa(){
+      async getaaa() {
         console.log('进来了')
         let data = {
           tablename: 't_material_batch',
@@ -724,6 +916,101 @@
     }
     ,
     events: {
+      updateTree(){
+        this.scrollTop =  document.getElementById("treemx").scrollTop
+        this.addshowm = false
+        this.$nextTick(()=> {
+          this.addshowm = true
+        })
+      },
+      async menulistSelected(item,root,parent){
+        this.scrollTop =  document.getElementById("treemx").scrollTop
+          console.log("scrollTop",this.scrollTop)
+        if(item.type=='材料类型'){
+          console.log('选了材料类型')
+          let data = {
+            columnname: `f_name`,
+            tablename: 't_material_class',
+            condition: `f_type = '${item.catename}'`
+          }
+          let res = await this.$resetpost('rs/sql/getdistinct', {data: data}, {
+            resolveMsg: null,
+            rejectMsg: '获取材料名称失败'
+          })
+          // this.menulist = []
+          let _child = []
+          for(let i=0;i<res.data.length;i++){
+            _child.push({catename:res.data[i].f_name,expanded: false,type:'材料名称'})
+          }
+          for(let i=0;i<this.menulist.length;i++){
+            if(this.menulist[i].catename==item.catename){
+              this.menulist[i]._child= []
+              this.menulist[i].expanded = true
+              this.menulist[i]._child= _child
+            }
+          }
+          this.addshowm = false
+          this.$nextTick(()=> {
+            this.addshowm = true
+          })
+          console.log('menulist',this.menulist)
+        }else if(item.type=='材料名称'){
+          console.log('选了材料名称')
+          let data = {
+            columnname: `f_format,f_code`,
+            tablename: 't_material_class',
+            condition: ` f_name = '${item.catename}' and f_type = '${this.menulist[root].catename}'`
+          }
+          let res = await this.$resetpost('rs/sql/getdistinct', {data: data}, {
+            resolveMsg: null,
+            rejectMsg: '获取材料规格失败'
+          })
+          // this.menulist = []
+          let _child = []
+          for(let i=0;i<res.data.length;i++){
+            _child.push({catename:res.data[i].f_format,expanded: false,type:'材料规格',f_code:res.data[i].f_code})
+          }
+          for(let i=0;i<this.menulist.length;i++){
+            if(this.menulist[i].catename==this.menulist[root].catename){
+              for(let j=0;j<this.menulist[i]._child.length;j++){
+                if(this.menulist[i]._child[j].catename==item.catename){
+                  this.$refs.tree2.menulist[i]._child[j]._child= []
+                  this.$refs.tree2.menulist[i]._child[j].expanded = true
+                  this.$refs.tree2.menulist[i]._child[j]._child= _child
+                  break
+                }
+              }
+            }
+          }
+          this.addshowm = false
+          this.$nextTick(()=> {
+            this.addshowm = true
+          })
+          console.log('menulist',this.menulist)
+        }else if(item.type=='材料规格'){
+          console.log('选了材料规格')
+          this.model.f_batch_name = [this.menulist[root]._child[parent].catename]
+          this.model.f_batch_code = [item.f_code]
+          this.model.f_budget_num = item.count
+            let flag = await  this.addconfirm()
+          if(flag == false){
+            for(let i =0;i<this.menulist[root]._child[parent]._child.length;i++){
+              if(this.menulist[root]._child[parent]._child[i].f_code = item.f_code){
+                this.menulist[root]._child[parent]._child[i].count = null
+              }
+            }
+          }
+          this.addshowm = false
+          this.$nextTick(()=> {
+            this.addshowm = true
+          })
+          console.log('menulist',this.menulist)
+        }
+        this.addshowm = false
+        this.$nextTick(()=> {
+          this.addshowm = true
+        })
+      },
       onFileUpload: function (file, res) {
         if (!this.selectdata.f_process_id) {
           this.$showMessage("数据异常，导入失败")
@@ -734,17 +1021,19 @@
           filepath: res.f_downloadpath,
           processid: this.selectdata.f_process_id,
           f_apply_num: this.selectdata.f_apply_num,
-          f_filiale:this.selectdata.f_filiale,
-          f_parentname:this.$login.f.f_parentname,
-          f_material_operator:this.$login.f.name
+          f_filiale: this.selectdata.f_filiale,
+          f_parentname: this.$login.f.f_parentname,
+          f_material_operator: this.$login.f.name
           /* processid:this.selectdata.f_processid*/
         }
 
 
-
         this.$resetpost('rs/logic/materialImport', data, {resolveMsg: '上传成功', rejectMsg: '上传失败'}).then((res) => {
-
-          getInfo(this,0,0,false)
+          if (res.data.msg) {
+            this.$showMessage(res.data.msg)
+          } else {
+            getInfo(this, 0, 0, false)
+          }
           this.closeFile()
         })
       }