Merge branch 'master' of http://47.100.3.209:3000/gdc/yiliangyiyun-pc

src/api/V2/contract/index.js

@@ -25,6 +25,8 @@ export const API_POST_CONTRACT_DELETE = '/contractManagementInfo/deleteInfo '
 export const API_POST_EDITINFO = '/contractManagementInfo/editInfo'
 // 获取负责人
 export const API_GET_STAFF = '/staff/query/getStaffListByCompId'
+// 获取现货采购负责人
+export const API_GET_STAFF_FIND = '/staff/query/findRole'
 //运输任务-添加-根据仓库类型选库名
 export const API_GET_TRAN_TASK_WAREHOUSE = '/tranTaskInfo/selectWarehouseList'
 

src/model/contarct/index.js

@@ -21,7 +21,8 @@ import {
     API_POST_CONFIRMATIONSHEET_ADD,
     API_GET_GETINFO,
     API_POST_CONFIRMATIONSHEET_DELETE,
-    API_GET_STAFF
+    API_GET_STAFF,
+    API_GET_STAFF_FIND
 } from '@/api/V2/contract'
 // 列表
 export const getList = appRx.get(API_GET_CONTRACT_TENANT, errorCatcher, errorHandle, filter)
@@ -48,6 +49,8 @@ export const deletecontract = appRx.post(API_POST_CONTRACT_DELETE, errorCatcher,
 export const editInfo = appRx.post(API_POST_EDITINFO, errorCatcher, errorHandle, filter)
 //获取负责人
 export const getstaff = appRx.get(API_GET_STAFF, errorCatcher, errorHandle, filter)
+//获取现货采购负责人
+export const getstafffind = appRx.get(API_GET_STAFF_FIND, errorCatcher, errorHandle, filter)
 //运输任务-添加-根据仓库类型选库名
 export const getwarehousename = appRx.get(API_GET_TRAN_TASK_WAREHOUSE, errorCatcher, errorHandle, filter)
 

src/views/contractManagement/futuresPurchaseContractAdd.vue

@@ -1380,7 +1380,7 @@ export default {
       ) 
       {
         this.$message({
-          message: '合同收入金额输入错误',
+          message: '已付款金额输入错误',
           type: 'warning',
         })
         return
@@ -1399,7 +1399,7 @@ export default {
             2)
       ) {
         this.$message({
-          message: '费用金额输入错误',
+          message: '费用支出金额输入错误',
           type: 'warning',
         })
         return
@@ -1474,8 +1474,8 @@ export default {
           this.deptBudgetList.compId = this.compId
           this.deptBudgetList.contractType = 2
           this.deptBudgetList.goodsType = 2
-           if(this.deptBudgetList.deliveryProvince =="澳门特别行政区" || this.deptBudgetList.deliveryProvince == "澳门特别行政区"){
-            this.deptBudgetList.deliveryArea = "特别行政区"
+           if(this.deptBudgetList.deliveryProvince =='澳门特别行政区' || this.deptBudgetList.deliveryProvince == '澳门特别行政区'){
+            this.deptBudgetList.deliveryArea = '特别行政区'
           }else{ 
                  this.deptBudgetList.deliveryArea =  CodeToText[this.selectedOptions[2]]
           }

src/views/contractManagement/purchaseContractAdd.vue

@@ -548,7 +548,7 @@ import {
   addxiala,
   editxiala,
   delxiala,
-  getstaff,
+  getstafffind,
 } from '@/model/contarct/index'
 import { regionData, CodeToText, TextToCode } from 'element-china-area-data'
 import { dayjs, fmoney, EventBus } from 'base-core-lib'
@@ -644,7 +644,7 @@ export default {
     this.deptBudgetList.contractProcessInfo.gradeKey = 1
     this.deptBudgetList.contractGoodsInfo.grade = '一等品'
     this.deptBudgetList.contractGoodsInfo.gradeKey = 1
-    getstaff({ compId: sessionStorage.getItem('ws-pf_compId') })
+    getstafffind({ roles: 'd6a5c8a52da544309259f91f75de1ec6' })
       .toPromise()
       .then((response) => {
         this.options = response

src/views/statisticalReport/stockPurchaseReceiptReportList.vue

@@ -411,6 +411,7 @@ import {
   stockPurchasePayMoney,
 } from '@/model/statisticalReport/index'
 import { downloadFile } from '@/utils/batchDown'
+import { posthandle } from '@/model/purchasingManagement/index'
 import Pagination from '@/components/Pagination'
 import WsUpload from '@/components/WsUpload'
 import { EventBus } from 'base-core-lib'
@@ -810,37 +811,37 @@ export default {
         })
       }
     },
-    // audit(item, index, status, status2, reason) {
-    //   if (index < this.modification.length) {
-    //     posthandle({
-    //       taskId: item.taskId,
-    //       approved: status,
-    //       auditMind: reason != undefined ? '已驳回' : '34',
-    //       needReapply: status2 != undefined ? true : false,
-    //     })
-    //       .toPromise()
-    //       .then((response) => {
-    //         this.audit(
-    //           this.modification[index + 1],
-    //           index + 1,
-    //           status,
-    //           status2,
-    //           reason
-    //         )
-    //       })
-    //       .catch((req) => {
-    //         this.$message.warning(req.message)
-    //       })
-    //   } else {
-    //     if (status == true) {
-    //       this.$message.success('通过成功')
-    //       this.getList()
-    //     } else if (status == false) {
-    //       this.$message.success('驳回成功')
-    //       this.getList()
-    //     }
-    //   }
-    // },
+    audit(item, index, status, status2, reason) {
+      if (index < this.modification.length) {
+        posthandle({
+          taskId: item.taskId,
+          approved: status,
+          auditMind: reason != undefined ? '已驳回' : '34',
+          needReapply: status2 != undefined ? true : false,
+        })
+          .toPromise()
+          .then((response) => {
+            this.audit(
+              this.modification[index + 1],
+              index + 1,
+              status,
+              status2,
+              reason
+            )
+          })
+          .catch((req) => {
+            this.$message.warning(req.message)
+          })
+      } else {
+        if (status == true) {
+          this.$message.success('通过成功')
+          this.getList()
+        } else if (status == false) {
+          this.$message.success('驳回成功')
+          this.getList()
+        }
+      }
+    },
     handlereject(status) {
       var that = this
       if (this.modification.length == 0) {

src/views/taskManagement/moveWarehouseTask.vue

@@ -217,7 +217,7 @@ export default {
       currentPage: 1,
       pageSize: 10,
       searchType: 1,
-      searchTypeText: '待审核',
+      searchTypeText: '执行中',
       searchKeyWord: '',
       contractType: 2,
       taskTypeKey: 3,

src/views/warehouse/warehouseManagementDelivery.vue

@@ -145,16 +145,6 @@
               size="small"
             />
           </ws-form-item>
-          <!--净重（吨）-->
-          <ws-form-item label="扣款" span="1" prop="deductionAmount">
-            <ws-input
-              v-model="deptBudgetList.deductionAmount"
-              type="number" @mousewheel.native.prevent
-              placeholder="请输入扣款金额"
-              maxlength="120"
-              size="small"
-            />
-          </ws-form-item>
           <!-- 品级 -->
           <ws-form-item label="品级" span="1" class="readonly">
             <ws-select
@@ -229,19 +219,22 @@
           </ws-form-item>
         </ws-info-table>
       </div>
-      <div class="small-title">上传仓库照片</div>
-      <ws-upload
-        ref="upload"
-        table-name="maintain_work_order"
-        oss-key="mainPlan"
-        :comp-id="compId"
-        :appendix-ids="appendixIdsAdd"
-        :vesselId="deptBudgetList.addressUrl"
-        :size-limit="size"
-        @uploadSuccess="uploadSuccess"
-        @onChange="onChange"
-        accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar"
-      />
+      <div class="small-title">上传磅单照片</div>
+      <el-upload
+            action="https://www.zthymaoyi.com/upload/admin"
+            :show-file-list="false"
+            :on-success="
+              (res) => {
+                uploadSuccessHandle1(res)
+              }
+            "
+            class="avatar-uploader"
+            accept=".jpg, .jpeg, .png, .gif"
+            ><el-button size="small" type="primary">点击上传</el-button>
+          </el-upload>
+          <div>
+            <img v-if='deptBudgetList.addressUrl' style='width:100px;height:100px;' :src="deptBudgetList.addressUrl" alt="">
+          </div>
       <div class="small-title">化验数据（选填）</div>
       <div class="inspector">
         <!--自检员-->
@@ -387,7 +380,6 @@ export default {
       outContractNo: [],
       appendixIdsAdd: '',
       uploadSuccess: {},
-      onChange: {},
       gradeList: [],
       agent: [],
        staffList: [],
@@ -436,6 +428,9 @@ export default {
     this.getList()
   },
   methods: {
+    uploadSuccessHandle1(res){
+      this.deptBudgetList.addressUrl=res.url
+    },
     //返回按钮
     revert() {
       this.$router.push({ path: 'warehouseManagementList' })
@@ -935,27 +930,6 @@ export default {
         })
         return
       }
-      if (!this.deptBudgetList.deductionAmount) {
-        this.$message({
-          message: '扣款不能为空',
-          type: 'warning'
-        })
-        return
-      }
-      if (
-        this.deptBudgetList.deductionAmount < 0 ||
-        this.deptBudgetList.deductionAmount > 10000 ||
-        (String(this.deptBudgetList.deductionAmount).indexOf('.') != -1 &&
-          String(this.deptBudgetList.deductionAmount).length -
-            (String(this.deptBudgetList.deductionAmount).indexOf('.') + 1) >
-            2)
-      ) {
-        this.$message({
-          message: '扣款输入错误',
-          type: 'warning'
-        })
-        return
-      }
 
       if (!this.deptBudgetList.agent) {
         this.$message({
@@ -1315,7 +1289,7 @@ export default {
           })
       }
       //合同编号
-      xialaNo({ compId: sessionStorage.getItem('ws-pf_compId') })
+      xialaNo({ compId: sessionStorage.getItem('ws-pf_compId'),flag:5  })
         .toPromise()
         .then((response) => {
           this.outContractNo = response

src/views/warehouse/warehouseManagementNoComplete.vue

@@ -88,16 +88,18 @@
             </template>
           </el-table-column>
         </el-table>
-
-        <div style="text-align: right; padding: 10px">
-          <el-button
-            class="bg-bottom-up"
-            type="primary"
-            size="small"
-            @click="returnWarehouse()"
-            >关闭</el-button
-          >
-        </div>
+<div style='text-align:center;'>
+   <el-pagination
+      @size-change="handleSizeChange"
+      @current-change="handleCurrentChange"
+      :current-page="currentPage"
+      :page-size="pageSize"
+      layout="total, sizes, prev, pager, next, jumper"
+      :total="deptBudgetTotal"
+    >
+    </el-pagination>
+</div>
+       
       </div>
     </ws-form>
   </div>
@@ -330,6 +332,7 @@ export default {
         })
           .toPromise()
           .then((response) => {
+            this.deptBudgetTotal=response.total
             this.improved = response
           })
       } else if (id2 == 2) {

src/views/warehouse/warehouseManagementPerfectDelivery.vue

@@ -138,15 +138,6 @@
               size="small"
             />
           </ws-form-item>
-          <!--净重（吨）-->
-          <ws-form-item label="扣款" span="1" prop="deductionAmount">
-            <ws-input
-              v-model="dataList.deductionAmount"
-              placeholder="请输入扣款金额"
-              maxlength="120"
-              size="small"
-            />
-          </ws-form-item>
           <!-- 品级 -->
           <ws-form-item label="品级" span="1" class="readonly">
             <ws-select
@@ -222,19 +213,22 @@
           </ws-form-item>
         </ws-info-table>
       </div>
-      <div class="small-title">上传仓库照片</div>
-      <ws-upload
-        ref="upload"
-        table-name="maintain_work_order"
-        oss-key="mainPlan"
-        :comp-id="compId"
-        :appendix-ids="appendixIdsAdd"
-        :vesselId="dataList.addressUrl"
-        :size-limit="size"
-        @uploadSuccess="uploadSuccess"
-        @onChange="onChange"
-        accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar"
-      />
+      <div class="small-title">上传磅单照片</div>
+      <el-upload
+            action="https://www.zthymaoyi.com/upload/admin"
+            :show-file-list="false"
+            :on-success="
+              (res) => {
+                uploadSuccessHandle1(res)
+              }
+            "
+            class="avatar-uploader"
+            accept=".jpg, .jpeg, .png, .gif"
+            ><el-button size="small" type="primary">点击上传</el-button>
+          </el-upload>
+          <div>
+            <img v-if='dataList.addressUrl' style='width:100px;height:100px;' :src="dataList.addressUrl" alt="">
+          </div>
       <div class="small-title">化验数据（选填）</div>
       <div class="inspector">
         <!--质检员-->
@@ -479,6 +473,9 @@ export default {
         this.deptBudgetList.pureWeight=(this.deptBudgetList.netWeight*(100-(this.deptBudgetList.tidalGrainWater-this.deptBudgetList.solidGrainWater)*this.deptBudgetList.buckleWeightRatio))/100
       }
     },
+    uploadSuccessHandle1(res){
+      this.dataList.addressUrl=res.url
+    },
     //返回按钮
     revert() {
       this.$router.go(-1)
@@ -661,27 +658,6 @@ export default {
         })
         return
       }
-      if (!this.dataList.deductionAmount) {
-        this.$message({
-          message: '扣款不能为空',
-          type: 'warning'
-        })
-        return
-      }
-      if (
-        this.dataList.deductionAmount < 0 ||
-        this.dataList.deductionAmount > 10000 ||
-        (String(this.dataList.deductionAmount).indexOf('.') != -1 &&
-          String(this.dataList.deductionAmount).length -
-            (String(this.dataList.deductionAmount).indexOf('.') + 1) >
-            2)
-      ) {
-        this.$message({
-          message: '扣款输入错误',
-          type: 'warning'
-        })
-        return
-      }
       if (!this.dataList.agent) {
         this.$message({
           message: '经办人不能为空',
@@ -1031,7 +1007,7 @@ export default {
           })
       }
       //合同编号
-      xialaNo({ compId: sessionStorage.getItem('ws-pf_compId') })
+      xialaNo({ compId: sessionStorage.getItem('ws-pf_compId'),flag:5 })
         .toPromise()
         .then((response) => {
           this.outContractNo = response

src/views/warehouse/warehouseManagementPerfectput.vue

@@ -196,8 +196,8 @@
             <el-date-picker
               v-model="dataList.inOutDate"
               placeholder="请选择入库日期"
-              type="datetime"
-              value-format="yyyy-MM-dd HH:mm:ss"
+              type="date"
+              value-format="yyyy-MM-dd"
             ></el-date-picker>
           </ws-form-item>
           <!-- 入库类型 -->
@@ -312,19 +312,22 @@
           </ws-info-table>
         </div>
       </div>
-      <div class="small-title">上传仓库照片</div>
-      <ws-upload
-        ref="upload"
-        table-name="maintain_work_order"
-        oss-key="mainPlan"
-        :comp-id="compId"
-        :appendix-ids="appendixIdsAdd"
-        :vesselId="dataList.addressUrl"
-        :size-limit="size"
-        @uploadSuccess="uploadSuccess"
-        @onChange="onChange"
-        accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar"
-      />
+      <div class="small-title">上传磅单照片</div>
+       <el-upload
+            action="https://www.zthymaoyi.com/upload/admin"
+            :show-file-list="false"
+            :on-success="
+              (res) => {
+                uploadSuccessHandle1(res)
+              }
+            "
+            class="avatar-uploader"
+            accept=".jpg, .jpeg, .png, .gif"
+            ><el-button size="small" type="primary">点击上传</el-button>
+          </el-upload>
+          <div>
+            <img v-if='dataList.addressUrl' style='width:100px;height:100px;' :src="dataList.addressUrl" alt="">
+          </div>
       <div class="small-title">化验数据（选填）</div>
       <div class="inspector">
         <!--质检员-->
@@ -580,6 +583,9 @@ export default {
       this.dataList.deductionWeight=this.$route.query.deductionWeight
   },
   methods: {
+    uploadSuccessHandle1(res){
+      this.dataList.addressUrl=res.url
+    },
     pureweight(status){
       console.log(this.deptBudgetList)
       if(this.deptBudgetList.netWeight&&this.deptBudgetList.tidalGrainWater&&this.deptBudgetList.solidGrainWater&&this.deptBudgetList.buckleWeightRatio){
@@ -1135,14 +1141,20 @@ export default {
           return
         }
         if (
-          (this.dataList.warehouseInOutDetail.bulkDensity &&
-            String(this.dataList.warehouseInOutDetail.bulkDensity).indexOf('.') != -1 &&
+          this.dataList.warehouseInOutDetail.bulkDensity < 1 ||
+          this.dataList.warehouseInOutDetail.bulkDensity > 40 ||
+          (String(this.dataList.warehouseInOutDetail.bulkDensity).indexOf(
+            '.'
+          ) != -1 &&
             String(this.dataList.warehouseInOutDetail.bulkDensity).length -
-              (String(this.dataList.warehouseInOutDetail.bulkDensity).indexOf('.') + 1) >
-              2) || this.dataList.warehouseInOutDetail.bulkDensity > 1000 || this.dataList.warehouseInOutDetail.bulkDensity < 0
+              (String(this.dataList.warehouseInOutDetail.bulkDensity).indexOf(
+                '.'
+              ) +
+                1) >
+              0)
         ) {
           this.$message({
-            message: '容重输入错误',
+            message: '容重(克/升)输入错误! 取值范围1-40之间且是整数',
             type: 'warning',
           })
           return

src/views/warehouse/warehouseManagementRecord.vue

@@ -48,22 +48,22 @@
 						<template #default="props">
 							<ws-form ref="deptBudgetList" :model="deptBudgetList">
 								<ws-info-table>
-									<ws-form-item label="水分(%)<=" span="1" prop="waterContent">
+									<ws-form-item label="水分(%)" span="1" prop="waterContent">
 										{{ props.row.waterContent }}
 									</ws-form-item>
-									<ws-form-item label="容重(克/升)>=" span="1" prop="bulkDensity">
+									<ws-form-item label="容重(克/升)" span="1" prop="bulkDensity">
 										{{ props.row.bulkDensity }}
 									</ws-form-item>
-									<ws-form-item label="热损伤(%)<=" span="1" prop="jiaorenli">
+									<ws-form-item label="热损伤(%)" span="1" prop="jiaorenli">
 										{{ props.row.jiaorenli }}
 									</ws-form-item>
-									<ws-form-item label="杂质(%)<=" span="1" prop="impurity">
+									<ws-form-item label="杂质(%)" span="1" prop="impurity">
 										{{ props.row.impurity }}
 									</ws-form-item>
-									<ws-form-item label="霉变粒(%)<=" span="1" prop="mildewGrain">
+									<ws-form-item label="霉变粒(%)" span="1" prop="mildewGrain">
 										{{ props.row.mildewGrain }}
 									</ws-form-item>
-									<ws-form-item label="不完善粒(%)<=" span="1" prop="imperfectGrain">
+									<ws-form-item label="不完善粒(%)" span="1" prop="imperfectGrain">
 										{{ props.row.imperfectGrain }}
 									</ws-form-item>
 									<ws-form-item label="质检员" span="1" prop="qualityInspector">

src/views/warehouse/warehouselocation.vue

@@ -483,7 +483,7 @@ this.cangid=this.$route.query.cangId
     selectWarehouse(){
        getwarehousebase({
         compId: sessionStorage.getItem('ws-pf_compId'),
-        warehouseType:1
+        warehouseType:''
       })
         .toPromise()
         .then((response) => {

src/views/warehouse/weightedsubsidiary.vue

@@ -119,6 +119,9 @@
         <el-table-column prop="costBefore" label="入库前加权成本" >
         </el-table-column>
         <el-table-column prop="costAfter" label="入库后加权成本" >
+          <template slot-scope="scope">
+            <div>{{scope.row.costAfter}}<span v-if='scope.row.grainType'>(改)</span></div>
+          </template>
         </el-table-column>
         <el-table-column  prop="createDate" label="更新日期">
         </el-table-column>
@@ -151,6 +154,7 @@ import { downloadFile } from '@/utils/batchDown'
 import Pagination from '@/components/Pagination'
 import WsUpload from '@/components/WsUpload'
 import { EventBus } from 'base-core-lib'
+import { toFixed } from 'xe-utils/methods'
 export default {
   name: 'viewSpareMoney',
   components: {
@@ -320,7 +324,7 @@ export default {
     selectWarehouse(){
        getwarehousebase({
         compId: sessionStorage.getItem('ws-pf_compId'),
-        warehouseType:1,
+        warehouseType:'',
       })
         .toPromise()
         .then((response) => {
@@ -331,7 +335,7 @@ export default {
               id: response[i].id,
               count: response[i].count,
               purchasePriceList: response[i].purchasePriceList,
-              No:response[i].commonWarehouseNo,
+              No:response[i].commonWarehouseNo, 
               goodsNameInfos:response[i].goodsNameInfos
             })
             if (this.cangid&&this.cangid == response[i].id) {
@@ -340,10 +344,15 @@ export default {
               this.warehouseNo =  response[i].commonWarehouseNo
               this.purchasePriceList =  response[i].purchasePriceList
               this.goodnameList=response[i].goodsNameInfos
-              if(this.goodnameList){
-              this.goodsName=this.goodnameList[0].goodsName
-              this.goodsNameKey=this.goodnameList[0].goodsNameKey
-            }
+              if(this.goodnameList.length>0){
+                if(this.goodnameList.some( function( item, index, array ){ return item.goodsName == '玉米'})){
+                  this.goodsName='玉米'
+                  this.goodsNameKey=1
+                }else{
+                  this.goodsName=this.goodnameList[0].goodsName
+                  this.goodsNameKey=this.goodnameList[0].goodsNameKey
+                }
+              }
             } 
           }
           if(this.warehouseList1.length > 0 && !this.cangid){
@@ -354,40 +363,18 @@ export default {
             this.purchasePriceList =  this.warehouseList1[0].purchasePriceList
             this.WAREHOUSE[1].payname = this.warehouseList1[0].value
             this.goodnameList=this.warehouseList1[0].goodsNameInfos
-            if(this.goodnameList){
-              this.goodsName=this.goodnameList[0].goodsName
-              this.goodsNameKey=this.goodnameList[0].goodsNameKey
+            if(this.goodnameList.length>0){
+              if(this.goodnameList.some( function( item, index, array ){ return item.goodsName == '玉米'})){
+                  this.goodsName='玉米'
+                  this.goodsNameKey=1
+                }else{
+                  this.goodsName=this.goodnameList[0].goodsName
+                  this.goodsNameKey=this.goodnameList[0].goodsNameKey
+                }
             }
           }
           this.getList()
         })
-        getwarehousebase({
-        compId: sessionStorage.getItem('ws-pf_compId'),
-        warehouseType:2
-      })
-        .toPromise()
-        .then((response) => {
-          for (let i = 0; i < response.length; i++) {
-            this.warehouseList1.push({
-              value: response[i].warehouseName,
-              id: response[i].id,
-              count: response[i].count,
-              purchasePriceList: response[i].purchasePriceList,
-              No:response[i].commonWarehouseNo
-            })
-            if (this.cangid&&this.cangid == response[i].id) {
-              this.warehouseName = response[i].warehouseName
-              this.warehouseCount =  response[i].count
-              this.warehouseNo =  response[i].commonWarehouseNo
-              this.purchasePriceList =  response[i].purchasePriceList
-              this.goodnameList=response[i].goodsNameInfos
-              if(this.goodnameList){
-              this.goodsName=this.goodnameList[0].goodsName
-              this.goodsNameKey=this.goodnameList[0].goodsNameKey
-            }
-            } 
-          }
-        })
     },
     getList() {
       weighteddetails({
@@ -400,6 +387,9 @@ export default {
       })
         .toPromise()
         .then((response) => {
+          for (let i = 0; i < response.records.length; i++) {
+            response.records[i].toFixed(2)
+          }
           this.warehouseList = response
           this.deptBudgetTotal=response.total
           this.counttotal()