Merge branch 'master' of http://git.zthymaoyi.com/gdc/yiliangyiyun-pc

src/views/houseSelfCollect/acquisitionManagement.vue

@@ -1,7 +1,19 @@
 <!--收购管理-->
 <template>
-  <div class="content">
-    <div class="header">
+  <div >
+    <BaseHeaderLayout :leftSpan="12">
+      <template slot="left">
+        <el-button type="primary" @click="newAcquisition('','','新增')">新增</el-button>
+         <div>
+        <el-select v-model="selectVal" placeholder="请选择" @change="warehouseChange" style="margin:0 20px">
+          <el-option v-for="item in warehouseList" :key="item.id" :label="item.warehouseName" :value="item.id">
+          </el-option>
+        </el-select>
+        <el-checkbox v-model="checked" @change="allowEdit">允许手动编辑重量</el-checkbox>
+      </div>
+      </template>
+    </BaseHeaderLayout>
+    <!-- <div class="header">
       <div>
         <el-select v-model="selectVal" placeholder="请选择" @change="warehouseChange">
           <el-option v-for="item in warehouseList" :key="item.id" :label="item.warehouseName" :value="item.id">
@@ -10,12 +22,12 @@
         <el-checkbox v-model="checked" @change="allowEdit">允许手动编辑重量</el-checkbox>
       </div>
       <el-button type="primary" @click="newAcquisition('','','新增')">新增</el-button>
-    </div>
+    </div> -->
     <el-dialog title="新增" :visible.sync="newAcquisitionDialogVisible" width="50%">
       <acquisitionManagementAdd></acquisitionManagementAdd>
     </el-dialog>
     <div class="table-content">
-      <el-table :data="tableData" style="width: 100%">
+      <el-table :data="tableData" style="width: 100%;margin-top: 20px" border height="780">
         <el-table-column type="index" label="序号">
           <template scope="scope">
             <span v-if="scope.$index < 9">0{{ scope.$index + 1 }}</span>
@@ -33,7 +45,6 @@
         <el-table-column prop="deductWeight" label="扣重比"></el-table-column>
         <el-table-column prop="saleLimit" label="销量上限(年/吨)"></el-table-column>
         <el-table-column prop="dryGrainPrice" label="干粮收购价"></el-table-column>
-
         <el-table-column prop="status" label="状态"></el-table-column>
         <el-table-column prop="passDate" label="通过时间"></el-table-column>
         <el-table-column label="操作" width="300">
@@ -46,11 +57,12 @@
           </template>
         </el-table-column>
       </el-table>
-      <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
+      <div class="paging"> 
+         <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
         :page-size="deptCircularPage.pageSize" layout="total, sizes, prev, pager, next, jumper"
         :total="deptBudgetTotal">
       </el-pagination>
-
+      </div>
     </div>
   </div>
 </template>
@@ -65,13 +77,8 @@
   import acquisitionManagementAdd from './acquisitionManagementAdd.vue'
   import { getHp } from '@/utils/getHasPermission'
   export default {
-
-    components: {
-
-    },
-    watch: {
-
-    },
+    components: {},
+    watch: {},
     data() {
       return {
         newAcquisitionDialogVisible: false,
@@ -120,7 +127,6 @@
         this.getList()
       },
       warehouseChange(e) {
-        console.log(e)
         let _obj = this.warehouseList.find((item) => {
           return item.id === this.selectVal;
         });
@@ -133,8 +139,6 @@
   this.currentPage=1
    this.pageSize = 10
         this.getList()
-        console.log(_obj)
-
       },
       newAcquisition(index, row, type) {
         let _obj = {}
@@ -144,7 +148,6 @@
             _obj = this.warehouseList.find((item) => {
               return item.id === this.selectVal;
             });
-            console.log(_obj)
             _query = {
               warehouseId: _obj.id,
               warehouseName: _obj.warehouseName,
@@ -171,12 +174,10 @@
         selectWarehouseSelf({
           compId: this.compId,
         }).toPromise().then((response) => {
-          console.log(response)
           this.warehouseList = response
           // if(this.userJurisdiction){
           //   this.warehouseList.unshift({warehouseName:response[0].flag})
           // }
-          console.log(this.warehouseList)
           this.selectVal = this.warehouseList[0].id
           if (this.warehouseList[0].allowEdit == 1) {
 
@@ -197,29 +198,22 @@
           compId: this.compId,
 
         }).toPromise().then((response) => {
-          console.log(response)
           for (let i = 0; i < response.records.length; i++) {
             this.goodsNameList.push(response.records[i].goodsName)
           }
           this.tableData = response.records
+           this.deptBudgetTotal = response.total
         })
       },
       allowEdit(val) {
-        console.log(this.selectVal)
         purchasePriceAllowEdit({
           warehouseId: this.selectVal
         }).toPromise().then((response) => {
-
-          console.log(response)
           // this.tableData = response.records
         })
       },
-      handleEdit(index, row) {
-        console.log(index, row);
-      },
       // 删除
       delRow(index, row) {
-        console.log(index, row);
         //删除
         this.$confirm('确定删除该条设置？', '提示', {
             confirmButtonText: '确定',
@@ -251,7 +245,6 @@
         purchasePriceLook({
           id: row.id
         }).toPromise().then((response) => {
-          console.log(response.detailPrints)
           // this.tableData = response.records
           // this.getList()
           localStorage.setItem('pricePrintList', JSON.stringify(response.detailPrints));
@@ -270,4 +263,10 @@
     justify-content: space-between;
     align-items: center;
   }
+  /deep/.el-table .cell{
+    text-align: center;
+  }
+  .paging{
+    text-align: center;
+  }
 </style>

src/views/houseSelfCollect/acquisitionManagementAdd.vue

@@ -1,7 +1,7 @@
 <!-- <!--收购管理新增-->
 <template>
   <el-container class="container">
-    <div class="type">{{type}}</div>
+    <!-- <div class="type">{{type}}</div> -->
     <el-header class="header">
       <img class="head-icon" src="../../../public/img/icons/acquisition6.png" alt="">
       <div class="head-title">{{baseInfoForm.warehouseName}}</div>
@@ -284,7 +284,7 @@
             deductWeight: '',
             waterMin: '',
             waterMax: '',
-            saleLimit: '',
+            saleLimit: 500,
             statusFlag: '',
             status: '',
             workflowId: '',
@@ -1114,7 +1114,7 @@
     align-items: center;
     border-bottom: 1px solid #E9ECF7;
     padding-bottom: 10px;
-    width: 80%;
+    width: 100%;
 
     .head-icon {
       width: 19px;

src/views/houseSelfCollect/component/routers/route.js

@@ -25,21 +25,6 @@ const houseSelfCollectRouter = {
         permissicon: [],
         keepAlive: true
       }
-    },
-    //客户管理编辑
-    {
-      path: 'customerManagementEdit',
-      component: () =>
-        import(/* webpackChunkName: "sparepartList" */ '@/views/houseSelfCollect/customerManagementEdit'),
-      name: 'customerManagementEdit',
-      meta: {
-        title: 'customerManagementEdit',
-        shortcutEntrance: 'houseSelfCollect',
-        module: 'procurement.procurementOrder.delete',
-        permissicon: [],
-        keepAlive: true
-      },
-      hidden: true
     },
         //客户管理添加
         {

src/views/houseSelfCollect/customerManagementAdd.vue

@@ -52,7 +52,6 @@
               </el-upload>
             </div>
           </div>
-
           <ws-form-item label="姓名" span="1" prop="customerName" label-width="80px">
             <ws-input v-model="customerList.customerName" placeholder="请输入姓名" maxlength="15" size="small"
               :disabled="disabled" />
@@ -268,12 +267,14 @@
           })
           .toPromise()
           .then((response) => {
-            if (response.recPerson != "") {
+            if (response.recPerson ) {
               this.customerList.customerName = response.recPerson
             }
-            if (response.recPersonNo != "") {
+            console.log(this.customerList.customerName)
+            if (response.recPersonNo ) {
               this.customerList.customerNumberCard = response.recPersonNo
             }
+            console.log(this.customerList.customerNumberCard)
           })
       },
       upLoadSuccess2(e) {
@@ -285,13 +286,14 @@
           })
           .toPromise()
           .then((response) => {
-            if (response.recPerson != "") {
+            if (response.recPerson ) {
               this.customerList.customerName = response.recPerson
             }
-            if (response.recPersonNo != "") {
+            
+            if (response.recPersonNo ) {
               this.customerList.customerNumberCard = response.recPersonNo
-
             }
+            
           })
       },
       bankSuccess1(e) {

src/views/houseSelfCollect/customerManagementEdit.vue

@@ -1,115 +0,0 @@
-<!--客户管理-->
-<template>
-  <div class="content">
-    客户管理编辑
-  </div>
-</template>
-<script>
-// import xx
-// '@/model/houseSelfCollect/index'
-
-export default {
-  components: {},
-  watch: {},
-  data() {
-    return {
-      searchKeyWord: '',
-      customertList:{
-        records:[
-          {
-            contractNo:"小王",
-            goodsName:"17127741111",
-            weight:"111111111",
-            unitContractPrice:'312321312132321',
-            packingMethod:"12213321231fsfssfd",
-            status:"fsdfsdfsd"
-            
-          }
-        ]
-      },
-       currentPage: 1,
-      pageSize: 10,
-      deptBudgetTotal: 0,
-      deptCircularPage: {},
-    }
-  },
-  methods: {
-    find() {
-      console.log('搜索')
-    },
-    getCustomer() {},
-    createCustomer() {},
-        handleSizeChange(val) {
-      console.log(`每页 ${val} 条`)
-      this.pageSize = val
-      this.getList()
-    },
-    handleCurrentChange(val) {
-      this.currentPage = val
-      console.log(`当前页: ${val}`)
-      this.getList()
-    },
-        handleExamine(row) {
-      console.log(row)
-      // this.$router.push({
-      //   name: 'purchaseContractExamine',
-      //   query: { id: row.id, status: row.status },
-      // })
-    },
-        handleEdit(row) {
-          console.log(row)
-      this.$router.push({
-        name: 'purchaseContractEdit',
-        query: { id: row.id },
-      })
-    },
-        handleDelete(row) {
-          console.log(row)
-      // var text = ''
-      // if (row.deliverType == 1) {
-      //   text =
-      //     '删除该合同将同时永久删除合同对应的临时仓库相关数据，是否确定删除？'
-      // } else {
-      //   text = '合同删除后不可恢复，是否继续删除？'
-      // }
-      // this.$confirm(text, '提示', {
-      //   confirmButtonText: '确定',
-      //   cancelButtonText: '取消',
-      //   type: 'warning',
-      // })
-      //   .then(() => {
-      //     deletecontract({ id: row.id })
-      //       .toPromise()
-      //       .then((response) => {
-      //         this.$notify.success({
-      //           title: '成功',
-      //           message: '删除成功',
-      //         })
-      //         this.getList()
-      //       })
-      //       .catch((response) => {})
-      //   })
-      //   .catch(() => {
-      //     return false
-      //   })
-    },
-    getList(){}
-  }
-}
-</script>
-<style lang="scss" scoped>
-.content{
-  padding: 20px;
-}
-.seach {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  .find {
-    width: 32px;
-  }
-  .search-left {
-    display: flex;
-  }
-}
-</style>

src/views/houseSelfCollect/inspectInfo.vue

@@ -412,7 +412,7 @@
         this.inspect.warehouseName = this.warehouseName
         this.inspect.compId = sessionStorage.getItem('ws-pf_compId')
         this.inspect.qualityInspector = sessionStorage.getItem('ws-pf_staffName')
-        if (this.types == null) {
+        if (this.types == 1) {
           this.$confirm('确定保存质检信息？', '提示', {
               confirmButtonText: '确定',
               cancelButtonText: '取消',

src/views/houseSelfCollect/inspectionManagement.vue

@@ -80,7 +80,7 @@
         <template slot-scope="scope">
           <el-button @click="inspectInfo(scope.row, 2)">查看</el-button>
           <el-button @click="inspectInfo(scope.row, 3)">编辑</el-button>
-          <el-button @click="del(scope.row)">删除</el-button>
+          <el-button @click="del(scope.row)" type="danger">删除</el-button>
           <el-button @click="print(scope.row)">打印</el-button>
         </template>
       </el-table-column>

src/views/houseSelfCollect/paymentManagement.vue

@@ -3,9 +3,9 @@
   <div>
     <BaseHeaderLayout :leftSpan="12">
       <template slot="left">
-        <ws-button type="primary">待结算</ws-button>
-        <ws-button type="primary">待审核</ws-button>
-        <ws-button type="primary">全部</ws-button>
+        <ws-button type="primary" @click="screen(2)">待结算</ws-button>
+        <ws-button type="primary" @click="screen()">待审核</ws-button>
+        <ws-button type="primary"  @click="screen()">全部</ws-button>
         <ws-button type="primary" @click="reject">驳回</ws-button>
         <ws-button type="primary" @click="adopt">通过</ws-button>
         <ws-button type="primary" @click="payment">付款</ws-button>
@@ -53,7 +53,7 @@
       style="width: 100%; margin-top: 20px"
       ref="paymentList"
       border
-      height="680"
+      height="780"
       @selection-change="handleSelectionChange"
     >
       <el-table-column
@@ -308,9 +308,6 @@ export default {
       .toPromise()
       .then((response) => {
         this.warehouseList = response
-        // this.$set(this.warehouseName,response[0].warehouseName)
-        // this.warehouseName=response[0].warehouseName
-        // this.warehouse=response[0]
         this.warehouseList = response
         this.warehouseNameKey = this.warehouseList[0].id
         this.warehouseName = this.warehouseList[0].warehouseName
@@ -345,6 +342,7 @@ export default {
         .toPromise()
         .then((response) => {
           this.paymentList = response
+           this.deptBudgetTotal = response.total
         })
     },
     del(row) {
@@ -369,6 +367,11 @@ export default {
           return false
         })
     },
+    screen(num){
+      this.searchType = num
+      this.getList()
+
+    },
     find(){
        this.getList()
     },

src/views/houseSelfCollect/weighingManagement.vue

@@ -125,7 +125,6 @@
       >
       </el-pagination>
     </div>
-
     <el-dialog
       width="70%"
       class="table-content"
@@ -241,14 +240,9 @@ export default {
         },
       })
     },
-    // Reacquire() {
-    //   //重新获取
-    // },
     find() {
       this.getList()
     },
-
-  
     handleSizeChange(val) {
       console.log(`每页 ${val} 条`)
       this.pageSize = val
@@ -311,7 +305,6 @@ export default {
         .catch((response) => {
           // EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
         })
-      
     },
   },
 }
@@ -380,7 +373,6 @@ table {
 }
 .bottom-row1 {
   display: flex;
-  // justify-content: space-between;
   margin: 10px 0;
 }
 
@@ -395,7 +387,6 @@ table {
       margin-right: 118px;
     }
   }
-
   .config {
     margin-top: 20px;
     margin-right: 240px;
@@ -404,11 +395,9 @@ table {
     margin-top: 20px;
   }
 }
-
 .bottom-row3 {
   margin: 10px 0;
 }
-
 .bottom-row4 {
   margin-top: 50px;
   text-align: center;