前端 sdy

src/views/houseSelfCollect/paymentManagement.vue

@@ -601,7 +601,7 @@ export default {
         })
         return
       }
-      if (this.payments.money > this.payments.amountNotPayable) {
+      if (Number(this.payments.money) > Number(this.payments.amountNotPayable)) {
         this.$message({
           message: '付款金额不能超过未付金额',
           type: 'warning'

src/views/taskManagement/tranManagementWarehouseInOutTaskAdd.vue

@@ -1598,6 +1598,7 @@
 				//     this.deliveryType = response
 				//   })
 				//仓库名
+				debugger
 				getwarehousename({
 						compId: this.compId,
 						warehouseType: 1
@@ -1611,6 +1612,7 @@
 							})
 							.toPromise()
 							.then(response => {
+								console.log("查仓库sss",response)
 								for (var i = 0; i < response.length; i++) {
 									this.warehouseNameList.push(response[i])
 								}

src/views/taskManagement/tranManagementWarehouseInOutTaskAudit.vue

@@ -6,7 +6,12 @@
         <h2 class="bg-left title">审核出入库任务</h2>
       </el-col>
       <el-col :span="12" class="bg-right">
-        <el-button class="bg-bottom" type="primary" size="small" @click="returnsales()">
+        <el-button
+          class="bg-bottom"
+          type="primary"
+          size="small"
+          @click="returnsales()"
+        >
           <img
             width="6"
             height="10"
@@ -19,27 +24,52 @@
     </el-row>
     <div class="basicInformation">
       <div class="annu">
-        <el-radio-group @change="tasktypechange" v-model="dataList.taskTypeKey"></el-radio-group>
+        <el-radio-group
+          @change="tasktypechange"
+          v-model="dataList.taskTypeKey"
+        ></el-radio-group>
         <div class="nav">
           <span class="ziti">
             任务类型：
             <h1
               class="ziti1"
-              v-show="dataList.inOutType == '移库入库'||dataList.inOutType == '移库出库'"
-            >移库任务</h1>
+              v-show="
+                dataList.inOutType == '移库入库' ||
+                dataList.inOutType == '移库出库'
+              "
+            >
+              移库任务
+            </h1>
             <h1
               class="ziti1"
-              v-show="dataList.inOutType == '销售出库'||dataList.inOutType == '暂存出库'||dataList.inOutType == '贸易服务出库'||dataList.inOutType == '采购出库'"
-            >出库任务</h1>
+              v-show="
+                dataList.inOutType == '销售出库' ||
+                dataList.inOutType == '暂存出库' ||
+                dataList.inOutType == '贸易服务出库' ||
+                dataList.inOutType == '采购出库'
+              "
+            >
+              出库任务
+            </h1>
             <h1
               class="ziti1"
-              v-show="dataList.inOutType == '采购入库'||dataList.inOutType == '暂存入库'||dataList.inOutType == '贸易服务入库'||dataList.inOutType == '退库'"
-            >入库任务</h1>
+              v-show="
+                dataList.inOutType == '采购入库' ||
+                dataList.inOutType == '暂存入库' ||
+                dataList.inOutType == '贸易服务入库' ||
+                dataList.inOutType == '退库'
+              "
+            >
+              入库任务
+            </h1>
           </span>
         </div>
       </div>
       <div class="ding"></div>
-      <div v-if="dataList.taskTypeKey != 2 && dataList.taskTypeKey != 4" class="center1">
+      <div
+        v-if="dataList.taskTypeKey != 2 && dataList.taskTypeKey != 4"
+        class="center1"
+      >
         <img
           style="position: relative; top: 40px; left: 300px"
           width="19"
@@ -78,7 +108,6 @@
               class="typeselect"
               @change="selectstorageType"
             >
-
               <el-option
                 v-for="item in storageType"
                 :key="item.constKey"
@@ -145,7 +174,11 @@
             </el-select>
           </el-form-item>
           <!--重量（吨）-->
-          <el-form-item label="重量（吨）" span="1" style="margin-left: 350px; margin-top: -40px">
+          <el-form-item
+            label="重量（吨）"
+            span="1"
+            style="margin-left: 350px; margin-top: -40px"
+          >
             <el-input
               disabled
               v-model="dataList.weight"
@@ -183,7 +216,11 @@
             />
           </el-form-item>
           <!--水分（%）<=-->
-          <el-form-item label="水分（%）<=" span="1" style="margin-left: 350px; margin-top: -40px">
+          <el-form-item
+            label="水分（%）<="
+            span="1"
+            style="margin-left: 350px; margin-top: -40px"
+          >
             <el-input
               @input="waterContentchange"
               v-model="dataList.waterContent"
@@ -194,7 +231,11 @@
             />
           </el-form-item>
           <!--单价(元/吨)-->
-          <el-form-item label="单价(元/吨)" span="1" style="margin-left: 650px; margin-top: -40px">
+          <el-form-item
+            label="单价(元/吨)"
+            span="1"
+            style="margin-left: 650px; margin-top: -40px"
+          >
             <el-input
               @input="unitPricechange"
               v-model="dataList.unitPrice"
@@ -205,7 +246,12 @@
             />
           </el-form-item>
           <!--预计出库日期-->
-          <el-form-item label="预计出库日期" span="1" prop="predictDate" class="deliverydate">
+          <el-form-item
+            label="预计出库日期"
+            span="1"
+            prop="predictDate"
+            class="deliverydate"
+          >
             <el-date-picker
               disabled
               v-model="dataList.predictDate"
@@ -214,11 +260,15 @@
               value-format="yyyy-MM-dd"
             />
           </el-form-item>
-       			<!--预估运费（元/吨）-->
-					<el-form-item label="预估运费（元/吨）" span="1" >
-						<el-input  v-model="dataList.estimatedFreight" placeholder="请输入预估运费"
-							maxlength="20" size="small"  />
-					</el-form-item>
+          <!--预估运费（元/吨）-->
+          <el-form-item label="预估运费（元/吨）" span="1">
+            <el-input
+              v-model="dataList.estimatedFreight"
+              placeholder="请输入预估运费"
+              maxlength="20"
+              size="small"
+            />
+          </el-form-item>
           <!--收货人-->
           <el-form-item label="发货人">
             <el-select
@@ -237,7 +287,11 @@
             </el-select>
           </el-form-item>
           <!--业务描述=-->
-          <el-form-item v-if="dataList.taskTypeKey != 3" label="业务描述" span="1">
+          <el-form-item
+            v-if="dataList.taskTypeKey != 3"
+            label="业务描述"
+            span="1"
+          >
             <el-input
               v-model="dataList.businessDescribe"
               placeholder="请输入业务描述，不超过150字"
@@ -247,13 +301,27 @@
             />
           </el-form-item>
           <el-form-item label="仓位号（选填）" span="1">
-            <el-input
+             <el-select
+              v-model="dataList.binNumber"
+              placeholder="请输入仓位号"
+              filterable
+              @change="binNumberChange1"
+            >
+              <el-option
+                v-for="(item, index) in binNumberList1"
+                :Key="index"
+                :label="item.binNumber"
+                :value="item.binNumber"
+              >
+              </el-option>
+            </el-select>
+            <!-- <el-input
               v-model="dataList.binNumber"
               placeholder="请输入仓位号"
               maxlength="150"
               size="large"
               class="yewu"
-            />
+            /> -->
           </el-form-item>
         </el-form>
       </div>
@@ -271,7 +339,12 @@
             <span v-if="deletetask" style="color: red">已删除</span>
           </h3>
         </div>
-        <el-form v-if="!deletetask" ref="form" :model="form" label-width="140px">
+        <el-form
+          v-if="!deletetask"
+          ref="form"
+          :model="form"
+          label-width="140px"
+        >
           <!-- 仓库名 -->
           <el-form-item label="仓库名" v-if="dataList1.inOutType == '移库入库'">
             <el-select
@@ -289,7 +362,10 @@
             </el-select>
           </el-form-item>
           <!-- 出库类型 -->
-          <el-form-item label="入库类型" v-if="dataList1.inOutType == '移库入库'">
+          <el-form-item
+            label="入库类型"
+            v-if="dataList1.inOutType == '移库入库'"
+          >
             <el-select
               disabled
               v-model="dataList1.inOutType"
@@ -362,7 +438,11 @@
             </el-select>
           </el-form-item>
           <!--重量（吨）-->
-          <el-form-item label="重量（吨）" span="1" style="margin-left: 350px; margin-top: -40px">
+          <el-form-item
+            label="重量（吨）"
+            span="1"
+            style="margin-left: 350px; margin-top: -40px"
+          >
             <el-input
               @input="weightchange"
               v-model="dataList1.weight"
@@ -402,7 +482,11 @@
             />
           </el-form-item>
           <!--水分（%）<=-->
-          <el-form-item label="水分（%）<=" span="1" style="margin-left: 350px; margin-top: -40px">
+          <el-form-item
+            label="水分（%）<="
+            span="1"
+            style="margin-left: 350px; margin-top: -40px"
+          >
             <el-input
               @input="waterContentchange"
               :disabled="dataList.taskTypeKey == 3"
@@ -414,7 +498,11 @@
             />
           </el-form-item>
           <!--单价(元/吨)-->
-          <el-form-item label="单价(元/吨)" span="1" style="margin-left: 650px; margin-top: -40px">
+          <el-form-item
+            label="单价(元/吨)"
+            span="1"
+            style="margin-left: 650px; margin-top: -40px"
+          >
             <el-input
               @input="unitPricechange"
               :disabled="dataList.taskTypeKey == 3"
@@ -426,7 +514,12 @@
             />
           </el-form-item>
           <!--预计出库日期-->
-          <el-form-item label="预计入库日期" span="1" prop="predictDate" class="deliverydate">
+          <el-form-item
+            label="预计入库日期"
+            span="1"
+            prop="predictDate"
+            class="deliverydate"
+          >
             <el-date-picker
               disabled
               v-model="dataList1.predictDate"
@@ -435,11 +528,15 @@
               value-format="yyyy-MM-dd"
             />
           </el-form-item>
-          			<!--预估运费（元/吨）-->
-					<el-form-item label="预估运费（元/吨）" span="1" >
-						<el-input v-model="dataList1.estimatedFreight" placeholder="请输入预估运费"
-							maxlength="20" size="small"  />
-					</el-form-item>
+          <!--预估运费（元/吨）-->
+          <el-form-item label="预估运费（元/吨）" span="1">
+            <el-input
+              v-model="dataList1.estimatedFreight"
+              placeholder="请输入预估运费"
+              maxlength="20"
+              size="small"
+            />
+          </el-form-item>
           <!--收货人-->
           <el-form-item label="收货人">
             <el-select
@@ -447,7 +544,6 @@
               v-model="dataList1.agent"
               placeholder="请选择收货人"
               filterable
-             
               @change="selectstaff1"
             >
               <el-option
@@ -468,13 +564,27 @@
             />
           </el-form-item>
           <el-form-item label="仓位号（选填）" span="1">
-            <el-input
+            <el-select
+              v-model="dataList1.binNumber"
+              placeholder="请输入仓位号"
+              filterable
+              @change="binNumberChange"
+            >
+              <el-option
+                v-for="(item, index) in binNumberList"
+                :Key="index"
+                :label="item.binNumber"
+                :value="item.binNumber"
+              >
+              </el-option>
+            </el-select>
+            <!-- <el-input
               v-model="dataList1.binNumber"
               placeholder="请输入仓位号"
               maxlength="150"
               size="large"
               class="yewu"
-            />
+            /> -->
           </el-form-item>
         </el-form>
       </div>
@@ -580,7 +690,11 @@
             </el-select>
           </el-form-item>
           <!--重量（吨）-->
-          <el-form-item label="重量（吨）" span="1" style="margin-left: 350px; margin-top: -40px">
+          <el-form-item
+            label="重量（吨）"
+            span="1"
+            style="margin-left: 350px; margin-top: -40px"
+          >
             <el-input
               disabled
               v-model="dataList.weight"
@@ -619,7 +733,11 @@
             />
           </el-form-item>
           <!--水分（%）<=-->
-          <el-form-item label="水分（%）<=" span="1" style="margin-left: 350px; margin-top: -40px">
+          <el-form-item
+            label="水分（%）<="
+            span="1"
+            style="margin-left: 350px; margin-top: -40px"
+          >
             <el-input
               disabled
               v-model="dataList.waterContent"
@@ -630,7 +748,11 @@
             />
           </el-form-item>
           <!--单价(元/吨)-->
-          <el-form-item label="单价(元/吨)" span="1" style="margin-left: 650px; margin-top: -40px">
+          <el-form-item
+            label="单价(元/吨)"
+            span="1"
+            style="margin-left: 650px; margin-top: -40px"
+          >
             <el-input
               disabled
               v-model="dataList.unitPrice"
@@ -641,7 +763,12 @@
             />
           </el-form-item>
           <!--预计出库日期-->
-          <el-form-item label="预计出库日期" span="1" prop="predictDate" class="deliverydate">
+          <el-form-item
+            label="预计出库日期"
+            span="1"
+            prop="predictDate"
+            class="deliverydate"
+          >
             <el-date-picker
               v-model="dataList.predictDate"
               type="date"
@@ -649,18 +776,21 @@
               value-format="yyyy-MM-dd"
             />
           </el-form-item>
-          			<!--预估运费（元/吨）-->
-					<el-form-item label="预估运费（元/吨）" span="1" >
-						<el-input  v-model="dataList.estimatedFreight" placeholder="请输入预估运费"
-							maxlength="20" size="small"  />
-					</el-form-item>
+          <!--预估运费（元/吨）-->
+          <el-form-item label="预估运费（元/吨）" span="1">
+            <el-input
+              v-model="dataList.estimatedFreight"
+              placeholder="请输入预估运费"
+              maxlength="20"
+              size="small"
+            />
+          </el-form-item>
           <!--发货人-->
           <el-form-item label="发货人">
             <el-select
               v-model="dataList.agent"
               placeholder="请选择发货人"
               filterable
-             
               @change="selectstaff"
             >
               <el-option
@@ -686,11 +816,23 @@
 
     <!-- 提交 -->
     <div style="text-align: right; padding: 10px" class="center">
-      <el-button class="bg-bottom" type="primary" size="small" @click="reject()">驳回</el-button>
-      <el-button class="bg-bottom" type="primary" size="small" @click="submit()">通过</el-button>
+      <el-button class="bg-bottom" type="primary" size="small" @click="reject()"
+        >驳回</el-button
+      >
+      <el-button class="bg-bottom" type="primary" size="small" @click="submit()"
+        >通过</el-button
+      >
     </div>
-    <el-table class="wenzi" :data="taskhistories" style="width: 80%" height="180">
-      <el-table-column prop="operatorMajorRoleName" label="审核人"></el-table-column>
+    <el-table
+      class="wenzi"
+      :data="taskhistories"
+      style="width: 80%"
+      height="180"
+    >
+      <el-table-column
+        prop="operatorMajorRoleName"
+        label="审核人"
+      ></el-table-column>
       <el-table-column prop="inOutTaskNo" label="审核结果">
         <template scope="scope">
           <span v-if="scope.row.approved">通过</span>
@@ -700,7 +842,11 @@
       <el-table-column prop="createTime" label="审核时间"></el-table-column>
       <el-table-column prop="auditMind" label="驳回原因"></el-table-column>
     </el-table>
-    <WinseaContentModal v-model="outerVisible" title="驳回原因" @on-cancel="handleClose">
+    <WinseaContentModal
+      v-model="outerVisible"
+      title="驳回原因"
+      @on-cancel="handleClose"
+    >
       <el-input
         type="textarea"
         :rows="2"
@@ -723,7 +869,7 @@ import {
   getGoodsName,
   warehousetask,
   woekflowhandle,
-  gettaskhistories
+  gettaskhistories,
 } from '@/model/tasksport/index'
 import { pullDown, getstaff } from '@/model/warehouse/index'
 import Pagination from '@/components/Pagination'
@@ -735,7 +881,7 @@ export default {
   name: 'viewSpareMoney',
   components: {
     WsUpload,
-    Pagination
+    Pagination,
   },
   watch: {
     // vesselId(val) {
@@ -743,10 +889,10 @@ export default {
     // },
     isShow(val) {
       this.showType = val
-    }
+    },
   },
   computed: {
-    ...mapGetters(['deptBudgetList'])
+    ...mapGetters(['deptBudgetList']),
   },
   data() {
     return {
@@ -803,9 +949,9 @@ export default {
             required: true,
             type: 'number',
             message: '请输入活动名称',
-            trigger: 'blur'
-          }
-        ]
+            trigger: 'blur',
+          },
+        ],
       },
       size: 10,
       compId: sessionStorage.getItem('ws-pf_compId'),
@@ -813,7 +959,7 @@ export default {
       packtypeList: {},
       date: {
         year: dayjs().format('YYYY'),
-        month: dayjs().format('MM')
+        month: dayjs().format('MM'),
       },
       contractList: [],
       inOutTaskNo: '',
@@ -822,17 +968,26 @@ export default {
       dataList1: { taskTypeKey: '1' },
       historyList: [],
       pickerBeginDateBefore: {
-        disabledDate: time => {
+        disabledDate: (time) => {
           return time.getTime() > Date.now()
-        }
+        },
       },
-      accessoryTFs: false
+      binNumberList: [],
+      binNumberList1:[],
+      accessoryTFs: false,
     }
   },
   activated() {
     this.getList()
   },
   methods: {
+    // 仓位号改变
+    binNumberChange(e) {
+      this.dataList1.binNumber = e
+    },
+       binNumberChange1(e) {
+      this.dataList.binNumber = e
+    },
     //返回按钮
     revert() {
       this.$router.go(-1)
@@ -865,7 +1020,7 @@ export default {
         if (i > 90) continue
         arr.push(String.fromCharCode(i))
       }
-      arr.sort(function() {
+      arr.sort(function () {
         return Math.random() - 0.5
       })
       arr.length = 4
@@ -889,7 +1044,7 @@ export default {
       this.deptBudgetList.staffList = val
       if (val) {
         //val存在
-        this.options = this.staffList.filter(item => {
+        this.options = this.staffList.filter((item) => {
           if (
             !!~item.staffName.indexOf(val) ||
             !!~item.staffName.toUpperCase().indexOf(val.toUpperCase())
@@ -934,10 +1089,10 @@ export default {
           if (this.contractNoList[i].contractNo == e) {
             getGoodsName({
               contractId: this.contractNoList[i].id,
-              contractNo: this.contractNoList[i].contractNo
+              contractNo: this.contractNoList[i].contractNo,
             })
               .toPromise()
-              .then(response => {
+              .then((response) => {
                 this.$set(this.dataList, 'goodsName', response.goodsName)
                 this.$set(this.dataList, 'goodsNameKey', response.goodsNameKey)
                 this.$set(this.dataList, 'grade', response.grade)
@@ -961,10 +1116,10 @@ export default {
           if (this.contractNoList[i].contractNo == e) {
             getGoodsName({
               contractId: this.contractNoList[i].id,
-              contractNo: this.contractNoList[i].contractNo
+              contractNo: this.contractNoList[i].contractNo,
             })
               .toPromise()
-              .then(response => {
+              .then((response) => {
                 this.$set(this.dataList1, 'goodsName', response.goodsName)
                 this.$set(this.dataList1, 'goodsNameKey', response.goodsNameKey)
                 this.$set(this.dataList1, 'grade', response.grade)
@@ -1003,15 +1158,15 @@ export default {
         sessionStorage.getItem('ws-pf_staffName')
       warehousetask(list)
         .toPromise()
-        .then(response => {
+        .then((response) => {
           woekflowhandle({
             taskId: list.taskId,
             approved: true,
             auditMind: '34',
-            needReapply: false
+            needReapply: false,
           })
             .toPromise()
-            .then(response => {
+            .then((response) => {
               this.$message.success('审核成功')
               this.$router.push({ path: 'tranManagementWarehouseInOuttask' })
             })
@@ -1019,18 +1174,20 @@ 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 => {
+        .then((response) => {
           woekflowhandle({
             taskId: list.taskId,
             approved: false,
             auditMind: this.auditMind,
-            needReapply: true
+            needReapply: true,
           })
             .toPromise()
-            .then(response => {
+            .then((response) => {
               this.$message.success('驳回成功')
               this.$router.push({ path: 'tranManagementWarehouseInOuttask' })
             })
@@ -1060,7 +1217,7 @@ export default {
       if (!this.auditMind) {
         this.$message({
           message: '驳回原因不能为空！',
-          type: 'warning'
+          type: 'warning',
         })
         return
       }
@@ -1208,17 +1365,17 @@ export default {
     getList() {
       gettaskhistories({
         businessKey: this.$route.query.businessKey,
-        workflowId: this.$route.query.workflowId
+        workflowId: this.$route.query.workflowId,
       })
         .toPromise()
-        .then(response => {
+        .then((response) => {
           this.taskhistories = response
         })
 
       if (this.$route.query.relevanceId) {
         outexamine({ relevanceId: this.$route.query.relevanceId })
           .toPromise()
-          .then(response => {
+          .then((response) => {
             if (response.length > 1) {
               if (response[0].taskTypeKey == 3) {
                 if (response[0].inOutType == '移库出库') {
@@ -1261,53 +1418,67 @@ export default {
       // 货名
       pullDown({ constId: 'CON2' })
         .toPromise()
-        .then(response => {
+        .then((response) => {
           this.goodnameList = response
         })
       // 品级
       pullDown({ constId: 'CON3' })
         .toPromise()
-        .then(response => {
+        .then((response) => {
           this.gradeList = response
         })
       pullDown({ constId: 'CON6' })
         .toPromise()
-        .then(response => {
+        .then((response) => {
           this.storageType = response
         })
       pullDown({ constId: 'CON5' })
         .toPromise()
-        .then(response => {
+        .then((response) => {
           this.storageType1 = response
         })
       xialaNo({
-        compId: this.compId
+        compId: this.compId,
       })
         .toPromise()
-        .then(response => {
+        .then((response) => {
           this.contractNoList = response
         })
       //仓库名
       getwarehousename({
         compId: this.compId,
-        warehouseType: 1
+        warehouseType: 1,
       })
         .toPromise()
-        .then(response => {
+        .then((response) => {
           this.warehouseNameList = response
+          for (let i = 0; i < this.warehouseNameList.length; i++) {
+            if (
+              this.dataList.warehouseName ==
+              this.warehouseNameList[i].warehouseName
+            ) {
+              this.binNumberList1 = this.warehouseNameList[i].positionInfos
+            }
+            if (
+              this.dataList1.warehouseName ==
+              this.warehouseNameList[i].warehouseName
+            ) {
+              this.binNumberList = this.warehouseNameList[i].positionInfos
+            }
+          }
         })
       getwarehousename({
         compId: this.compId,
-        warehouseType: 2
+        warehouseType: 2,
       })
         .toPromise()
-        .then(response => {
+        .then((response) => {
           this.warehouseNameList1 = response
         })
       //经办人
       getstaff({ compId: sessionStorage.getItem('ws-pf_compId') })
         .toPromise()
-        .then(response => {
+        .then((response) => {
           this.options = response
           this.staffList = response
           //  this.agent = response
@@ -1337,7 +1508,7 @@ export default {
     handleExamine(row) {
       this.$router.push({
         name: 'salesContractExamine',
-        query: { id: row.id }
+        query: { id: row.id },
       })
     },
     // 关闭 dialog时 处理文件url 初始化upload组件
@@ -1348,11 +1519,11 @@ export default {
       console.log(row)
       billoperatehis({ id: row.id })
         .toPromise()
-        .then(response => {
+        .then((response) => {
           this.historyList = response
         })
-    }
-  }
+    },
+  },
 }
 </script>
 <style lang="scss" scoped>