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

src/views/contractManagement/purchaseContractAdd.vue

@@ -240,6 +240,7 @@
           prop="unitContractPrice"
         >
           <ws-input
+            @input="pricechange"
             v-model="deptBudgetList.unitContractPrice"
             placeholder="请输入合同单价"
             maxlength="100"
@@ -609,6 +610,7 @@ export default {
       deptBudgetList: {
         deliverType: '1',
         finalTradingVolume: 0,
+        totalContractPrice:0,
         contractGoodsInfo: {
           goodsName: '',
         },
@@ -692,6 +694,9 @@ export default {
     weightchange(e) {
       this.deptBudgetList.finalTradingVolume = e
     },
+    pricechange(e) {
+      this.deptBudgetList.totalContractPrice = e*this.deptBudgetList.weight
+    },
     returnsales() {
       this.$router.push({ path: 'buyContract' })
     },
@@ -1334,6 +1339,7 @@ export default {
               this.deptBudgetList = {
                 deliverType: '1',
                 finalTradingVolume: 0,
+                totalContractPrice:0,
                 contractGoodsInfo: {
                   goodsName: '',
                 },

src/views/contractManagement/purchaseContractEdit.vue

@@ -506,7 +506,7 @@ import {
   delxiala,
   examineList,
   editInfo,
-  getstaff,
+  getstafffind
 } from '@/model/contarct/index'
 import WsUpload from '@/components/WsUpload'
 import { EventBus, dayjs } from 'base-core-lib'
@@ -569,7 +569,7 @@ export default {
   },
 
   activated() {
-    getstaff({ compId: sessionStorage.getItem('ws-pf_compId') })
+    getstafffind({ roles: 'd6a5c8a52da544309259f91f75de1ec6' })
       .toPromise()
       .then((response) => {
         this.options = response

src/views/contractManagement/salesContractAdd.vue

@@ -258,6 +258,7 @@
             prop="unitContractPrice"
           >
             <ws-input
+              @input="pricechange"
               v-model="deptBudgetList.unitContractPrice"
               placeholder="请输入合同单价"
               maxlength="100"
@@ -621,6 +622,7 @@ export default {
       deptBudgetList: {
         deliverType: '1',
         finalTradingVolume: 0,
+        totalContractPrice:0,
         contractGoodsInfo: {
           goodsName: '',
         },
@@ -1319,6 +1321,7 @@ export default {
               this.deptBudgetList = {
                 deliverType: '1',
                 finalTradingVolume: 0,
+                totalContractPrice:0,
                 contractGoodsInfo: {
                   goodsName: '',
                 },
@@ -1425,6 +1428,9 @@ export default {
     weightchange(e) {
       this.deptBudgetList.finalTradingVolume = e
     },
+    pricechange(e) {
+      this.deptBudgetList.totalContractPrice = e*this.deptBudgetList.weight
+    },
     // 编辑
     editClick(item, index) {
       const map = JSON.parse(JSON.stringify(item))

src/views/statisticalReport/salesClosingCashierList.vue

@@ -465,7 +465,7 @@ export default {
         posthandle({
           taskId: item.taskId,
           approved: status,
-          auditMind: reason != undefined ? '已驳回' : '34',
+          auditMind: reason != undefined ? '已驳回' : '无',
           needReapply: status2 != undefined ? true : false,
         })
           .toPromise()

src/views/statisticalReport/salesDeliveryReportList.vue

@@ -610,7 +610,7 @@ export default {
         posthandle({
           taskId: item.taskId,
           approved: status,
-          auditMind: reason != undefined ? '已驳回' : '34',
+          auditMind: reason != undefined ? '已驳回' : '无',
           needReapply: status2 != undefined ? true : false,
         })
           .toPromise()

src/views/statisticalReport/stockPurchaseReceiptReportList.vue

@@ -816,7 +816,7 @@ export default {
         posthandle({
           taskId: item.taskId,
           approved: status,
-          auditMind: reason != undefined ? '已驳回' : '34',
+          auditMind: reason != undefined ? '已驳回' : '无',
           needReapply: status2 != undefined ? true : false,
         })
           .toPromise()

src/views/taskManagement/tranManagementWarehouseInOutTaskAudit.vue

@@ -992,7 +992,7 @@ export default {
           woekflowhandle({
             taskId: list.taskId,
             approved: true,
-            auditMind: '34',
+            auditMind: '无',
             needReapply: false
           })
             .toPromise()

src/views/warehouse/warehouseManagementEdit.vue

@@ -83,6 +83,7 @@
             v-model="deptBudgetList.otherPersonPhone"
             placeholder="请选择其他负责人"
             @change="selectstaffOther"
+            :filter-method="dataFilter1"
             filterable 
             multiple
           >
@@ -236,13 +237,15 @@
 </template>
 <script>
 import { getFileList, saveFiles } from '@/model/upload'
+import {
+  getstafffind,
+} from '@/model/contarct/index'
 import {
   xiala,
   billoperatehis,
   getLook,
   edit,
-  delPosition,
-  getstaff,
+  delPosition
 } from '@/model/warehouse/index'
 import { regionData, CodeToText, TextToCode } from 'element-china-area-data'
 import { downloadFile } from '@/utils/batchDown'
@@ -313,6 +316,7 @@ export default {
         },
       },
       options: [],
+      staffList1:[],
       optionsOther: [],
       value: '',
       accessoryTFs: false,
@@ -321,11 +325,12 @@ export default {
   },
   activated() {
     this.loaddata()
-    getstaff({ compId: sessionStorage.getItem('ws-pf_compId'),warehouseId:'' })
+    getstafffind({ roles: 'd6a5c8a52da544309259f91f75de1ec6' })
       .toPromise()
       .then((response) => {
         this.options = response
         this.optionsOther = response
+        this.staffList1 = response
         this.staffList = response
       })
     this.showType = this.isShow
@@ -378,6 +383,23 @@ export default {
         this.options = this.staffList
       }
     },
+    dataFilter1(val) {
+      this.deptBudgetList.personCharge = val
+      if (val) {
+        //val存在
+        this.optionsOther = this.staffList1.filter((item) => {
+          if (
+            !!~item.staffName.indexOf(val) ||
+            !!~item.staffName.toUpperCase().indexOf(val.toUpperCase())
+          ) {
+            return true
+          }
+        })
+      } else {
+        //val为空时，还原数组
+        this.optionsOther = this.staffList1
+      }
+    },
     selectstaff(e) {
       for (var i = 0; i < this.staffList.length; i++) {
         if (this.staffList[i].staffName == e) {

src/views/warehouse/warehouseManagementIoss.vue

@@ -290,7 +290,7 @@ export default {
         })
         return
       }
-      if (this.deptBudgetList.physicalInventory <= 0) {
+      if (this.deptBudgetList.physicalInventory < 0) {
         this.$message({
           message: '实际库存输入错误！',
           type: 'warning',