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

src/views/houseSelfCollect/paymentManagement.vue

@@ -344,21 +344,21 @@ export default {
           this.deptBudgetTotal = response.total
         })
         this.isShowAdopt = true
-    //  getpayment({
-    //      currentPage: 1,
-    //     pageSize: 99999,
-    //     warehouseName: this.warehouseName,
-    //     managementType : 1 
-    //   })
-    //     .toPromise()
-    //     .then((response) => {
-    //       for(let i = 0 ; i < response.length ; i++){
-    //         if(response[i].taskId){
-    //           this.isShowAdopt = true
-    //           return
-    //         }
-    //       }
-    //     })
+     getpayment({
+         currentPage: 1,
+        pageSize: 99999,
+        warehouseName: this.warehouseName,
+        managementType : 1 
+      })
+        .toPromise()
+        .then((response) => {
+          for(let i = 0 ; i < response.length ; i++){
+            if(response[i].taskId){
+              this.isShowAdopt = true
+              return
+            }
+          }
+        })
     },
     del(row) {
       this.$confirm(

src/views/statisticalReport/stockPurchaseReceiptReportList.vue

@@ -44,7 +44,7 @@
           >
           <ws-button
             type="primary"
-            v-hasPermission="`report.goodsProcurementInReport.edit`"
+            v-hasPermission="`report.goodsProcurementInReport.view`"
             @click="addRemarks()"
             >备注</ws-button
           >
@@ -371,7 +371,7 @@
       <div slot="footer" class="dialog-footer">
         <span v-if="roleFlag == 1 ">
         <el-button @click="dialogFormVisible11 = false">取 消</el-button>
-        <el-button type="primary" @click="remarksSubmit()">保存</el-button>
+        <el-button type="primary" v-hasPermission="`report.goodsProcurementInReport.edit`" @click="remarksSubmit()">保存</el-button>
         </span>
         <span v-else><el-button @click="dialogFormVisible11 = false">关 闭</el-button></span>
       </div>
@@ -827,7 +827,7 @@ export default {
       if (this.modification.length == 0) {
         this.$message.warning('请选择一条要审核的条目')
       } else {
-        this.$confirm(`审核通过后，任务将发送给财务，是否确定通过？`, {
+        this.$confirm(`审核通过后，任务将发送给下一级，是否确定通过？`, {
           cancelButtonText: '取消',
           confirmButtonText: '确定',
           type: 'warning',

src/views/taskManagement/tranManagementWarehouseInOutTask.vue

@@ -507,6 +507,8 @@ export default {
           this.searchType = this.taskTypeList[i].type
         }
       }
+      this.currentPage=1,
+      this.getList()
     },
     handleExamine(row) {
       this.$router.push({

src/views/taskManagement/tranManagementWarehouseInOutTaskAudit.vue

@@ -983,16 +983,16 @@ export default {
     },
     requestadd(list, status) {
       list.compId = sessionStorage.getItem('ws-pf_compId')
-      // list.publisher =
-      //   sessionStorage.getItem('ws-pf_roleName') +
-      //   sessionStorage.getItem('ws-pf_staffName')
+      list.publisher =
+        sessionStorage.getItem('ws-pf_roleName') +
+        sessionStorage.getItem('ws-pf_staffName')
       warehousetask(list)
         .toPromise()
         .then(response => {
           woekflowhandle({
             taskId: list.taskId,
             approved: true,
-            auditMind: '无',
+            auditMind: '34',
             needReapply: false
           })
             .toPromise()
@@ -1004,9 +1004,7 @@ export default {
     },
     requestaudit(list, status) {
       list.compId = sessionStorage.getItem('ws-pf_compId')
-      // list.publisher =
-      //   sessionStorage.getItem('ws-pf_roleName') +
-      //   sessionStorage.getItem('ws-pf_staffName')
+      list.publisher =sessionStorage.getItem('ws-pf_roleName') + sessionStorage.getItem('ws-pf_staffName')
       warehousetask(list)
         .toPromise()
         .then(response => {

src/views/warehouse/warehouseManagementIossRecord.vue

@@ -30,7 +30,7 @@
           src="../../../public/img/cangku.png"
           alt=""
         />
-        <span style="color: #323233">{{ deptBudgetList.warehouseName }}库</span>
+        <span style="color: #323233">{{ deptBudgetList.warehouseName }}</span>
         <span class="ware">{{ binNumber }}仓位</span>
       </h2>
       <el-table

src/views/warehouse/warehouseManagementPerfectput.vue

@@ -685,12 +685,14 @@ export default {
         confirmButtonText: '确定',
         type: 'warning',
       })
-        .then(() => {
+        .then(() => {debugger
           this.$refs.dataList.validate((valid) => {
             if (valid) {
               this.dataList.compId = sessionStorage.getItem('ws-pf_compId')
               this.dataList.inOutFlag = 2
               this.dataList.statusFlag = 1
+              let _data = JSON.parse(sessionStorage.getItem('winseaview-userInfo'))
+              this.dataList.backOffice  = _data.content.showCompName+'-' +_data.content.staffName
               addstorageputList(this.dataList)
                 .toPromise()
                 .then((response) => {

src/views/warehouse/warehouseManagementPut.vue

@@ -210,6 +210,7 @@
           <!--净重（吨）-->
           <ws-form-item label="扣款（元/吨）" span="1" prop="deductionAmount">
             <ws-input
+            @input="kkInput(deptBudgetList.deductionAmount)"
               v-model="deptBudgetList.deductionAmount"
               placeholder="请输入扣款金额"
               maxlength="120"
@@ -239,6 +240,7 @@
               v-model="deptBudgetList.agent"
               placeholder="请选择经办人"
               filterable
+              clearable
               :filter-method="dataFilter"
               @change="selectstaff"
             >
@@ -414,14 +416,32 @@
       <div class="small-title">化验数据（选填）</div>
       <div class="inspector">
         <!--自检员-->
-        <ws-form-item label="质检员" span="1" prop="qualityInspector">
+        <!-- <ws-form-item label="质检员" span="1" prop="qualityInspector">
           <ws-input
             v-model="deptBudgetList.warehouseInOutDetail.qualityInspector"
             placeholder="请输入质检员姓名"
             maxlength="10"
             size="small"
           />
-        </ws-form-item>
+        </ws-form-item> -->
+                 
+        <ws-form-item label="自检员" span="1" prop="qualityInspector">
+            <el-select
+              v-model="deptBudgetList.warehouseInOutDetail.qualityInspector"
+              placeholder="请选择自检员"
+              filterable
+              clearable
+              :filter-method="qualityDataFilter"
+              @change="qualityInspectorChange"
+            >
+              <el-option
+                v-for="item in qualityInspectorList"
+                :key="item.value"
+                :label="item.staffName"
+                :value="item.staffName"
+              />
+            </el-select>
+          </ws-form-item>
       </div>
 
       <div class="neifor">
@@ -540,6 +560,8 @@ export default {
   },
   data() {
     return {
+      qualityInspectorList:[],
+      isGetCost:false,
       isSelectType:true,
       //弹出框
       dialogViewSpareMoney: false,
@@ -609,9 +631,10 @@ export default {
         cost: '',
         addressUrl:'',
         warehouseInOutDetail: {},
+        deductionAmount:0,
       },
       historyList: [],
-
+      cost:'',
       pickerBeginDateBefore: {
         disabledDate: (time) => {
           return time.getTime() > Date.now()
@@ -630,6 +653,14 @@ export default {
     this.getList()
     this.deptBudgetList.grade = '一等品'
     this.deptBudgetList.gradeKey = '1'
+       if(this.deptBudgetList.cost){
+        if(this.deptBudgetList.cost>val){
+           this.deptBudgetList.cost = this.cost - this.deptBudgetList.deductionAmount
+          }
+       else{
+         
+       }
+      }
     // if (this.deptBudgetList.warehouseType == 1) {
     //   this.deptBudgetList.inOutType = '采购入库'
     //   this.deptBudgetList.inOutTypeKey = '1'
@@ -639,6 +670,17 @@ export default {
     // }
   },
   methods: {
+    qualityInspectorChange(e){
+      console.log(e)
+    },
+    kkInput(val){debugger
+      console.log(val)
+      if(this.isGetCost){
+        if(this.deptBudgetList.cost>val){
+           this.deptBudgetList.cost = this.cost - this.deptBudgetList.deductionAmount
+          }
+      }
+    },
     uploadSuccessHandle1(res) {
       this.deptBudgetList.addressUrl = res.url
       console.log(this.deptBudgetList.addressUrl)
@@ -679,6 +721,7 @@ export default {
       }
     },
     editClick(status) {
+      this.isGetCost = false
       if (status == 1) {
         this.disabled1 = !this.disabled1
       } else {
@@ -916,7 +959,7 @@ export default {
         })
         return
       }
-      if (!this.deptBudgetList.cost) {
+      if (!this.deptBudgetList.freight) {
         this.$message({
           message: '运费不能为空',
           type: 'warning',
@@ -924,11 +967,11 @@ export default {
         return
       }
       if (
-        this.deptBudgetList.cost < 0 ||
-        this.deptBudgetList.cost > 100000 ||
-        (String(this.deptBudgetList.cost).indexOf('.') != -1 &&
-          String(this.deptBudgetList.cost).length -
-            (String(this.deptBudgetList.cost).indexOf('.') + 1) >
+        this.deptBudgetList.freight < 0 ||
+        this.deptBudgetList.freight > 100000 ||
+        (String(this.deptBudgetList.freight).indexOf('.') != -1 &&
+          String(this.deptBudgetList.freight).length -
+            (String(this.deptBudgetList.freight).indexOf('.') + 1) >
             2)
       ) {
         this.$message({
@@ -1717,6 +1760,8 @@ export default {
                 sessionStorage.getItem('ws-pf_compId')
               this.deptBudgetList.inOutFlag = 2
               this.deptBudgetList.statusFlag = 1
+              let _data = JSON.parse(sessionStorage.getItem('winseaview-userInfo'))
+                this.dataList.backOffice  = _data.content.showCompName+'-' +_data.content.staffName
               addstorageputList(this.deptBudgetList)
                 .toPromise()
                 .then((response) => {
@@ -1764,7 +1809,15 @@ export default {
         if (this.outContractNo[i].contractNo == e) {
           this.deptBudgetList.goodsName = this.outContractNo[i].goodsName
           this.deptBudgetList.goodsNameKey = this.outContractNo[i].goodsNameKey
-          this.deptBudgetList.cost = this.outContractNo[i].contractPrice
+          // this.deptBudgetList.cost = this.outContractNo[i].contractPrice
+          this.cost = this.outContractNo[i].contractPrice
+          if(this.cost){
+            this.isGetCost = true
+              this.deptBudgetList.cost = this.cost - this.deptBudgetList.deductionAmount
+          }else{
+             this.isGetCost = false
+             this.deptBudgetList.cost = this.deptBudgetList.cost
+          }
           this.deptBudgetList.inOutType = this.outContractNo[i].inOutType
           if(this.outContractNo[i].inOutType=='移库入库'){
             this.isSelectType = false
@@ -1891,6 +1944,7 @@ export default {
         .toPromise()
         .then((response) => {
           this.options = response
+          this.qualityInspectorList = response
           this.staffList = response
           //  this.agent = response
         })