修改列

src/api/purchaseRequest/index.js

@@ -0,0 +1,9 @@
+import request from '@/utils/request'
+
+// 查询列宽修改列表
+export function listQuery(query) {
+  return request({
+    url: '/anpin/stockControl/list?fBilltype=' + query,
+    method: 'get',
+  })
+}

src/combination/formComponent.vue

@@ -1,16 +1,19 @@
 <template>
   <div>
-    <el-form v-model="form" style="display:flex;flex-wrap: wrap">
+    <el-form :model="form" ref="form" style="display:flex;flex-wrap: wrap">
       <el-form-item
         v-for="(item,index) in formOption" :key="index" v-if="(index+1) <= inDex"
         :prop="item.label"
         :label="item.name"
         :label-width="item.labelSize + 'px'"
+        :rules="item.rules"
       >
-        <el-input v-model="form[item.label]" v-if="item.inputType == 2" :style="{ width: item.width + 'px' }" size="small"></el-input>
-        <el-select v-model="form[item.label]" slot="prepend" placeholder="请选择" v-else-if="item.inputType == 1">
-          <el-option v-for="(item,index) in dataList[item.label]" :key="index" :label="item.fName" :value="item.fId"></el-option>
-        </el-select>
+        <el-input v-model="form[item.label]" v-if="item.inputType == 2" :style="{ width: item.width + 'px' }" size="small" :placeholder="'请输入'+item.name"></el-input>
+        <span v-if="item.inputType == 1">
+          <el-select v-model="form[item.label]" slot="prepend" placeholder="请选择">
+            <el-option v-for="(item,index) in dataList[item.label]" :key="index" :label="item.fName" :value="item.fId"></el-option>
+          </el-select>
+        </span>
         <el-input
           v-if="item.inputType == 4"
           type="textarea"
@@ -53,9 +56,16 @@ export default {
     spellNumbers(name){
       this.form[name] = [this.number,this.numBer]
     },
-    bug(){
-      console.log('到这里')
-    }
+    //表单验证
+    submitForm(form) {
+      this.$refs["form"].validate((valid) => {
+        if (valid) {
+          this.$emit('submitForm')
+        } else {
+          return false;
+        }
+      });
+    },
   }
 }
 </script>

src/combination/listComponent.vue

@@ -22,11 +22,12 @@
           ></el-button>
         </div>
         <right-toolbar
+          v-if="isItHidden"
           @showSearch="showSearch"
           @queryTable="getList"
         ></right-toolbar>
       </div>
-      <div style="margin-right:10px;float: right">
+      <div style="margin-right:10px;float: right" v-if="isItHidden">
         <el-button
           type="success"
           plain
@@ -37,14 +38,14 @@
         <el-button
           type="warning"
           plain
-          icon="el-icon-search"
+          icon="el-icon-refresh-left"
           @click="feedback('重置')"
           size="mini"
         >重置</el-button>
         <el-button
           type="info"
           plain
-          icon="el-icon-search"
+          icon="el-icon-open"
           @click="feedback('展开')"
           size="mini"
         >展开</el-button>
@@ -160,11 +161,11 @@ import { addSet, resetModule } from "@/api/system/set";
 import Cookies from "js-cookie";
 export default {
   name: 'listComponent',
-  props: ['tableData', 'listStyle','queryList','customButton','arrow','setRowList'],
+  props: ['tableData', 'listStyle','queryList','customButton','arrow','setRowList','isItHidden'],
   data() {
     return {
       showSetting: false,
-      allCheck: false,
+      allCheck: false
     }
   },
   watch:{
@@ -191,7 +192,7 @@ export default {
     rowClassName({row, rowIndex}) {
       // console.log(row,rowIndex)
       //把每一行的索引放进row.id
-      row.fLineNumber = rowIndex+1;
+      row.serialNumber = rowIndex+1;
       // console.log(row.fLineNumber)
     },
     //列设置全选
@@ -226,7 +227,7 @@ export default {
         if (res.code == 200) {
           console.log(res)
           this.showSetting = false;
-          this.queryList.columnList = this.queryList.columnList.filter((e) => e.checked == 0);
+          this.queryList.columnList = this.setRowList.filter((e) => e.checked == 0);
         }
       });
     },
@@ -279,12 +280,6 @@ export default {
     handleSelectionChange(selection){
       this.$emit('selectionbox', selection)
     },
-    handleQuery(){
-
-    },
-    resetQuery(){
-
-    },
     handleClick(){
       this.$emit('handleClick')
     },

src/views/purchaseRequest/index.vue

@@ -1,10 +1,12 @@
 <template>
-  <div class="app-container">
+  <div v-if="pageDisplay" class="app-container">
     <formComponent
+    v-if="searchWhether"
     :formOption="formOption"
     :dataList="dataList"
     :inDex="inDex"
     ref="avatar"
+    @submitForm="submitForm"
     @returnToForm="returnToForm"
     />
     <listComponent
@@ -17,94 +19,220 @@
       @showSearch="showSearch"
       @feedback="feedback"
       @getList="getList"
+      :isItHidden="isItHidden"
       :customButton="customButton"
       :listStyle="listStyle"
       :queryList="queryList"
       :setRowList="setRowList"
     />
   </div>
+  <div v-else class="app-container">
+    <formComponent
+    v-if="searchWhether"
+    :formOption="contentOption"
+    :dataList="dataList"
+    :inDex="inDex"
+    ref="avatar"
+    @submitForm="submitForm"
+    @returnToForm="returnToForm"
+    />
+    <listComponent
+      :tableData="contentList"
+      @selectionbox="selectionbox"
+      @see="viewMethod"
+      @modify="modification"
+      @deletion="deletion"
+      @buttonList="buttonList"
+      @showSearch="showSearch"
+      @feedback="feedback"
+      @getList="getList"
+      :isItHidden="isItHidden"
+      :customButton="contentButton"
+      :listStyle="listStyle"
+      :queryList="purchaseList"
+      :setRowList="setRowList"
+    />
+  </div>
 </template>
 
 <script>
 import {select} from '@/api/system/set'
+import {listQuery} from '@/api/purchaseRequest/index'
 import Cookies from 'js-cookie'
-import formComponent from '@/combination/formComponent'
 export default {
   name: 'index',
   data(){
     return{
+      searchWhether:true,
+      pageDisplay:true,
       dataList:{},
+      contentList:[],
       inDex:4,
-      tableData:[
-        {fMaterial1:'11111'}
-      ],
+      tableData:[],
+      tableList:[],
+      isItHidden:true,
       listStyle:[
         {
           surface: "1",
-          label: "fLineNumber",
+          label: "serialNumber",
           name: "序号",
           checked: 0,
           width: 100,
-          onabort:''
+          onabort:'',
         },{
           surface: "2",
-          label: "fMaterial1",
+          label: "fBillno",
           name: "申请编号",
           checked: 0,
           width: 100,
           onabort:'this.value=this.value.replace(/[^_a-zA-Z]/g,\'\')'
         },{
           surface: "3",
-          label: "fMaterial1",
+          label: "fGoodsid",
           name: "项目名称",
           checked: 0,
           width: 100,
           onabort:''
         },{
           surface: "4",
-          label: "fMaterial1",
+          label: "fCorpid",
           name: "客户名称",
           checked: 0,
           width: 100,
           onabort:''
         },{
           surface: "5",
-          label: "fMaterial1",
+          label: "fMoney",
           name: "金额",
           checked: 0,
           width: 100,
           onabort:''
         },{
           surface: "6",
-          label: "fMaterial1",
+          label: "createTime",
           name: "申请日期",
           checked: 0,
           width: 100,
           onabort:''
         },{
           surface: "7",
-          label: "fMaterial1",
+          label: "createBy",
           name: "申请人",
           checked: 0,
           width: 100,
           onabort:''
         },{
           surface: "8",
-          label: "fMaterial1",
+          label: "fReviewDate",
           name: "审核日期",
           checked: 0,
           width: 100,
           onabort:''
         },{
           surface: "9",
-          label: "fMaterial1",
+          label: "remark",
+          name: "备注",
+          checked: 0,
+          width: 100,
+          onabort:''
+        },{
+          surface: "10",
+          label: "operation",
+          name: "操作",
+          checked: 0,
+          width: 160,
+          operation:'1',
+          onabort:''
+        }
+      ],
+      contentStyle:[
+        {
+          surface: "1",
+          label: "fLineNumber",
+          name: "序号",
+          checked: 0,
+          width: 100,
+          onabort:''
+        },{
+          surface: "2",
+          label: "fLineNumber",
+          name: "品名",
+          checked: 0,
+          width: 100,
+          onabort:''
+        },{
+          surface: "3",
+          label: "asdaasd",
+          name: "单价",
+          checked: 0,
+          width: 100,
+          onabort:''
+        },{
+          surface: "4",
+          label: "aadswada",
+          name: "采购重量",
+          checked: 0,
+          width: 100,
+          onabort:''
+        },{
+          surface: "5",
+          label: "fLineNuber",
+          name: "实际重量",
+          checked: 0,
+          width: 100,
+          onabort:''
+        },{
+          surface: "6",
+          label: "fLine2Nuber",
+          name: "计量单位",
+          checked: 0,
+          width: 100,
+          onabort:''
+        },{
+          surface: "7",
+          label: "fLineN32uber",
+          name: "金额",
+          checked: 0,
+          width: 100,
+          onabort:''
+        },{
+          surface: "8",
+          label: "fLinger",
+          name: "付费方式",
+          checked: 0,
+          width: 100,
+          onabort:''
+        },{
+          surface: "9",
+          label: "fLineNubr",
           name: "备注",
           checked: 0,
           width: 100,
           onabort:''
         },{
           surface: "10",
-          label: "fMaterial1",
+          label: "fLieNuber",
+          name: "申请日期",
+          checked: 0,
+          width: 100,
+          onabort:''
+        },{
+          surface: "11",
+          label: "feNuber",
+          name: "申请人",
+          checked: 0,
+          width: 100,
+          onabort:''
+        },{
+          surface: "12",
+          label: "fLineuber",
+          name: "审核日期",
+          checked: 0,
+          width: 100,
+          onabort:''
+        },{
+          surface: "13",
+          label: "fMaterialw1",
           name: "操作",
           checked: 0,
           width: 160,
@@ -116,13 +244,17 @@ export default {
         tableName:'采购申请',
         columnList:[]
       },
+      purchaseList:{
+        tableName:'采购申请详情',
+        columnList:[]
+      },
       setRowList:[],
       customButton:[
         {
           type:'primary',
           size:'mini',
           icon:'el-icon-edit',
-          name:'录入',
+          name:'新增',
           disabled:false,
         },{
           type:'warning',
@@ -144,31 +276,64 @@ export default {
           disabled:false,
         }
       ],
+      contentButton:[
+        {
+          type:'danger',
+          size:'mini',
+          icon:'el-icon-arrow-left',
+          name:'返回列表',
+          disabled:false,
+        },{
+          type:'primary',
+          size:'mini',
+          icon:'el-icon-plus',
+          name:'录入',
+          disabled:false,
+        },{
+          type:'success',
+          size:'mini',
+          icon:'el-icon-edit',
+          name:'修改',
+          disabled:false,
+        },{
+          type:'warning',
+          size:'mini',
+          icon:'el-icon-download',
+          name:'导出',
+          disabled:false,
+        },{
+          type:'info',
+          size:'mini',
+          icon:'el-icon-edit-outline',
+          name:'打印',
+          disabled:false,
+        }
+      ],
       formOption:[
         {
           span:6,
-          label: 'fNumber',
+          label: 'fNum3ber',
           name:"申请编号",
           inputType:2,
           width:200,
           labelSize:'80',
-          rules:''
+          rules:[{ required: false, message: ' '}]
         },{
           span:6,
-          label: 'fNumber',
+          label: 'fNu3mber',
           name:"项目名称",
-          inputType:2,
+          inputType:1,
           width:200,
           labelSize:'80',
-          rules:''
+          rules:[{ required: false, message: ' '}]
         },{
           span:6,
-          label: 'fNumber',
+          label: 'fNumb2er',
           name:"客户名称",
           inputType:2,
           width:200,
           labelSize:'80',
-          rules:''
+          rules:[{ required: false, message: ' '}]
         },{
           span:6,
           label: 'fNumber',
@@ -176,7 +341,7 @@ export default {
           inputType:2,
           width:200,
           labelSize:'80',
-          rules:''
+          rules:[{ required: false, message: ' '}]
         },{
           span:6,
           label: 'fNumberasda',
@@ -184,7 +349,7 @@ export default {
           inputType:5,
           width:200,
           labelSize:'80',
-          rules:''
+          rules:[{ required: false, message: ' '}]
         },{
           span:6,
           label: 'fNumber',
@@ -192,33 +357,163 @@ export default {
           inputType:3,
           width:200,
           labelSize:'80',
-          rules:''
+          rules:[{ required: false, message: ' '}]
         }
       ],
+      contentOption:[
+        {
+          span:6,
+          label: 'fNum3ber',
+          name:"系统编号",
+          inputType:2,
+          width:200,
+          labelSize:'80',
+          rules:[{ required: false, message: ' '}]
+        },{
+          span:6,
+          label: 'fNum3ber',
+          name:"项目名称",
+          inputType:2,
+          width:200,
+          labelSize:'80',
+          rules:[{ required: false, message: ' '}]
+        },{
+          span:6,
+          label: 'fNum3ber',
+          name:"项目主管",
+          inputType:2,
+          width:200,
+          labelSize:'80',
+          rules:[{ required: false, message: ' '}]
+        },{
+          span:6,
+          label: 'fNum3ber',
+          name:"客户",
+          inputType:2,
+          width:200,
+          labelSize:'80',
+          rules:[{ required: false, message: ' '}]
+        },{
+          span:6,
+          label: 'fNum3ber',
+          name:"供应商",
+          inputType:2,
+          width:200,
+          labelSize:'80',
+          rules:[{ required: false, message: ' '}]
+        },{
+          span:6,
+          label: 'fNum3ber',
+          name:"仓库",
+          inputType:2,
+          width:200,
+          labelSize:'80',
+          rules:[{ required: false, message: ' '}]
+        },{
+          span:6,
+          label: 'fNum3ber',
+          name:"提货日期",
+          inputType:2,
+          width:200,
+          labelSize:'80',
+          rules:[{ required: false, message: ' '}]
+        },{
+          span:6,
+          label: 'fNum3ber',
+          name:"申请人",
+          inputType:2,
+          width:200,
+          labelSize:'80',
+          rules:[{ required: false, message: ' '}]
+        },
+        {
+          span:6,
+          label: 'fNum3ber',
+          name:"学生",
+          inputType:2,
+          width:200,
+          labelSize:'80',
+          rules:[{ required: false, message: ' '}]
+        },{
+          span:6,
+          label: 'fNum3ber',
+          name:"教室",
+          inputType:2,
+          width:200,
+          labelSize:'80',
+          rules:[{ required: false, message: ' '}]
+        },{
+          span:6,
+          label: 'fNum3ber',
+          name:"备注",
+          inputType:2,
+          width:200,
+          labelSize:'80',
+          rules:[{ required: false, message: ' '}]
+        },
+        {
+          span:6,
+          label: 'fNum3ber',
+          name:"开票公司",
+          inputType:2,
+          width:200,
+          labelSize:'80',
+          rules:[{ required: false, message: ' '}]
+        },
+      ]
     }
   },
   created() {
-    this.getRow()
+    let data = {
+      tableName: this.queryList.tableName,
+      userId: Cookies.get("userName"),
+    };
+    this.getRow(data)
+    this.query()
   },
   methods:{
+    //查询主页列数据
+    query(){
+      listQuery('SQ').then(res =>{
+        this.tableData = res.rows
+      })
+    },
     //查询列数据
-    getRow() {
-      let data = {
-        tableName: this.queryList.tableName,
-        userId: Cookies.get("userName"),
-      };
+    getRow(data) {
+      console.log(data.tableName)
       select(data).then((res) => {
         console.log(res)
-        if (res.data.length != 0) {
-          this.queryList.columnList = res.data.filter((e) => e.checked == 0);
-          this.queryList.columnList = res.data;
-          this.setRowList = res.data
-          this.queryList.columnList = this.queryList.columnList.filter((e) => e.checked == 0);
-          // this.waitFor = true
+        if (data.tableName === '采购申请详情'){
+          if (res.data.length != 0) {
+            this.purchaseList.columnList = res.data.filter((e) => e.checked == 0);
+            this.purchaseList.columnList = res.data;
+            this.setRowList = res.data
+            this.purchaseList.columnList = this.purchaseList.columnList.filter((e) => e.checked == 0);
+            // this.waitFor = true
+          }else {
+            // this.waitFor = true
+            this.purchaseList.columnList = this.contentStyle
+            this.setRowList = this.contentStyle
+          }
+          this.pageDisplay = false
+          this.isItHidden = false
+          this.inDex = this.contentOption.length
         }else {
-          // this.waitFor = true
-          this.queryList.columnList = this.listStyle
-          console.log(this.queryList.columnList)
+          if (res.data.length != 0) {
+            this.queryList.columnList = res.data.filter((e) => e.checked == 0);
+            this.queryList.columnList = res.data;
+            this.setRowList = res.data
+            this.queryList.columnList = this.queryList.columnList.filter((e) => e.checked == 0);
+            // this.waitFor = true
+          }else {
+            // this.waitFor = true
+            this.queryList.columnList = this.listStyle
+            this.setRowList = this.listStyle
+            console.log(this.queryList.columnList)
+          }
+          this.pageDisplay = true
+          this.isItHidden = true
+          this.inDex = 4
         }
       });
     },
@@ -244,10 +539,30 @@ export default {
     //所以按钮
     buttonList(row){
       console.log(row)
+      let data
+      switch(row.name) {
+        case '新增':
+          data = {
+            tableName: this.purchaseList.tableName,
+            userId: Cookies.get("userName"),
+          };
+          this.getRow(data)
+          break;
+        case '返回列表':
+          data = {
+            tableName: this.queryList.tableName,
+            userId: Cookies.get("userName"),
+          };
+          this.getRow(data)
+          break;
+        default:
+          this.$message.error('按钮未知错误');
+      }
     },
     // 显示搜索条件、点击后会调用此方法
     showSearch(){
       console.log('到我了')
+      this.searchWhether = !this.searchWhether
     },
     //搜索、重置、展开
     feedback(res){
@@ -259,9 +574,15 @@ export default {
           this.inDex = 4
         }
       }else if (res == '搜索'){
-        console.log(this.$refs.avatar.form)
+        this.$refs.avatar.submitForm()
+      }else if (res == '重置'){
+        this.$refs.avatar.form = {}
       }
     },
+    //表单验证通过执行搜索
+    submitForm(){
+      console.log('执行搜索')
+    },
     //点击刷新会调用此方法
     getList(){
       console.log('到我了2')