Merge branch 'master' of git.echepei.com:wengyuwen/anpinjingyuan-ui

src/api/project/index.js

@@ -24,11 +24,11 @@ export function getChange(fId) {
   })
 }
 // 查询客户详情列表
-export function getCorps(query) {
+export function getCorps(data) {
   return request({
-    url: '/basicdata/corps/selectCustomerDriverList',
-    method: 'get',
-    params: query
+    url: '/basicdata/corps/getCorpName',
+    method: 'post',
+    data: data
   })
 }
 //责任人

src/api/reportAnalysis/inoutStatistics.js.vue

@@ -0,0 +1 @@
+

src/combination/formComponent.vue

@@ -10,7 +10,7 @@
       >
         <el-input v-model="form[item.label]" :onkeyup="item.onabort" :disabled="item.disabled" 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]" :disabled="item.disabled" :style="{ width: item.width + 'px' }" filterable slot="prepend" @change="change(item.label,dataList[item.label],form[item.label])" placeholder="请选择">
+          <el-select clearable v-model="form[item.label]" :disabled="item.disabled" :style="{ width: item.width + 'px' }" filterable slot="prepend" @change="change(item.label,dataList[item.label],form[item.label])" placeholder="请选择">
             <el-option v-for="(item,index) in dataList[item.label]" :key="index" :label="item.label" :value="item.value"></el-option>
           </el-select>
         </span>

src/views/project/index1.vue

@@ -858,7 +858,7 @@ export default {
     this.corpsRemoteMethod()
     this.liableRemoteMethod()
     this.materialRemoteMethod()
-
+    this.getRow()
   },
   methods: {
     //撤销审批
@@ -981,9 +981,10 @@ export default {
     },
     /** 远程模糊查询用户 */
     corpsRemoteMethod(name) {
-      let queryParams = { fName: name }
+      let queryParams = {fTypeid:3 }
       getCorps(queryParams).then((response) => {
-        this.fMblnoOptions = response
+        console.log(response)
+        this.fMblnoOptions = response.data
       })
     },
     /** 获取责任人*/

src/views/purchaseIssue/index.vue

@@ -556,7 +556,7 @@ export default {
           span: 6,
           label: 'fCorpid',
           name: '客户名称',
-          inputType: 2,
+          inputType: 1,
           width: 200,
           labelSize: '80',
           rules: [{ required: false, message: ' ' }]
@@ -767,7 +767,7 @@ export default {
         })
       }
     })
-    this.fCompany(1)
+    this.fCompany(3)
     this.fCompany(2)
   },
   methods: {
@@ -942,7 +942,8 @@ export default {
     //查询公司
     fCompany(name) {
       company(name).then(res => {
-        if (name == 1) {
+        console.log(res)
+        if (name == 3) {
           this.dataList.fCorpid = []
           for (let item in res.data) {
             this.dataList.fCorpid.push({
@@ -1472,7 +1473,6 @@ export default {
   max-width: 100%;
   margin: 0 auto;
 }
-
 .table td {
   text-align: center;
   vertical-align: middle;
@@ -1484,11 +1484,9 @@ export default {
 .column {
   border: 1px solid #000;
 }
-
 .app-container >>> .el-form-item {
   margin-bottom: 0;
 }
-
 .print_div ::v-deep .el-table__body-wrapper{
   z-index: 2
 }
@@ -1498,4 +1496,7 @@ export default {
 .print_div ::v-deep .el-dialog__body{
    padding: 0 20px;
  }
+.app-container ::v-deep .el-table__body-wrapper{
+  z-index: 2;
+}
 </style>

src/views/purchaseRequest/index.vue

@@ -206,7 +206,7 @@ export default {
         fGoodsid: [],
         fSbu: [],
         fWarehouseid: [],
-        fCorpid: []
+        fCorpid: [],
       },
       contentList: [],
       inDex: 4,
@@ -553,7 +553,7 @@ export default {
           span: 6,
           label: 'fCorpid',
           name: '供应商',
-          inputType: 2,
+          inputType: 1,
           width: 200,
           labelSize: '80',
           rules: [{ required: false, message: ' ' }]

src/views/reportAnalysis/inoutStatistics.vue

@@ -17,12 +17,12 @@
       @feedback="feedback"
       @getList="getList"
       :hasPermi="hasPermi"
+      :tatolLabel="tatolLabel"
       :isItHidden="isItHidden"
       :customButton="customButton"
       :listStyle="listStyle"
       :queryList="queryList"
       :setRowList="setRowList"
-      :tatolLabel="tatolLabel"
     />
     <el-pagination
       style="float: right;margin-top: 10px"
@@ -46,7 +46,9 @@ export default {
   data(){
     return{
       tatolLabel:['数量'],
-      dataList:{},
+      dataList:{
+        fCorpid:[]
+      },
       tableData:[],
       setRowList:[],
       isItHidden: true,
@@ -267,11 +269,12 @@ export default {
           this.queryList.columnList = this.queryList.columnList.filter((e) => e.checked == 0)
           // this.waitFor = true
         } else {
-          this.$set(this.queryList, 'columnList', this.$options.data().contentStyle)
-          this.setRowList = this.$options.data().contentStyle
+          this.$set(this.queryList, 'columnList', this.$options.data().listStyle)
+          this.setRowList = this.$options.data().listStyle
         }
-        this.isItHidden = false
-        this.inDex = this.formOption.length
+        this.isItHidden = true
+        // this.inDex = this.formOption.length
+        this.inDex = 4
       })
     },
     //修改
@@ -328,7 +331,8 @@ export default {
   }
 }
 </script>
-
-<style scoped>
-
+<style scoped lang="scss">
+.app-container ::v-deep .el-form-item {
+  margin-bottom: 4px;
+}
 </style>

src/views/warehouse/inStock/index.vue

@@ -1454,4 +1454,7 @@ export default {
 .app-container ::v-deep .el-form-item {
   margin-bottom: 4px;
 }
+.app-container ::v-deep .el-table__body-wrapper{
+  z-index: 2;
+}
 </style>

src/views/warehouse/outStock/index.vue

@@ -1450,4 +1450,7 @@ export default {
 .app-container ::v-deep .el-form-item {
   margin-bottom: 4px;
 }
+.app-container ::v-deep .el-table__body-wrapper{
+  z-index: 2;
+}
 </style>