|
|
@@ -200,7 +200,6 @@
|
|
|
>重置
|
|
|
</el-button>
|
|
|
</el-form-item>
|
|
|
-
|
|
|
</el-row>
|
|
|
</el-form>
|
|
|
|
|
|
@@ -273,14 +272,7 @@
|
|
|
<el-table-column type="selection" width="60" fixed align="center" />
|
|
|
<el-table-column type="index" label="行号" align="center" fixed/>
|
|
|
<el-table-column label="制单人" align="center" prop="createBy" fixed/>
|
|
|
- <el-table-column
|
|
|
- width="100"
|
|
|
- label="入库状态"
|
|
|
- fixed
|
|
|
- sortable
|
|
|
- align="center"
|
|
|
- prop="fItemsStatus"
|
|
|
- >
|
|
|
+ <el-table-column width="100" label="入库状态" fixed sortable align="center" prop="fItemsStatus">
|
|
|
<template slot-scope="scope">
|
|
|
<span v-if="scope.row.fItemsStatus === 1">计划</span>
|
|
|
<span v-if="scope.row.fItemsStatus === 2">待入库</span>
|
|
|
@@ -288,55 +280,26 @@
|
|
|
<span v-if="scope.row.fItemsStatus === 4">已入库</span>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
-
|
|
|
- <el-table-column
|
|
|
-
|
|
|
- label="货权方"
|
|
|
- fixed
|
|
|
- sortable
|
|
|
- width="220"
|
|
|
- align="center"
|
|
|
- prop="fCorpid"
|
|
|
- />
|
|
|
+ <el-table-column label="货权方" fixed sortable width="220" align="center" prop="fCorpid"/>
|
|
|
<el-table-column label="提单号" sortable fixed width="216" align="center" prop="fMblno" show-overflow-tooltip />
|
|
|
<el-table-column label="品名" fixed :show-overflow-tooltip="true" align="center" prop="fProductName" />
|
|
|
<el-table-column label="品牌" fixed align="center" prop="fMarks" />
|
|
|
- <el-table-column
|
|
|
- label="入库日期"
|
|
|
- fixed
|
|
|
- sortable
|
|
|
- align="center"
|
|
|
- prop="fBsdate"
|
|
|
- width="100"
|
|
|
- ><template slot-scope="scope">
|
|
|
+ <el-table-column label="入库日期" fixed sortable align="center" prop="fBsdate" width="100">
|
|
|
+ <template slot-scope="scope">
|
|
|
<span>{{ parseTime(scope.row.fBsdate, "{y}-{m}-{d}") }}</span>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <!-- <el-table-column
|
|
|
- label="贸易方式"
|
|
|
- align="center"
|
|
|
- prop="fTrademodeid"
|
|
|
- :formatter="fTrademodeidFormat"
|
|
|
- /> -->
|
|
|
<el-table-column label="仓库" fixed sortable align="center" prop="fWarehouseid" />
|
|
|
<el-table-column label="计划件数" align="center" prop="fPlanqty" />
|
|
|
<el-table-column label="入库件数" align="center" prop="fQty" />
|
|
|
- <!-- <el-table-column label="入库毛重" align="center" prop="fGrossweight"/>-->
|
|
|
- <!-- <el-table-column label="货转客户名称" align="center" prop="fTocorpid" /> -->
|
|
|
<el-table-column label="入库毛重(kg)" align="center" width="100" prop="fGrossweight" />
|
|
|
<el-table-column label="入库净重(kg)" align="center" width="100" prop="fNetweight" />
|
|
|
<el-table-column label="车号" align="center" prop="fTruckno" width="100"/>
|
|
|
<el-table-column label="司机名称" align="center" prop="fDriverName" />
|
|
|
<el-table-column label="司机电话" align="center" prop="fDriverTel" width="120"/>
|
|
|
<el-table-column label="司机身份证" align="center" prop="fDriverIdCar" width="180"/>
|
|
|
- <el-table-column label="业务类别" align="center" prop="fBusinessType"
|
|
|
- :formatter="fBusinessTypeFormat"/>
|
|
|
- <el-table-column
|
|
|
- width="100"
|
|
|
- label="费用状态"
|
|
|
- align="center"
|
|
|
- prop="fBillstatus"
|
|
|
- >
|
|
|
+ <el-table-column label="业务类别" align="center" prop="fBusinessType" :formatter="fBusinessTypeFormat"/>
|
|
|
+ <el-table-column width="100" label="费用状态" align="center" prop="fBillstatus">
|
|
|
<template slot-scope="scope">
|
|
|
<span v-if="scope.row.fBillstatus === 1">录入</span>
|
|
|
<span v-if="scope.row.fBillstatus === 2">暂存</span>
|
|
|
@@ -346,12 +309,7 @@
|
|
|
<span v-if="scope.row.fBillstatus === 6">全部入账</span>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column
|
|
|
- label="操作"
|
|
|
- align="center"
|
|
|
- class-name="small-padding fixed-width"
|
|
|
- width="180"
|
|
|
- >
|
|
|
+ <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="180">
|
|
|
<template slot-scope="scope">
|
|
|
<el-button
|
|
|
size="mini"
|
|
|
@@ -494,7 +452,6 @@
|
|
|
</el-time-picker>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
-
|
|
|
<el-col :span="8">
|
|
|
<el-form-item label="仓库" prop="fWarehouseid">
|
|
|
<el-select
|
|
|
@@ -555,7 +512,6 @@
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
</el-row>
|
|
|
-
|
|
|
<el-row>
|
|
|
<el-col :span="8">
|
|
|
<el-form-item label="仓管员" prop="fStorekeeper">
|
|
|
@@ -577,7 +533,6 @@
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
-
|
|
|
<el-col :span="8">
|
|
|
<el-form-item label="计费单位" prop="fFeetunit">
|
|
|
<el-select
|
|
|
@@ -682,7 +637,6 @@
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
-
|
|
|
<el-col :span="8">
|
|
|
<el-form-item label="劳务公司" prop="fLabour">
|
|
|
<el-select
|
|
|
@@ -760,7 +714,6 @@
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
</el-row>
|
|
|
-
|
|
|
<div v-if="detailsHidden">
|
|
|
<el-row style="margin-top: 30px">
|
|
|
<el-col :span="8">
|
|
|
@@ -1010,7 +963,6 @@
|
|
|
</div>
|
|
|
</el-form>
|
|
|
|
|
|
-
|
|
|
<el-collapse v-model="activeNames">
|
|
|
<el-collapse-item name="1">
|
|
|
<template slot="title">
|
|
|
@@ -1181,7 +1133,6 @@
|
|
|
filterable
|
|
|
size="small"
|
|
|
:disabled="browseStatus || scope.row.fBillstatus === 20 || scope.row.fBillstatus === 30 || scope.row.fBillstatus === 40"
|
|
|
- :remote-method="kqhouseRemoteMethod"
|
|
|
placeholder="请选择商品属性"
|
|
|
>
|
|
|
<el-option
|
|
|
@@ -2355,8 +2306,6 @@
|
|
|
</el-collapse-item>
|
|
|
</el-collapse>
|
|
|
|
|
|
-
|
|
|
-
|
|
|
<div slot="footer" class="dialog-footer">
|
|
|
<!-- 弹窗, 新增 / 修改 -->
|
|
|
<add-or-update
|
|
|
@@ -2402,7 +2351,7 @@
|
|
|
@click="submitForm(6)"
|
|
|
>请核</el-button>
|
|
|
<el-button type="danger" v-if="form.fBillstatus === 6" @click="revoke">撤销请核</el-button>
|
|
|
- <el-button type="danger" v-if="form.fBillstatus === 4 && current == before" :disabled="doNot" @click="revokeTwo">撤销请核</el-button>
|
|
|
+ <el-button type="danger" v-if="form.fBillstatus === 4 && current == before" :disabled="doNot" @click="revokeTwo">撤销审批</el-button>
|
|
|
<el-button @click="cancelTwo" v-if="approVal === true">取 消</el-button>
|
|
|
<el-button @click="cancel" v-else>取 消</el-button>
|
|
|
</div>
|
|
|
@@ -2470,95 +2419,6 @@
|
|
|
:close-on-click-modal="false"
|
|
|
:modal="false"
|
|
|
style="box-shadow: 0 1px 3px rgba(0, 0, 0, 0) !important"
|
|
|
- :visible.sync="warehousingagreement"
|
|
|
- width="70%"
|
|
|
- >
|
|
|
- <el-table
|
|
|
- :data="tasklegList"
|
|
|
- ref="table"
|
|
|
- tooltip-effect="dark"
|
|
|
- width="100%"
|
|
|
- border
|
|
|
- stripe
|
|
|
- @selection-change="whgenlegSelectionChange"
|
|
|
- >
|
|
|
- <el-table-column type="selection" width="55"> </el-table-column>
|
|
|
- <el-table-column label="行号" type="index" width="80">
|
|
|
- </el-table-column>
|
|
|
- <el-table-column
|
|
|
- prop="fCorpname"
|
|
|
- header-align="center"
|
|
|
- align="center"
|
|
|
- label="客户名称"
|
|
|
- >
|
|
|
- </el-table-column>
|
|
|
- <el-table-column
|
|
|
- prop="fName"
|
|
|
- header-align="center"
|
|
|
- align="center"
|
|
|
- label="费用名称"
|
|
|
- >
|
|
|
- </el-table-column>
|
|
|
- <el-table-column
|
|
|
- prop="fFeeUnitid"
|
|
|
- header-align="center"
|
|
|
- align="center"
|
|
|
- width="180px"
|
|
|
- label="计价单位"
|
|
|
- >
|
|
|
- <template slot-scope="scope">
|
|
|
- <el-select
|
|
|
- v-model="scope.row.fFeeUnitid"
|
|
|
- placeholder="请选择计费单位"
|
|
|
- @change="changeFeeUnit(scope.row)"
|
|
|
- disabled
|
|
|
- clearable
|
|
|
- >
|
|
|
- <el-option
|
|
|
- v-for="dict in jFeetunitOptions"
|
|
|
- :key="dict.dictValue"
|
|
|
- :label="dict.dictLabel"
|
|
|
- :value="dict.dictValue"
|
|
|
- />
|
|
|
- </el-select>
|
|
|
- </template>
|
|
|
- </el-table-column>
|
|
|
- <el-table-column
|
|
|
- prop="fPrice"
|
|
|
- header-align="center"
|
|
|
- align="center"
|
|
|
- label="单价"
|
|
|
- >
|
|
|
- </el-table-column>
|
|
|
-
|
|
|
- <!-- <el-table-column
|
|
|
- prop="fMarks"
|
|
|
- header-align="center"
|
|
|
- align="center"
|
|
|
- label="唛头"
|
|
|
- >
|
|
|
- </el-table-column> -->
|
|
|
- </el-table>
|
|
|
- <pagination
|
|
|
- v-show="whgenlegTotal > 0"
|
|
|
- :total="whgenlegTotal"
|
|
|
- :page.sync="queryParams.pageNum"
|
|
|
- :limit.sync="queryParams.pageSize"
|
|
|
- @pagination="getWhgenlegList"
|
|
|
- />
|
|
|
- <div slot="footer" class="dialog-footer">
|
|
|
- <el-button type="primary" @click="whgenlegData"
|
|
|
- >导入作业费协议</el-button
|
|
|
- >
|
|
|
- <el-button @click="warehousingagreement = false">取 消</el-button>
|
|
|
- </div>
|
|
|
- </el-dialog>
|
|
|
- <!-- 选择作业费协议数据 -->
|
|
|
- <el-dialog
|
|
|
- title="作业费协议"
|
|
|
- :close-on-click-modal="false"
|
|
|
- :modal="false"
|
|
|
- style="box-shadow: 0 1px 3px rgba(0, 0, 0, 0) !important"
|
|
|
:visible.sync="warehousingagreements"
|
|
|
width="70%"
|
|
|
>
|
|
|
@@ -2579,27 +2439,9 @@
|
|
|
<el-table-column type="selection" width="55"> </el-table-column>
|
|
|
<el-table-column label="行号" type="index" width="80">
|
|
|
</el-table-column>
|
|
|
- <el-table-column
|
|
|
- prop="fCorpname"
|
|
|
- header-align="center"
|
|
|
- align="center"
|
|
|
- label="客户名称"
|
|
|
- >
|
|
|
- </el-table-column>
|
|
|
- <el-table-column
|
|
|
- prop="fName"
|
|
|
- header-align="center"
|
|
|
- align="center"
|
|
|
- label="费用名称"
|
|
|
- >
|
|
|
- </el-table-column>
|
|
|
- <el-table-column
|
|
|
- prop="fFeeUnitid"
|
|
|
- header-align="center"
|
|
|
- align="center"
|
|
|
- width="180px"
|
|
|
- label="计价单位"
|
|
|
- >
|
|
|
+ <el-table-column prop="fCorpname" header-align="center" align="center" label="客户名称"/>
|
|
|
+ <el-table-column prop="fName" header-align="center" align="center" label="费用名称"/>
|
|
|
+ <el-table-column prop="fFeeUnitid" header-align="center" align="center" width="180px" label="计价单位">
|
|
|
<template slot-scope="scope">
|
|
|
<el-select
|
|
|
v-model="scope.row.fFeeUnitid"
|
|
|
@@ -2617,14 +2459,9 @@
|
|
|
</el-select>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column
|
|
|
- prop="fPrice"
|
|
|
- header-align="center"
|
|
|
- align="center"
|
|
|
- label="单价"
|
|
|
- >
|
|
|
- </el-table-column>
|
|
|
+ <el-table-column prop="fPrice" header-align="center" align="center" label="单价"/>
|
|
|
</el-table>
|
|
|
+
|
|
|
<pagination
|
|
|
v-show="whgenlegTotal > 0"
|
|
|
:total="whgenlegTotal"
|
|
|
@@ -3135,36 +2972,6 @@ export default {
|
|
|
fGoodsids:[
|
|
|
{ required: true, message: ' ', trigger: 'blur' }
|
|
|
],
|
|
|
- // fMarks: [
|
|
|
- // { required: true, message: ' ', trigger: 'blur' }
|
|
|
- // ],
|
|
|
- // fWarehouselocid:[
|
|
|
- // { required: true, message: ' ', trigger: 'blur'}
|
|
|
- // ],
|
|
|
- // fGrossweight:[
|
|
|
- // { required: true, message: ' ', trigger: 'blur'}
|
|
|
- // ],
|
|
|
- // fNetweight:[
|
|
|
- // { required: true, message: ' ', trigger: 'blur'}
|
|
|
- // ],
|
|
|
- // fQty:[
|
|
|
- // { required: true, message: ' ', trigger: 'blur'}
|
|
|
- // ],
|
|
|
- // fPackagespecs:[
|
|
|
- // { required: true, message: ' ', trigger: 'blur'}
|
|
|
- // ],
|
|
|
- // fTruckno:[
|
|
|
- // { required: true, message: ' ', trigger: 'blur'}
|
|
|
- // ],
|
|
|
- // fDriverName:[
|
|
|
- // { required: true, message: ' ', trigger: 'blur'}
|
|
|
- // ],
|
|
|
- // fDriverTel:[
|
|
|
- // { required: true, message: ' ', trigger: 'blur'}
|
|
|
- // ],
|
|
|
- // fDriverIdCar:[
|
|
|
- // { required: true, message: ' ', trigger: 'blur'}
|
|
|
- // ]
|
|
|
},
|
|
|
queryForm: {},
|
|
|
// 新增用户对话框
|
|
|
@@ -3224,7 +3031,7 @@ export default {
|
|
|
businessTypeOption: [],
|
|
|
// 仓库(仓库数据)
|
|
|
warehouseOptions: [],
|
|
|
- kqhouseOptions: [],
|
|
|
+ // kqhouseOptions: [],
|
|
|
// 贸易方式(数据字典),对应t_trademodels 字典
|
|
|
fTrademodeidOptions: [],
|
|
|
// 仓储类型 入库时选择 产地 规格 品牌 所用,对应storage_type 字典
|
|
|
@@ -3237,26 +3044,12 @@ export default {
|
|
|
fIfweighOptions: [],
|
|
|
// 是否质押(数据字典),默认 F ,质押T 否者F 下拉选择字典
|
|
|
fIfpledgeOptions: [],
|
|
|
- // 是否破损(数据字典),默认F否则T字典
|
|
|
- fIfdamageOptions: [],
|
|
|
- // 单据类型(数据字典)SJRK字典
|
|
|
- fBilltypeOptions: [],
|
|
|
- // 状态(数据字典),N 入字典
|
|
|
- fBillstatusOptions: [],
|
|
|
- //结算方式对应字典表
|
|
|
- fStltypeidOptions:[],
|
|
|
// 劳务公司
|
|
|
fCompanyOptIons: [],
|
|
|
// 费用名称
|
|
|
fWbuOptions: [],
|
|
|
// 计价单位
|
|
|
- jFeetunitOptions: [
|
|
|
- // { dictLabel: "件数", dictValue: "1" },
|
|
|
- // { dictLabel: "毛重", dictValue: "2" },
|
|
|
- // { dictLabel: "净重", dictValue: "3" },
|
|
|
- // { dictLabel: "尺码", dictValue: "4" },
|
|
|
- // { dictLabel: "固定", dictValue: "5" },
|
|
|
- ],
|
|
|
+ jFeetunitOptions: [],
|
|
|
current:'',
|
|
|
before:'',
|
|
|
//控制选择库位弹出
|
|
|
@@ -3376,37 +3169,60 @@ export default {
|
|
|
created() {
|
|
|
this.getList();
|
|
|
this.getDicts("storage_type").then((response) => {
|
|
|
- this.fStorageTypeOptions = response.data;
|
|
|
+ if (response.data){
|
|
|
+ this.fStorageTypeOptions = response.data;
|
|
|
+ }else {
|
|
|
+ return
|
|
|
+ }
|
|
|
});
|
|
|
this.getDicts("data_trademodes").then((response) => {
|
|
|
- this.fTrademodeidOptions = response.data;
|
|
|
+ if (response.data){
|
|
|
+ this.fTrademodeidOptions = response.data;
|
|
|
+ }else {
|
|
|
+ return
|
|
|
+ }
|
|
|
});
|
|
|
this.getDicts("data_stltype_type").then((response) => {
|
|
|
- this.fStltypeOptions = response.data;
|
|
|
+ if (response.data){
|
|
|
+ this.fStltypeOptions = response.data;
|
|
|
+ }else {
|
|
|
+ return
|
|
|
+ }
|
|
|
});
|
|
|
this.getDicts("tax_rate").then((response) => {
|
|
|
- this.fTaxrate = response.data[0].dictValue;
|
|
|
+ if (response.data){
|
|
|
+ this.fTaxrate = response.data[0].dictValue;
|
|
|
+ }else {
|
|
|
+ return
|
|
|
+ }
|
|
|
});
|
|
|
this.getDicts("data_ifweigh_status").then((response) => {
|
|
|
- this.fIfweighOptions = response.data;
|
|
|
+ if (response.data){
|
|
|
+ this.fIfweighOptions = response.data;
|
|
|
+ }else {
|
|
|
+ return
|
|
|
+ }
|
|
|
});
|
|
|
this.getDicts("data_ifpledge_status").then((response) => {
|
|
|
- this.fIfpledgeOptions = response.data;
|
|
|
- });
|
|
|
- this.getDicts("data_ifdamage_status").then((response) => {
|
|
|
- this.fIfdamageOptions = response.data;
|
|
|
- });
|
|
|
- this.getDicts("data_billtype_type").then((response) => {
|
|
|
- this.fBilltypeOptions = response.data;
|
|
|
- });
|
|
|
- this.getDicts("sys_common_status").then((response) => {
|
|
|
- this.fBillstatusOptions = response.data;
|
|
|
+ if (response.data){
|
|
|
+ this.fIfpledgeOptions = response.data;
|
|
|
+ }else {
|
|
|
+ return
|
|
|
+ }
|
|
|
});
|
|
|
this.getDicts("data_unitfees").then((response) => {
|
|
|
- this.fFeetunitOptions = response.data;
|
|
|
+ if (response.data){
|
|
|
+ this.fFeetunitOptions = response.data;
|
|
|
+ }else {
|
|
|
+ return
|
|
|
+ }
|
|
|
});
|
|
|
this.getDicts("data_unitfees").then((response) => {
|
|
|
- this.jFeetunitOptions = response.data;
|
|
|
+ if (response.data){
|
|
|
+ this.jFeetunitOptions = response.data;
|
|
|
+ }else {
|
|
|
+ return
|
|
|
+ }
|
|
|
});
|
|
|
this.getDicts("st_in_type").then((response) => {
|
|
|
if (response.data){
|
|
|
@@ -3415,9 +3231,6 @@ export default {
|
|
|
return
|
|
|
}
|
|
|
});
|
|
|
- this.getDicts("data_stltype_type").then(response => {
|
|
|
- this.fStltypeidOptions = response.data;
|
|
|
- });
|
|
|
treeselect().then(response => {
|
|
|
this.warehouseOptions = response.data
|
|
|
})
|
|
|
@@ -3428,7 +3241,6 @@ export default {
|
|
|
this.adoPt()
|
|
|
},
|
|
|
methods: {
|
|
|
-
|
|
|
//合计
|
|
|
getSum(param){
|
|
|
const { columns, data } = param
|
|
|
@@ -3464,16 +3276,19 @@ export default {
|
|
|
}
|
|
|
}
|
|
|
},
|
|
|
+ //关闭弹窗
|
|
|
handleClose(){
|
|
|
this.cancel()
|
|
|
},
|
|
|
+ //作业费协议跳转车队或劳务公司库存账
|
|
|
handleSelect(key, keyPath) {
|
|
|
this.addAgreements(key)
|
|
|
},
|
|
|
- /** 查询部门下拉树结构 */
|
|
|
+ // 查询弹窗仓库下拉树结构
|
|
|
treeseLect(tree){
|
|
|
this.queryParams.fWarehouselocid = tree.id
|
|
|
},
|
|
|
+ //从表获取焦点跳出弹窗获取仓库信息
|
|
|
getTreeselect(row) {
|
|
|
this.treeselectList.fWarehouselocid = null
|
|
|
this.inDex = row.$index
|
|
|
@@ -3484,16 +3299,18 @@ export default {
|
|
|
})
|
|
|
this.Warehouse = this.dataList[this.inDex].fWarehouseInformation
|
|
|
},
|
|
|
+ //从表库位弹窗下拉树状事件
|
|
|
getAlltree(tree){
|
|
|
this.information = tree.fWarehouseInformation
|
|
|
this.informationId = tree.id
|
|
|
},
|
|
|
+ //从表弹窗仓库带入
|
|
|
confirm(){
|
|
|
this.$set(this.dataList[this.inDex], 'fWarehouseInformation', this.information)
|
|
|
this.$set(this.dataList[this.inDex], 'fWarehouselocid', this.informationId)
|
|
|
this.choiceWarehouse = false
|
|
|
},
|
|
|
- // 出库件数的计算
|
|
|
+ // 入库件数的计算
|
|
|
qtyChange(row) {
|
|
|
if (!row.fQty || row.fQty === "") {
|
|
|
this.$set(row, "fNetweight", 0);
|
|
|
@@ -3511,9 +3328,18 @@ export default {
|
|
|
this.$set(row, "fNetweight", parseFloat(Number(netweight) * Number(row.fQty)).toFixed(2));
|
|
|
this.$set(row, "fGrossweight", parseFloat(Number(grossweigh) * Number(row.fQty)).toFixed(2));
|
|
|
},
|
|
|
+ //首页审批跳转
|
|
|
adoPt(){
|
|
|
this.approval = this.$route.query.data
|
|
|
if (this.approval){
|
|
|
+ let queryParams = { pageNum: 1, pageSize: 10, fDc:'C'};
|
|
|
+ listFees(queryParams).then((response) => {
|
|
|
+ this.fCNameOptions = response.rows;
|
|
|
+ });
|
|
|
+ let query = { pageNum: 1, pageSize: 10, fDc:'D'};
|
|
|
+ listFees(query).then((response) => {
|
|
|
+ this.fDNameOptions = response.rows;
|
|
|
+ });
|
|
|
this.reset();
|
|
|
this.doNot = true
|
|
|
this.closeButton = false
|
|
|
@@ -3582,7 +3408,7 @@ export default {
|
|
|
this.$set(this.dataList[list], 'fBusinessType', this.dataList[list].fBusinessType + '')
|
|
|
}
|
|
|
this.goodsOptions = response.data.goodsList;
|
|
|
- this.kqhouseOptions = response.data.warehouseAreas;
|
|
|
+ // this.kqhouseOptions = response.data.warehouseAreas;
|
|
|
this.warehouseDrList = response.data.warehousebillsfeesDr;
|
|
|
for (let dr in this.warehouseDrList) {
|
|
|
this.$set(this.warehouseDrList[dr], "fFeeUnitid", this.warehouseDrList[dr].fFeeunitid + "");
|
|
|
@@ -3604,6 +3430,7 @@ export default {
|
|
|
this.reset()
|
|
|
this.getList()
|
|
|
},
|
|
|
+ //首页审批跳转关闭返回首页
|
|
|
cancelTwo(){
|
|
|
this.open = false
|
|
|
let view = {
|
|
|
@@ -3632,6 +3459,7 @@ export default {
|
|
|
this.$set(this.relevantAttachments[list], "fName", row.fileName);
|
|
|
}
|
|
|
},
|
|
|
+ //从表库位弹窗关闭
|
|
|
hanDleclose(done){
|
|
|
this.$confirm('确认关闭？')
|
|
|
.then(_ => {
|
|
|
@@ -3639,6 +3467,7 @@ export default {
|
|
|
})
|
|
|
.catch(_ => {});
|
|
|
},
|
|
|
+ //审批完成撤销请核
|
|
|
revoke(){
|
|
|
revoke(this.form.fId).then(data=>{
|
|
|
if (data.code === 200){
|
|
|
@@ -3648,6 +3477,7 @@ export default {
|
|
|
}
|
|
|
})
|
|
|
},
|
|
|
+ //撤销审批
|
|
|
revokeTwo(){
|
|
|
let data = {
|
|
|
actId:110,
|
|
|
@@ -3663,6 +3493,7 @@ export default {
|
|
|
}
|
|
|
})
|
|
|
},
|
|
|
+ //收货单打印样式
|
|
|
printSomething() {
|
|
|
// 此处的style即为打印时的样式
|
|
|
const style =
|
|
|
@@ -3674,6 +3505,7 @@ export default {
|
|
|
scanStyles: false,
|
|
|
});
|
|
|
},
|
|
|
+ //入库单（进仓单）打印样式
|
|
|
printSomething1() {
|
|
|
// 此处的style即为打印时的样式
|
|
|
const style =
|
|
|
@@ -3685,6 +3517,7 @@ export default {
|
|
|
scanStyles: false,
|
|
|
});
|
|
|
},
|
|
|
+ //作业单打印样式
|
|
|
printSomething2() {
|
|
|
// 此处的style即为打印时的样式
|
|
|
const style =
|
|
|
@@ -3747,7 +3580,7 @@ export default {
|
|
|
this.getWhgenlegList(kye);
|
|
|
}
|
|
|
},
|
|
|
- // 新增list
|
|
|
+ // 入库明细新增list
|
|
|
addRelevant(status) {
|
|
|
if (!this.form.fPlannetweight || !this.form.fPlangrossweight || !this.form.fPlanqty) {
|
|
|
this.$message({ message: "请维护计划净重(kg)，计划毛重(kg)，计划件数", type: "warning", });
|
|
|
@@ -3760,7 +3593,7 @@ export default {
|
|
|
this.planningList.fPlangrossweight = parseFloat(Number(this.fPlangNumber) * Number(this.planningList.fPlanqty)).toFixed(2)
|
|
|
this.weightList = true
|
|
|
},
|
|
|
- // 收货单打印界面
|
|
|
+ // 入货单打印界面
|
|
|
showEditDialog_s() {
|
|
|
if (this.Printinglist.length > 0) {
|
|
|
this.editDialogVisible_s = true;
|
|
|
@@ -3795,6 +3628,7 @@ export default {
|
|
|
this.$message.error("请选择需要打印的明细!");
|
|
|
}
|
|
|
},
|
|
|
+ //关闭弹窗日期回显
|
|
|
closeDialog() {
|
|
|
for (let aorp in this.Printinglist) {
|
|
|
this.$set(
|
|
|
@@ -3804,6 +3638,7 @@ export default {
|
|
|
);
|
|
|
}
|
|
|
},
|
|
|
+ //收业单打印界面
|
|
|
showEditDialog_ss() {
|
|
|
if (this.Printinglist.length > 0) {
|
|
|
for (let li in this.Printinglist) {
|
|
|
@@ -3840,6 +3675,7 @@ export default {
|
|
|
this.$message.error("请选择需要打印的明细!");
|
|
|
}
|
|
|
},
|
|
|
+ //作业单打印界面
|
|
|
showEditDialog_sss() {
|
|
|
if (this.Printinglist.length > 0) {
|
|
|
if(this.form.fFeetunit > 3){
|
|
|
@@ -3969,7 +3805,7 @@ export default {
|
|
|
this.$message.error('请选择需要打印的明细!')
|
|
|
}
|
|
|
},
|
|
|
- // 收款信息
|
|
|
+ // 收款信息新行
|
|
|
addCollection() {
|
|
|
if(this.form.fBusinessType == null){
|
|
|
this.$message.error("请维护作业类型")
|
|
|
@@ -4000,6 +3836,7 @@ export default {
|
|
|
});
|
|
|
}
|
|
|
},
|
|
|
+ //付款信息新行
|
|
|
addpayment() {
|
|
|
if(this.form.fBusinessType == null){
|
|
|
this.$message.error("请维护作业类型")
|
|
|
@@ -4030,6 +3867,7 @@ export default {
|
|
|
});
|
|
|
}
|
|
|
},
|
|
|
+ //获取登陆人
|
|
|
queryUser() {
|
|
|
queryUserVal().then((response) => {
|
|
|
if (response.user !== null) {
|
|
|
@@ -4048,17 +3886,20 @@ export default {
|
|
|
}
|
|
|
});
|
|
|
},
|
|
|
- /** 查询仓库主(出入库)列表 */
|
|
|
+ //刷新查询仓库主(出入库)列表
|
|
|
getList() {
|
|
|
+ //获取劳务公司
|
|
|
let queryParams = { pageNum: 1, pageSize: 10, fTypeid: 6}
|
|
|
listCorps(queryParams).then((response) => {
|
|
|
this.fCompanyOptIons = response.rows;
|
|
|
});
|
|
|
+ //获取车队
|
|
|
let params = { pageNum: 1, pageSize: 10, fTypeid: 2}
|
|
|
listCorps(params).then((response) => {
|
|
|
this.fleetOptions = response.rows;
|
|
|
});
|
|
|
this.loading = true;
|
|
|
+ //获取仓库
|
|
|
listWarehousebills(this.queryParams).then((response) => {
|
|
|
this.warehousebillsList = response.rows;
|
|
|
this.total = response.total;
|
|
|
@@ -4109,7 +3950,7 @@ export default {
|
|
|
this.whgenlegTotal = response.total;
|
|
|
});
|
|
|
},
|
|
|
- // 导入计划重量
|
|
|
+ // 导入从表库存明细
|
|
|
costList() {
|
|
|
if (Number(this.planningList.fPlanqty) > Number(this.form.fPlanqty)) {
|
|
|
this.$message({ message: "计划费件数不能大于主表计划费件数！", type: "warning", });
|
|
|
@@ -4162,15 +4003,14 @@ export default {
|
|
|
// 查询库区下 所有库位
|
|
|
// this.warehouseMethod();
|
|
|
},
|
|
|
- /* 所有库位信息 */
|
|
|
- warehouseMethod() {
|
|
|
- var fWarehouseid = this.form.fWarehouseid ;
|
|
|
- let queryParams = { pageNum: 1, pageSize: 10, fStatus: 0, delFlag: 0, fWarehouseid : fWarehouseid };
|
|
|
- listWarehouse(queryParams).then((response) => {
|
|
|
- this.kqhouseOptions = response.rows;
|
|
|
- });
|
|
|
- },
|
|
|
-
|
|
|
+ //所有库位信息
|
|
|
+ // warehouseMethod() {
|
|
|
+ // var fWarehouseid = this.form.fWarehouseid ;
|
|
|
+ // let queryParams = { pageNum: 1, pageSize: 10, fStatus: 0, delFlag: 0, fWarehouseid : fWarehouseid };
|
|
|
+ // listWarehouse(queryParams).then((response) => {
|
|
|
+ // this.kqhouseOptions = response.rows;
|
|
|
+ // });
|
|
|
+ // },
|
|
|
|
|
|
// 导入付款信息
|
|
|
whgenlegData() {
|
|
|
@@ -4312,18 +4152,6 @@ export default {
|
|
|
fIfpledgeFormat(row, column) {
|
|
|
return this.selectDictLabel(this.fIfpledgeOptions, row.fIfpledge);
|
|
|
},
|
|
|
- // 是否破损(数据字典),默认F否则T字典翻译
|
|
|
- fIfdamageFormat(row, column) {
|
|
|
- return this.selectDictLabel(this.fIfdamageOptions, row.fIfdamage);
|
|
|
- },
|
|
|
- // 单据类型(数据字典)SJRK字典翻译
|
|
|
- fBilltypeFormat(row, column) {
|
|
|
- return this.selectDictLabel(this.fBilltypeOptions, row.fBilltype);
|
|
|
- },
|
|
|
- // 状态(数据字典),N 入字典翻译
|
|
|
- fBillstatusFormat(row, column) {
|
|
|
- return this.selectDictLabel(this.fBillstatusOptions, row.fBillstatus);
|
|
|
- },
|
|
|
// 取消按钮
|
|
|
cancel() {
|
|
|
this.open = false
|
|
|
@@ -4404,7 +4232,7 @@ export default {
|
|
|
this.warehouseOptions = []
|
|
|
this.fSbuOptions = []
|
|
|
this.goodsOptions = []
|
|
|
- this.kqhouseOptions = []
|
|
|
+ // this.kqhouseOptions = []
|
|
|
this.relevantAttachments = []
|
|
|
this.KHblnoOptions = []
|
|
|
this.fWbuOptions = []
|
|
|
@@ -4514,6 +4342,14 @@ export default {
|
|
|
},
|
|
|
/** 修改按钮操作 */
|
|
|
handleUpdate(row, status) {
|
|
|
+ let queryParams = { pageNum: 1, pageSize: 10, fDc:'C'};
|
|
|
+ listFees(queryParams).then((response) => {
|
|
|
+ this.fCNameOptions = response.rows;
|
|
|
+ });
|
|
|
+ let query = { pageNum: 1, pageSize: 10, fDc:'D'};
|
|
|
+ listFees(query).then((response) => {
|
|
|
+ this.fDNameOptions = response.rows;
|
|
|
+ });
|
|
|
this.dataList = []
|
|
|
this.reset()
|
|
|
this.browseStatus = status;
|
|
|
@@ -4584,7 +4420,7 @@ export default {
|
|
|
for (let list in this.dataList) {
|
|
|
this.$set(this.dataList[list], "fBsdate", Date.parse(this.dataList[list].fBsdate));
|
|
|
}
|
|
|
- this.kqhouseOptions = response.data.warehouseAreas;
|
|
|
+ // this.kqhouseOptions = response.data.warehouseAreas;
|
|
|
this.warehouseDrList = response.data.warehousebillsfeesDr;
|
|
|
for (let dr in this.warehouseDrList) {
|
|
|
this.$set(this.warehouseDrList[dr], "fFeeUnitid", this.warehouseDrList[dr].fFeeunitid + '');
|
|
|
@@ -4933,7 +4769,7 @@ export default {
|
|
|
for (let list in this.dataList) {
|
|
|
this.$set(this.dataList[list], "fBsdate", Date.parse(this.dataList[list].fBsdate));
|
|
|
}
|
|
|
- this.kqhouseOptions = response.data.warehouseAreas;
|
|
|
+ // this.kqhouseOptions = response.data.warehouseAreas;
|
|
|
this.warehouseDrList = response.data.warehousebillsfeesDr;
|
|
|
for (let dr in this.warehouseDrList) {
|
|
|
this.$set(this.warehouseDrList[dr], "fFeeUnitid", this.warehouseDrList[dr].fFeeunitid + '');
|
|
|
@@ -5182,7 +5018,7 @@ export default {
|
|
|
for (let list in this.dataList) {
|
|
|
this.$set(this.dataList[list], "fBsdate", Date.parse(this.dataList[list].fBsdate));
|
|
|
}
|
|
|
- this.kqhouseOptions = response.data.warehouseAreas;
|
|
|
+ // this.kqhouseOptions = response.data.warehouseAreas;
|
|
|
this.warehouseDrList = response.data.warehousebillsfeesDr;
|
|
|
for (let dr in this.warehouseDrList) {
|
|
|
this.$set(this.warehouseDrList[dr], "fFeeUnitid", this.warehouseDrList[dr].fFeeunitid + '');
|
|
|
@@ -5634,25 +5470,25 @@ export default {
|
|
|
});
|
|
|
},
|
|
|
/* 远程模糊查询库区 */
|
|
|
- kqhouseRemoteMethod(name) {
|
|
|
- if (name == null || name === "") {
|
|
|
- return false;
|
|
|
- }
|
|
|
- if (!this.form.fWarehouseid) {
|
|
|
- this.$message.error("请输入仓库!");
|
|
|
- return false;
|
|
|
- }
|
|
|
-
|
|
|
- let queryParams = {
|
|
|
- pageNum: 1,
|
|
|
- pageSize: 10,
|
|
|
- fWarehouseid: this.form.fWarehouseid,
|
|
|
- fName: name,
|
|
|
- };
|
|
|
- listArea(queryParams).then((response) => {
|
|
|
- this.kqhouseOptions = response.rows;
|
|
|
- });
|
|
|
- },
|
|
|
+ // kqhouseRemoteMethod(name) {
|
|
|
+ // if (name == null || name === "") {
|
|
|
+ // return false;
|
|
|
+ // }
|
|
|
+ // if (!this.form.fWarehouseid) {
|
|
|
+ // this.$message.error("请输入仓库!");
|
|
|
+ // return false;
|
|
|
+ // }
|
|
|
+ //
|
|
|
+ // let queryParams = {
|
|
|
+ // pageNum: 1,
|
|
|
+ // pageSize: 10,
|
|
|
+ // fWarehouseid: this.form.fWarehouseid,
|
|
|
+ // fName: name,
|
|
|
+ // };
|
|
|
+ // // listArea(queryParams).then((response) => {
|
|
|
+ // // this.kqhouseOptions = response.rows;
|
|
|
+ // // });
|
|
|
+ // },
|
|
|
/* 远程模糊查询操作用户 */
|
|
|
userRemoteMethod(name) {
|
|
|
if (name == null || name === "") {
|
wengyuwen