ソースを参照

分配编辑数据未改变问题

gjy 2 年 前
コミット
1fcf82f83b

+ 4 - 0
src/views/profitable/cashout.vue

@@ -755,4 +755,8 @@ console.log(this.Num,11111111111)
   height:100px;
   line-height:100px;
 }
+/deep/.el-upload-list--picture-card .el-upload-list__item{
+  width: 100px;
+  height:100px;
+}
 </style>

+ 6 - 3
src/views/profitable/expenseallotaduit.vue

@@ -193,11 +193,14 @@
       amount: function () {
         // `this` 指向 vm 实例
         var num=0
-        for (let i = 0; i < this.feeDetailsDistributions.length; i++) {
-          if(this.feeDetailsDistributions[i].distributionMoney){
-            num+=Number(this.feeDetailsDistributions[i].distributionMoney)
+        if(this.feeDetailsDistributions){
+          for (let i = 0; i < this.feeDetailsDistributions.length; i++) {
+            if(this.feeDetailsDistributions[i].distributionMoney){
+              num+=Number(this.feeDetailsDistributions[i].distributionMoney)
+            }
           }
         }
+        
         return num
       }
     },

+ 4 - 0
src/views/profitable/payment.vue

@@ -285,4 +285,8 @@
   height:100px;
   line-height:100px;
 }
+/deep/.el-upload-list--picture-card .el-upload-list__item{
+  width: 100px;
+  height:100px;
+}
 </style>

+ 4 - 0
src/views/profitable/receipt.vue

@@ -408,4 +408,8 @@
   height:100px;
   line-height:100px;
 }
+/deep/.el-upload-list--picture-card .el-upload-list__item{
+  width: 100px;
+  height:100px;
+}
 </style>

+ 4 - 0
src/views/profitable/receiptaduit.vue

@@ -306,4 +306,8 @@
   height:100px;
   line-height:100px;
 }
+/deep/.el-upload-list--picture-card .el-upload-list__item{
+  width: 100px;
+  height:100px;
+}
 </style>

+ 65 - 6
src/views/taskManagement/tranManagementWarehouseInOutTask.vue

@@ -1,7 +1,7 @@
 <!--出入库任务-->
 <template>
   <div class="container">
-    <BaseHeaderLayout :leftSpan="12">
+    <BaseHeaderLayout :leftSpan="6">
       <template slot="left">
         <ws-button type="primary" @click="handleAdd()" v-hasPermission="
             `warehouseManagement.warehouse.warehouseInfoTask.add`
@@ -9,7 +9,17 @@
         </ws-button>
       </template>
       <template slot="right">
-        <span style="width: 98px; display: inline-block; color: #8890b1">状态:</span>
+        <ws-select v-model="warehouseNametext" placeholder class="typeselect" @change="warehousechange" :value="warehouseName">
+           <ws-option  key="全部仓库" label="全部仓库" value="全部仓库"
+            style="color: #8890b1" />
+          <ws-option v-for="item in warehouseList" :key="item.id" :label="item.warehouseName" :value="item.warehouseName"
+            style="color: #8890b1" />
+        </ws-select>
+        <ws-select v-model="publishertext" placeholder class="typeselect" @change="publisherchange" :value="publisher">
+          <ws-option  key="全部发布者" label="全部发布者" value="全部发布者" style="color: #8890b1" />
+          <ws-option v-for="item in staffList" :key="item.id" :label="item.staffName" :value="item.staffName"
+            style="color: #8890b1" />
+        </ws-select>
         <ws-select v-model="searchTypeText" placeholder class="typeselect" @change="selecttaskType" :value="searchType">
           <ws-option v-for="item in taskTypeList" :key="item.value" :label="item.value" :value="item.value"
             style="color: #8890b1" />
@@ -136,6 +146,12 @@
     movestates,
     setcorrect
   } from '@/model/tasksport/index'
+  import {
+  selectWarehouseSelf,
+} from '@/model/houseSelfCollect/index'
+  import {
+    getstafffind,
+  } from '@/model/contarct/index'
   import {
     downloadFile
   } from '@/utils/batchDown'
@@ -179,7 +195,9 @@
         primary: '1',
         pageSize: 10,
         searchType: '',
-        searchTypeText: '全部任务',
+        publishertext:'全部发布者',
+        publisher:'',
+        searchTypeText: '全部状态',
         searchKeyWord: '',
         inOutType:'',
         inOutTypeList:[
@@ -242,7 +260,7 @@
             type: 4
           },
           {
-            value: '全部任务',
+            value: '全部状态',
             type: ''
           },
         ],
@@ -250,11 +268,14 @@
         submitType: true,
         size: 10,
         spanArr: [],
-        warehouseName: '',
+        warehouseNametext: '全部仓库',
+        warehouseName:'',
         deptBudgetTotal: 0,
+        warehouseList:[],
         compId: localStorage.getItem('ws-pf_compId'),
         deptCircularPage: {},
         historyList: [],
+        staffList:[],
         pickerBeginDateBefore: {
           disabledDate: (time) => {
             return time.getTime() > Date.now()
@@ -264,10 +285,26 @@
       }
     },
     activated() {
+      
       this.getList()
       this.showType = this.isShow
     },
     mounted() {
+      selectWarehouseSelf({
+        compId: localStorage.getItem('ws-pf_compId'),
+      })
+        .toPromise()
+        .then((response) => {
+          this.warehouseList=response
+          // console.log(response)
+        })
+        getstafffind({
+          roles: 'd6a5c8a52da544309259f91f75de1ec6'
+        })
+        .toPromise()
+        .then((response) => {
+          this.staffList = response
+        })
       this.getList()
       this.showType = this.isShow
     },
@@ -349,7 +386,9 @@
             pageSize: this.pageSize,
             searchType: this.searchType,
             searchKeyWord: this.searchKeyWord,
-            inOutType:this.inOutType
+            inOutType:this.inOutType,
+            warehouseName:this.warehouseName,
+            publisher:this.publisher
           })
           .toPromise()
           .then((response) => {
@@ -512,6 +551,26 @@
         this.currentPage = 1,
           this.getList()
       },
+      warehousechange(e){
+        if(e=='全部仓库'){
+          this.warehouseName=''
+        }else{
+          this.warehouseName=e
+        }
+        console.log(e)
+        this.currentPage = 1,
+        this.getList()
+      },
+      publisherchange(e){
+        if(e=='全部发布者'){
+          this.publisher=''
+        }else{
+          this.publisher=e
+        }
+        console.log(e)
+        this.currentPage = 1,
+        this.getList()
+      },
       handleExamine(row) {
         this.$router.push({
           name: 'salesContractExamine',