前端

src/api/V2/outboundManagement/index.js

@@ -46,4 +46,6 @@ export const API_POST_GO_BACK = `/weighingManagement/api/outWeightReturn`
 export const API_POST_IMPORT_SALE ='/weighingManagement/api/importWeighingOut'
 //导入移库出库
 export const API_POST_IMPORT_YK ='/weighingManagement/api/importWeighingMoveOut'
+//出库类型查询
+export const API_GAT_INFO = '/commonSysParameter/getInfo'
 

src/model/outboundManagement/index.js

@@ -25,7 +25,8 @@ import {
     API_POST_CHANE_NO,
     API_POST_IMPORT_SALE,
     API_POST_IMPORT_YK,
-    API_POST_GO_BACK
+    API_POST_GO_BACK,
+    API_GAT_INFO
 }   from '@/api/V2/outboundManagement'
 
   //质检列表
@@ -75,4 +76,6 @@ export const goBack = appRx.post(API_POST_GO_BACK, errorCatcher, errorHandle, fi
 // 导入销售出库
 export const importWordSale = appRx.post(API_POST_IMPORT_SALE, errorCatcher, errorHandle, filter)
 // 导入移库出库
-export const importWordYk = appRx.post(API_POST_IMPORT_YK, errorCatcher, errorHandle, filter)
+export const importWordYk = appRx.post(API_POST_IMPORT_YK, errorCatcher, errorHandle, filter)
+// 导入移库出库
+export const getInfo = appRx.get(API_GAT_INFO, errorCatcher, errorHandle, filter)

src/views/houseSelfCollect/inspectionManagementNew.vue

@@ -86,7 +86,7 @@
                       :value="item.goodsName" />
                   </el-select>
                 </ws-form-item>
-                <ws-form-item label="类型" span="1" prop="type" v-if="zjJurisdiction && statusTypetext == '初检'||statusTypetext != '初检'">
+                <ws-form-item label="类型" span="1" prop="type" v-if="zjJurisdiction && statusTypetext == '初检'">
                   <ws-select v-model="deptBudgetList.type">
                     <ws-option v-for="item in typeList" :key="'leixin' + item" :label="item" :value="item" />
                   </ws-select>
@@ -401,7 +401,7 @@
                 </ws-form-item>
               </ws-info-table>
               <ws-info-table>
-                <el-form-item class='rememo' v-if='statusTypetext != "初检"' label="复检" span="1" prop="imperfectGrain">
+                <el-form-item class='rememo' v-if='statusTypetext != "初检"' label="备注" span="1" prop="imperfectGrain">
                   <ws-input v-model="deptBudgetList.reMemo" type="textarea" row="3" placeholder="请输入备注信息，不超过200字"
                     maxlength="200" />
                 </el-form-item>
@@ -3011,6 +3011,7 @@ export default {
       }
       if (!data) return
       for (var i = 0; i < this.outContractNo.length; i++) {
+        console.log(this.outContractNo[i].contractNo)
         if (
           this.outContractNo[i].contractNo == this.deptBudgetList.contractNo
         ) {

src/views/houseSelfCollect/inspectionManagementrecord.vue

@@ -91,7 +91,7 @@
           <el-button @click="inspectInfo(scope.row, 2)"
             v-hasPermission="`acquisitionManagement.acquisitionQuality.view`">查看</el-button>
           <div style="display: inline-block;"
-            v-if="scope.row.weighingManagement&&scope.row.weighingManagement.status=='已质检'">
+            v-if="scope.row.weighingManagement&&scope.row.weighingManagement.status=='已初检'">
             <el-button @click="del(scope.row)" type="danger"
               v-hasPermission="`acquisitionManagement.acquisitionQuality.delete`">删除</el-button>
           </div>

src/views/outboundManagement/weighingManagementNew.vue

@@ -125,8 +125,13 @@
                           maxlength="10" size="small" />
                       </ws-form-item>
                       <ws-form-item v-if="tpyeNo == 1" label="出库类型" span="1">
-                        <ws-input v-model="weighingList.inOutType" class="right-bottom" :disabled="isSelectType"
-                          placeholder="暂无" />
+                        <!-- <ws-input v-model="weighingList.inOutType" class="right-bottom" :disabled="isSelectType"
+                          placeholder="暂无" /> -->
+                          <el-select @change="inOutTypechange" :disabled="isSelectType" filterable clearable
+                          v-model="weighingList.inOutType" placeholder="请选择出库类型" class="typeselect">
+                          <el-option v-for="item in storageType" :key="item.constKey" :label="item.constValue"
+                            :value="item.constValue" />
+                        </el-select>
                       </ws-form-item>
                       <ws-form-item v-if="tpyeNo == 1" label="出库日期" span="1" prop="inOutDate" class="deliverydate">
                         <ws-date-picker v-model="weighingList.inOutDate" type="date" placeholder="请选择出库日期"
@@ -322,7 +327,8 @@
     getweighingList,
     selectWarehouseSelf,
     delelteWeighing,
-    newSubmit
+    newSubmit,
+    getInfo
   } from '@/model/outboundManagement/index'
   import {
     pullDown,
@@ -360,6 +366,7 @@
         pageSize: 50,
         submitAllow: false,
         deliveryList: [],
+        inOutTypeList:[],
         positionInfos: [],
         searchKeyWord: '',
         paramType: '',
@@ -1829,13 +1836,13 @@
           })
       },
       getList() {
-        // pullDown({
-        // 	constId: 'CON6',
-        // })
-        // .toPromise()
-        // .then((response) => {
-        // 	this.storageType = response
-        // })
+        pullDown({
+        	constId: 'CON6',
+        })
+        .toPromise()
+        .then((response) => {
+        	this.storageType = response
+        })
         getReceiptTaskNo({
             flag: 1,
             warehouseName: this.warehouseName,

src/views/taskManagement/inOutWarehouseTaskEdit.vue

@@ -83,9 +83,10 @@
           <!-- 货名 -->
           <el-form-item label="货源" class="huom">
             {{goods}}
+            <el-button style='margin-left:5px;' class="bg-bottom" type="primary" size="small" @click="supplygoods()">查看货源</el-button>
           </el-form-item>
           <!--重量（吨）-->
-          <el-form-item label="重量（吨）" span="1" style=" margin-left: 350px; margin-top: -40px">
+          <el-form-item label="重量（吨）" span="1">
             {{dataList.weight}}
           </el-form-item>
           <!-- 品级 -->
@@ -196,9 +197,10 @@
           </el-form-item>
           <el-form-item v-else label="货源" class="huom">
             {{goods}}
+            <el-button style='margin-left:5px;' class="bg-bottom" type="primary" size="small" @click="supplygoods()">查看货源</el-button>
           </el-form-item>
           <!--重量（吨）-->
-          <el-form-item label="重量（吨）" span="1" style=" margin-left: 350px; margin-top: -40px">
+          <el-form-item label="重量（吨）" span="1" >
             {{dataList1.weight}}
           </el-form-item>
           <!-- 品级 -->
@@ -302,10 +304,11 @@
           <!-- 货名 -->
           <el-form-item label="货源" class="huom">
             {{goods}}
+            <el-button style='margin-left:5px;' class="bg-bottom" type="primary" size="small" @click="supplygoods()">查看货源</el-button>
             <!-- </el-select> -->
           </el-form-item>
           <!--重量（吨）-->
-          <el-form-item label="重量（吨）" span="1" style=" margin-left: 350px; margin-top: -40px">
+          <el-form-item label="重量（吨）" span="1" >
             {{dataList.weight}}
           </el-form-item>
           <!-- 品级 -->
@@ -494,6 +497,27 @@ export default {
     this.getList()
   },
   methods: {
+    supplygoods(){
+				if(this.dataList.taskTypeKey==1||this.dataList.taskTypeKey==3){
+					if(this.dataList.warehouseName){
+						this.$router.push({name:'supplyofgoodslook',query:{list:JSON.stringify(this.dataList.sourceRelationInfoList)}})
+					}else{
+						this.$message({
+							message: '请先选择仓库',
+							type: 'warning'
+						});
+					}
+				}else if(this.dataList1.taskTypeKey==2&&this.dataList1.inOutType=='退库'||this.dataList1.taskTypeKey==4){
+					if(this.dataList1.moveTaskNo||this.dataList1.contractNo){
+						this.$router.push({name:'outsupplyofgoodslook',query:{list:JSON.stringify(this.dataList1.sourceRelationInfoList),contractNo:this.dataList1.contractNo,taskTypeKey:this.dataList1.taskTypeKey}})
+					}else{
+						this.$message({
+							message: '请先选择合同/移库编号',
+							type: 'warning'
+						});
+					}
+				}
+      },
     //返回按钮
     revert() {
       this.$router.go(-1)

src/views/taskManagement/supplyofgoodslook.vue

@@ -194,6 +194,7 @@
      
       getList() {
         this.gainList = JSON.parse(this.$route.query.list)
+        console.log(this.gainList)
         this.deptBudgetTotal = this.gainList.length
         // getSourceOfGoods({
         //     compId: localStorage.getItem('ws-pf_compId'),

src/views/taskManagement/tranManagementTransportAdd.vue

@@ -387,9 +387,6 @@
           </el-form-item>
         </ws-info-table>
       </div>
-    </el-form>
-    <!-- 提交 -->
-    <div style="text-align: right; padding: 10px" class="center">
       <el-button
         class="bg-bottom"
         type="primary"
@@ -397,7 +394,9 @@
         @click="submit(deptBudgetList)"
         >提交</el-button
       >
-    </div>
+    </el-form>
+    <!-- 提交 -->
+
   </div>
 </template>
 <script>

src/views/warehousenew/warehouseManagementEdit.vue

@@ -20,11 +20,11 @@
         <ws-info-table>
           <!--仓库名称-->
           <ws-form-item label="仓库名称" span="1" prop="warehouseName" class="readonly">
-            <ws-select v-model="deptBudgetList.warehouseName" placeholder="" class="typeselect"
+            <el-select filterable v-model="deptBudgetList.warehouseName" placeholder="" class="typeselect"
               @change="selectpackingMethod">
-              <ws-option v-for="item in packtypeList" :key="item.constKey" :label="item.warehouseName"
+              <el-option v-for="item in packtypeList" :key="item.constKey" :label="item.warehouseName"
                 :value="item.warehouseName" />
-            </ws-select>
+            </el-select>
           </ws-form-item>
             <!--仓库所在地-->
           <ws-form-item label="仓库所在地" span="1" prop="warehouseCity">
@@ -49,11 +49,14 @@
           </ws-form-item> -->
           <!--其他负责人-->
           <ws-form-item label="其他驻库人员" v-if="warehouseType == 1" span="1" prop="otherPersonCharge" class="addPerson">
-            <el-select v-model="deptBudgetList.otherPersonPhone" placeholder="请选择其他驻库人员，可选多人" @change="selectstaffOther"
-              :filter-method="dataFilter1" filterable clearable multiple >
+            <!-- <el-select v-model="deptBudgetList.otherPersonPhone" placeholder="请选择其他驻库人员，可选多人" @change="selectstaffOther"
+              :filter-method="dataFilter1" filterable clearable multiple :reserve-keyword="true" >
               <el-option v-for="item in optionsOther" :key="item.staffMobilePhone" :label="item.staffName"
                 :value="item.staffMobilePhone " />
-            </el-select>
+            </el-select> -->
+            <el-select v-model="deptBudgetList.otherPersonPhone" placeholder="请选择其他驻库人员，可选多人"  allow-create default-first-option @change="selectstaffOther" multiple filterable clearable>
+            <el-option v-for="item in optionsOther" :key="item.staffMobilePhone" :label="item.staffName" :value="item.staffMobilePhone" />
+          </el-select>
           </ws-form-item>
         
           <!--总储量（吨)-->

src/views/warehousenew/warehousingOrder.vue

@@ -35,6 +35,8 @@
         </ws-button>
         </el-col>
         <el-col style='text-align:right;' :span="12">
+           <ws-button  type="primary" @click="distribution()" >预付款分配</ws-button>
+        <ws-button type="primary" @click="marginAllocation()">保证金分配</ws-button>
           <!-- <el-button type="primary" @click="warehousingorder()" v-hasPermission="
             `warehouseManagement.warehouse.warehouseInfoTask.add`
           ">出单
@@ -46,8 +48,8 @@
         <div>{{item.issuingTime}}</div>
         <div>{{item.warehouseName}}入库单<span v-if='item.warehouseType==2'>（临）</span></div>
         <div>
-          <ws-button  type="primary" @click="distribution(item)" >预付款分配</ws-button>
-        <ws-button type="primary" @click="marginAllocation(item)">保证金分配</ws-button>
+          <!-- <ws-button  type="primary" @click="distribution(item)" >预付款分配</ws-button>
+        <ws-button type="primary" @click="marginAllocation(item)">保证金分配</ws-button> -->
             <ws-button v-if='item.payshow' type="primary" @click="payout(item)" v-hasPermission="
             `warehouseManagement.warehousingOrder.appl`
           ">请款
@@ -582,9 +584,28 @@ import { findLastIndexOfIterate } from 'xe-utils/methods'
         
         
       },
-      marginAllocation(item){
+      marginAllocation(){
         let _this= this
-        var arr1=this.multipleSelection1[item.id]
+         var arr=[]
+        var currectData=[]
+        for (const key in this.multipleSelection1) {
+          var array=this.multipleSelection1[key]
+          for (let i = 0; i < array.length; i++) {
+            arr.push(array[i])
+          }
+          if(array.length>0){
+            currectData=array
+          }
+        }
+        if(arr.length>1){
+          this.$message({
+              message: '一次只能分配一条入库记录',
+              type: 'warning'
+            });
+            return
+        }
+        // console.log(currectData)
+        var arr1=currectData
         for (let i = 0; i < arr1.length; i++) {
           if(arr1[i].amountNotPayable<0){
             this.$message({
@@ -616,12 +637,32 @@ import { findLastIndexOfIterate } from 'xe-utils/methods'
             return
           })
         }
-        this.currectdata=item
+        this.currectdata=currectData
         this.marginshow=true
       },
-      distribution(item){
+      distribution(){
         let _this= this
-        var arr1=this.multipleSelection1[item.id]
+        console.log(this.multipleSelection1)
+        var arr=[]
+        var currectData=[]
+        for (const key in this.multipleSelection1) {
+          var array=this.multipleSelection1[key]
+          for (let i = 0; i < array.length; i++) {
+            arr.push(array[i])
+          }
+          if(array.length>0){
+            currectData=array
+          }
+        }
+        if(arr.length>1){
+          this.$message({
+              message: '一次只能分配一条入库记录',
+              type: 'warning'
+            });
+            return
+        }
+        // console.log(currectData)
+        var arr1=currectData
         for (let i = 0; i < arr1.length; i++) {
           if(arr1[i].amountNotPayable<0){
             this.$message({
@@ -653,7 +694,8 @@ import { findLastIndexOfIterate } from 'xe-utils/methods'
             return
           })
         }
-        this.currectdata=item
+        // this.currectdata=item
+        this.currectdata=arr1
 
         this.distributionshow=true
 
@@ -820,7 +862,7 @@ import { findLastIndexOfIterate } from 'xe-utils/methods'
           })
       },
       marginsubmit(item){
-        var arr2=this.multipleSelection1[this.currectdata.id]
+        var arr2=this.currectdata
           if(this.form.distributionIng>this.form.distributionCan){
             this.$message({
               message: '超出可分配金额',
@@ -850,8 +892,8 @@ import { findLastIndexOfIterate } from 'xe-utils/methods'
             });
           })
       },
-      distributionsubmit(item){
-        var arr2=this.multipleSelection1[this.currectdata.id]
+      distributionsubmit(){
+        var arr2=this.currectdata
           if(this.form.distributionIng>this.form.distributionCan){
             this.$message({
               message: '超出可分配金额',