|
|
@@ -7,173 +7,175 @@
|
|
|
v-show="showSearch"
|
|
|
label-width="88px"
|
|
|
>
|
|
|
- <el-form-item label="业务编号" prop="fBillno">
|
|
|
- <el-input
|
|
|
- v-model="queryParams.fBillno"
|
|
|
- placeholder="请输入业务编号"
|
|
|
- style="width: 80%"
|
|
|
- clearable
|
|
|
- size="small"
|
|
|
- @keyup.enter.native="handleQuery"
|
|
|
- />
|
|
|
- </el-form-item>
|
|
|
- <el-form-item label="制单人" prop="createBy">
|
|
|
- <el-select
|
|
|
- v-model="queryParams.createBy"
|
|
|
- filterable
|
|
|
- remote
|
|
|
- clearable
|
|
|
- style="width: 80%"
|
|
|
- :remote-method="userRemoteMethod"
|
|
|
- placeholder="请选择制单人"
|
|
|
- >
|
|
|
- <el-option
|
|
|
- v-for="(dict, index) in userOptions"
|
|
|
- :key="index.userName"
|
|
|
- :label="dict.nickName"
|
|
|
- :value="dict.userName"
|
|
|
- ></el-option>
|
|
|
- </el-select>
|
|
|
- </el-form-item>
|
|
|
- <el-form-item label="入库日期" prop="timeInterval">
|
|
|
- <el-date-picker
|
|
|
- v-model="queryParams.timeInterval"
|
|
|
- type="daterange"
|
|
|
- value-format="yyyy-MM-dd"
|
|
|
- clearable
|
|
|
- style="width: 60%"
|
|
|
- range-separator="至"
|
|
|
- start-placeholder="开始日期"
|
|
|
- end-placeholder="结束日期"
|
|
|
- @keyup.enter.native="handleQuery"
|
|
|
- >
|
|
|
- </el-date-picker>
|
|
|
- </el-form-item>
|
|
|
-
|
|
|
- <el-form-item label="贸易方式" prop="fTrademodeid">
|
|
|
- <el-select
|
|
|
- v-model="queryParams.fTrademodeid"
|
|
|
- placeholder="请选择贸易方式"
|
|
|
- clearable
|
|
|
- style="width: 80%"
|
|
|
- @keyup.enter.native="handleQuery"
|
|
|
- >
|
|
|
- <el-option
|
|
|
- v-for="(dict, index) in fTrademodeidOptions"
|
|
|
- :key="index.dictValue"
|
|
|
- :label="dict.dictLabel"
|
|
|
- :value="dict.dictValue"
|
|
|
+ <el-row>
|
|
|
+ <el-form-item label="业务编号" prop="fBillno">
|
|
|
+ <el-input
|
|
|
+ v-model="queryParams.fBillno"
|
|
|
+ placeholder="请输入业务编号"
|
|
|
+ style="width: 80%"
|
|
|
+ clearable
|
|
|
+ size="small"
|
|
|
+ @keyup.enter.native="handleQuery"
|
|
|
/>
|
|
|
- </el-select>
|
|
|
- </el-form-item>
|
|
|
- <el-form-item label="货权方" prop="fCorpid">
|
|
|
- <el-select
|
|
|
- v-model="queryParams.fCorpid"
|
|
|
- filterable
|
|
|
- remote
|
|
|
- clearable
|
|
|
- style="width: 80%"
|
|
|
- @keyup.enter.native="handleQuery"
|
|
|
- :remote-method="corpsRemoteMethod"
|
|
|
- placeholder="请输入模糊查找"
|
|
|
- >
|
|
|
- <el-option
|
|
|
- v-for="(dict, index) in fMblnoOptions"
|
|
|
- :key="index.fId"
|
|
|
- :label="dict.fName"
|
|
|
- :value="dict.fId"
|
|
|
- ></el-option>
|
|
|
- </el-select>
|
|
|
- </el-form-item>
|
|
|
- <el-form-item label="提单号" prop="fMblno">
|
|
|
- <el-input
|
|
|
- v-model="queryParams.fMblno"
|
|
|
- placeholder="请输入提单号"
|
|
|
- clearable
|
|
|
- style="width: 80%"
|
|
|
- size="small"
|
|
|
- @keyup.enter.native="handleQuery"
|
|
|
- />
|
|
|
- </el-form-item>
|
|
|
- <el-form-item label="经营单位" prop="fSbu">
|
|
|
- <el-select
|
|
|
- v-model="queryParams.fSbu"
|
|
|
- filterable
|
|
|
- remote
|
|
|
- clearable
|
|
|
- :remote-method="fSbuRemoteMethod"
|
|
|
- @keyup.enter.native="handleQuery"
|
|
|
- style="width: 80%"
|
|
|
- placeholder="请选择经营单位"
|
|
|
- >
|
|
|
- <el-option
|
|
|
- v-for="(dict, index) in fMblnoOptions"
|
|
|
- :key="index.fId"
|
|
|
- :label="dict.fName"
|
|
|
- :value="dict.fId"
|
|
|
- ></el-option>
|
|
|
- </el-select>
|
|
|
- </el-form-item>
|
|
|
- <el-form-item label="货物名称" prop="fGoodsid">
|
|
|
- <el-select
|
|
|
- v-model="queryParams.fGoodsid"
|
|
|
- filterable
|
|
|
- remote
|
|
|
- clearable
|
|
|
- style="width: 80%"
|
|
|
- :remote-method="goodsRemoteMethod"
|
|
|
- @keyup.enter.native="handleQuery"
|
|
|
- placeholder="请选择货物名称"
|
|
|
- >
|
|
|
- <el-option
|
|
|
- v-for="(dict, index) in goodsOptions"
|
|
|
- :key="index.fId"
|
|
|
- :label="dict.fName"
|
|
|
- :value="dict.fId"
|
|
|
- ></el-option>
|
|
|
- </el-select>
|
|
|
- </el-form-item>
|
|
|
- <el-form-item label="仓库" prop="fWarehouseid">
|
|
|
- <el-select
|
|
|
- v-model="queryParams.fWarehouseid"
|
|
|
- filterable
|
|
|
- remote
|
|
|
- clearable
|
|
|
- style="width: 80%"
|
|
|
- :remote-method="warehouseRemoteMethod"
|
|
|
- @keyup.enter.native="handleQuery"
|
|
|
- placeholder="请输入"
|
|
|
- >
|
|
|
- <el-option
|
|
|
- v-for="(dict, index) in warehouseOptions"
|
|
|
- :key="index.fId"
|
|
|
- :label="dict.fName"
|
|
|
- :value="dict.fId"
|
|
|
- ></el-option>
|
|
|
- </el-select>
|
|
|
- </el-form-item>
|
|
|
- <el-form-item label="品牌" prop="fMarks">
|
|
|
- <el-input
|
|
|
- v-model="queryParams.fMarks"
|
|
|
- placeholder="请输入品牌"
|
|
|
- clearable
|
|
|
- style="width: 80%"
|
|
|
- size="small"
|
|
|
- @keyup.enter.native="handleQuery"
|
|
|
- />
|
|
|
- </el-form-item>
|
|
|
- <el-form-item>
|
|
|
- <el-button
|
|
|
- type="cyan"
|
|
|
- icon="el-icon-search"
|
|
|
- size="mini"
|
|
|
- @click="handleQuery"
|
|
|
- >搜索
|
|
|
- </el-button>
|
|
|
- <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
|
|
|
- >重置
|
|
|
- </el-button>
|
|
|
- </el-form-item>
|
|
|
+ </el-form-item>
|
|
|
+ <el-form-item label="制单人" prop="createBy">
|
|
|
+ <el-select
|
|
|
+ v-model="queryParams.createBy"
|
|
|
+ filterable
|
|
|
+ remote
|
|
|
+ clearable
|
|
|
+ style="width: 80%"
|
|
|
+ :remote-method="userRemoteMethod"
|
|
|
+ placeholder="请选择制单人"
|
|
|
+ >
|
|
|
+ <el-option
|
|
|
+ v-for="(dict, index) in userOptions"
|
|
|
+ :key="index.userName"
|
|
|
+ :label="dict.nickName"
|
|
|
+ :value="dict.userName"
|
|
|
+ ></el-option>
|
|
|
+ </el-select>
|
|
|
+ </el-form-item>
|
|
|
+ <el-form-item label="入库日期" prop="timeInterval">
|
|
|
+ <el-date-picker
|
|
|
+ v-model="queryParams.timeInterval"
|
|
|
+ type="daterange"
|
|
|
+ value-format="yyyy-MM-dd"
|
|
|
+ clearable
|
|
|
+ style="width: 60%"
|
|
|
+ range-separator="至"
|
|
|
+ start-placeholder="开始日期"
|
|
|
+ end-placeholder="结束日期"
|
|
|
+ @keyup.enter.native="handleQuery"
|
|
|
+ >
|
|
|
+ </el-date-picker>
|
|
|
+ </el-form-item>
|
|
|
+ <el-form-item label="贸易方式" prop="fTrademodeid">
|
|
|
+ <el-select
|
|
|
+ v-model="queryParams.fTrademodeid"
|
|
|
+ placeholder="请选择贸易方式"
|
|
|
+ clearable
|
|
|
+ style="width: 80%"
|
|
|
+ @keyup.enter.native="handleQuery"
|
|
|
+ >
|
|
|
+ <el-option
|
|
|
+ v-for="(dict, index) in fTrademodeidOptions"
|
|
|
+ :key="index.dictValue"
|
|
|
+ :label="dict.dictLabel"
|
|
|
+ :value="dict.dictValue"
|
|
|
+ />
|
|
|
+ </el-select>
|
|
|
+ </el-form-item>
|
|
|
+ <el-form-item label="货权方" prop="fCorpid">
|
|
|
+ <el-select
|
|
|
+ v-model="queryParams.fCorpid"
|
|
|
+ filterable
|
|
|
+ remote
|
|
|
+ clearable
|
|
|
+ style="width: 80%"
|
|
|
+ @keyup.enter.native="handleQuery"
|
|
|
+ :remote-method="corpsRemoteMethod"
|
|
|
+ placeholder="请输入模糊查找"
|
|
|
+ >
|
|
|
+ <el-option
|
|
|
+ v-for="(dict, index) in fMblnoOptions"
|
|
|
+ :key="index.fId"
|
|
|
+ :label="dict.fName"
|
|
|
+ :value="dict.fId"
|
|
|
+ ></el-option>
|
|
|
+ </el-select>
|
|
|
+ </el-form-item>
|
|
|
+ <el-form-item label="提单号" prop="fMblno">
|
|
|
+ <el-input
|
|
|
+ v-model="queryParams.fMblno"
|
|
|
+ placeholder="请输入提单号"
|
|
|
+ clearable
|
|
|
+ style="width: 80%"
|
|
|
+ size="small"
|
|
|
+ @keyup.enter.native="handleQuery"
|
|
|
+ />
|
|
|
+ </el-form-item>
|
|
|
+ <el-form-item label="经营单位" prop="fSbu">
|
|
|
+ <el-select
|
|
|
+ v-model="queryParams.fSbu"
|
|
|
+ filterable
|
|
|
+ remote
|
|
|
+ clearable
|
|
|
+ :remote-method="fSbuRemoteMethod"
|
|
|
+ @keyup.enter.native="handleQuery"
|
|
|
+ style="width: 80%"
|
|
|
+ placeholder="请选择经营单位"
|
|
|
+ >
|
|
|
+ <el-option
|
|
|
+ v-for="(dict, index) in fMblnoOptions"
|
|
|
+ :key="index.fId"
|
|
|
+ :label="dict.fName"
|
|
|
+ :value="dict.fId"
|
|
|
+ ></el-option>
|
|
|
+ </el-select>
|
|
|
+ </el-form-item>
|
|
|
+ <el-form-item label="货物名称" prop="fGoodsid">
|
|
|
+ <el-select
|
|
|
+ v-model="queryParams.fGoodsid"
|
|
|
+ filterable
|
|
|
+ remote
|
|
|
+ clearable
|
|
|
+ style="width: 80%"
|
|
|
+ :remote-method="goodsRemoteMethod"
|
|
|
+ @keyup.enter.native="handleQuery"
|
|
|
+ placeholder="请选择货物名称"
|
|
|
+ >
|
|
|
+ <el-option
|
|
|
+ v-for="(dict, index) in goodsOptions"
|
|
|
+ :key="index.fId"
|
|
|
+ :label="dict.fName"
|
|
|
+ :value="dict.fId"
|
|
|
+ ></el-option>
|
|
|
+ </el-select>
|
|
|
+ </el-form-item>
|
|
|
+ <el-form-item label="仓库" prop="fWarehouseid">
|
|
|
+ <el-select
|
|
|
+ v-model="queryParams.fWarehouseid"
|
|
|
+ filterable
|
|
|
+ remote
|
|
|
+ @select="treeseLect"
|
|
|
+ :disabled="browseStatus || formBrowseStatus"
|
|
|
+ style="width: 80%"
|
|
|
+ @keyup.enter.native="handleQuery"
|
|
|
+ placeholder="请选择"
|
|
|
+ >
|
|
|
+ <el-option
|
|
|
+ v-for="(dict, index) in warehouseOptions"
|
|
|
+ :key="index.fId"
|
|
|
+ :label="dict.fName"
|
|
|
+ :value="dict.fId"
|
|
|
+ ></el-option>
|
|
|
+ </el-select>
|
|
|
+ </el-form-item>
|
|
|
+ <el-form-item label="品牌" prop="fMarks">
|
|
|
+ <el-input
|
|
|
+ v-model="queryParams.fMarks"
|
|
|
+ placeholder="请输入品牌"
|
|
|
+ clearable
|
|
|
+ style="width: 80%"
|
|
|
+ size="small"
|
|
|
+ @keyup.enter.native="handleQuery"
|
|
|
+ />
|
|
|
+ </el-form-item>
|
|
|
+ <el-form-item>
|
|
|
+ <el-button
|
|
|
+ type="cyan"
|
|
|
+ icon="el-icon-search"
|
|
|
+ size="mini"
|
|
|
+ @click="handleQuery"
|
|
|
+ >搜索
|
|
|
+ </el-button>
|
|
|
+ <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
|
|
|
+ >重置
|
|
|
+ </el-button>
|
|
|
+ </el-form-item>
|
|
|
+
|
|
|
+ </el-row>
|
|
|
</el-form>
|
|
|
|
|
|
<el-row :gutter="10" class="mb8">
|
|
|
@@ -378,7 +380,7 @@
|
|
|
<el-form ref="form" :model="form" :rules="rules" label-width="120px">
|
|
|
<el-row>
|
|
|
<el-col :span="8">
|
|
|
- <el-form-item label="货1权方" prop="fCorpid">
|
|
|
+ <el-form-item label="货权方" prop="fCorpid">
|
|
|
<el-select
|
|
|
v-model="form.fCorpid"
|
|
|
filterable
|
|
|
@@ -1691,19 +1693,21 @@
|
|
|
width="180px"
|
|
|
label="作业类型"
|
|
|
>
|
|
|
- <el-select
|
|
|
- style="width: 80%"
|
|
|
- v-model="warehouseDrList.fBusinessType"
|
|
|
- filterable
|
|
|
- disabled
|
|
|
- >
|
|
|
- <el-option
|
|
|
- v-for="(dict) in businessTypeOption"
|
|
|
- :key="dict.dictValue"
|
|
|
- :label="dict.dictLabel"
|
|
|
- :value="dict.dictValue"
|
|
|
- ></el-option>
|
|
|
- </el-select>
|
|
|
+ <template slot-scope="scope">
|
|
|
+ <el-select
|
|
|
+ style="width: 80%"
|
|
|
+ v-model="scope.row.fBusinessType"
|
|
|
+ filterable
|
|
|
+ disabled
|
|
|
+ >
|
|
|
+ <el-option
|
|
|
+ v-for="(dict) in businessTypeOption"
|
|
|
+ :key="dict.dictValue"
|
|
|
+ :label="dict.dictLabel"
|
|
|
+ :value="dict.dictValue"
|
|
|
+ ></el-option>
|
|
|
+ </el-select>
|
|
|
+ </template>
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
prop="fFeeUnitid"
|
|
|
@@ -1958,7 +1962,7 @@
|
|
|
</el-button>
|
|
|
<el-button type="primary" size="small" @click="submitForm(2)" :disabled="browseStatus">保 存</el-button>
|
|
|
<el-button type="danger" size="small" @click.prevent="handleSelect(1)" :disabled="browseStatus"
|
|
|
- >作业费1协议</el-button>
|
|
|
+ >作业费协议</el-button>
|
|
|
</div>
|
|
|
</div>
|
|
|
<el-table
|
|
|
@@ -2032,19 +2036,21 @@
|
|
|
width="180px"
|
|
|
label="作业类型"
|
|
|
>
|
|
|
- <el-select
|
|
|
- style="width: 80%"
|
|
|
- v-model="warehouseDrList.fBusinessType"
|
|
|
- filterable
|
|
|
- disabled
|
|
|
- >
|
|
|
- <el-option
|
|
|
- v-for="(dict) in businessTypeOption"
|
|
|
- :key="dict.dictValue"
|
|
|
- :label="dict.dictLabel"
|
|
|
- :value="dict.dictValue"
|
|
|
- ></el-option>
|
|
|
- </el-select>
|
|
|
+ <template slot-scope="scope">
|
|
|
+ <el-select
|
|
|
+ style="width: 80%"
|
|
|
+ v-model="scope.row.fBusinessType"
|
|
|
+ filterable
|
|
|
+ disabled
|
|
|
+ >
|
|
|
+ <el-option
|
|
|
+ v-for="(dict) in businessTypeOption"
|
|
|
+ :key="dict.dictValue"
|
|
|
+ :label="dict.dictLabel"
|
|
|
+ :value="dict.dictValue"
|
|
|
+ ></el-option>
|
|
|
+ </el-select>
|
|
|
+ </template>
|
|
|
</el-table-column>
|
|
|
|
|
|
<el-table-column
|
|
|
@@ -2484,7 +2490,7 @@
|
|
|
</el-dialog>
|
|
|
<!-- 选择作业费协议数据 -->
|
|
|
<el-dialog
|
|
|
- title="作业费协1议"
|
|
|
+ title="作业费协议"
|
|
|
:close-on-click-modal="false"
|
|
|
:modal="false"
|
|
|
style="box-shadow: 0 1px 3px rgba(0, 0, 0, 0) !important"
|
|
|
@@ -2492,8 +2498,8 @@
|
|
|
width="70%"
|
|
|
>
|
|
|
<el-menu :default-active="activeIndex" v-if="Navigation === true" class="el-menu-demo" mode="horizontal" @select="handleSelect">
|
|
|
- <el-menu-item index="1">劳务作业费</el-menu-item>
|
|
|
- <el-menu-item index="2">车队作业费</el-menu-item>
|
|
|
+ <el-menu-item index="1">车队作业费</el-menu-item>
|
|
|
+ <el-menu-item index="2">劳务作业费</el-menu-item>
|
|
|
</el-menu>
|
|
|
|
|
|
<el-table
|
|
|
@@ -2562,7 +2568,7 @@
|
|
|
@pagination="getWhgenlegList"
|
|
|
/>
|
|
|
<div slot="footer" class="dialog-footer">
|
|
|
- <el-button type="primary" @click="zhgenlegData">导入</el-button>
|
|
|
+ <el-button type="primary" @click="zhgenlegData">导 入</el-button>
|
|
|
<el-button @click="warehousingagreements = false ; Navigation = false">取 消</el-button>
|
|
|
</div>
|
|
|
</el-dialog>
|
|
|
@@ -2834,15 +2840,32 @@
|
|
|
入库日期：{{ fBsdates }}
|
|
|
</td>
|
|
|
</tr>
|
|
|
- <tr v-for="(item, index) in Printinglist" :key="index">
|
|
|
+
|
|
|
+<!-- <tr v-for="(item, index) in Printinglist" :key="index">-->
|
|
|
+<!-- <td width="200">车号</td>-->
|
|
|
+<!-- <td width="200">{{ item.fTruckno }}</td>-->
|
|
|
+<!-- <td width="200">货物品名</td>-->
|
|
|
+<!-- <td width="200" class="zzss">-->
|
|
|
+<!-- {{ item.fGoodsids }}-->
|
|
|
+<!-- </td>-->
|
|
|
+<!-- <td width="200">{{item.fBusinessTypes}}</td>-->
|
|
|
+<!-- <td width="200">{{item.fMarks}}</td>-->
|
|
|
+<!-- </tr>-->
|
|
|
+ <tr>
|
|
|
<td width="200">车号</td>
|
|
|
- <td width="200">{{ item.fTruckno }}</td>
|
|
|
<td width="200">货物品名</td>
|
|
|
- <td width="200" class="zzss">
|
|
|
- {{ item.fGoodsids }}
|
|
|
- </td>
|
|
|
- <td width="200">{{item.fBusinessTypes}}</td>
|
|
|
- <td width="200">{{item.fMarks}}</td>
|
|
|
+ <td width="200">提单号</td>
|
|
|
+ <td width="200">品牌/规格/产地</td>
|
|
|
+ <td width="200">净重(吨)</td>
|
|
|
+ <td width="200">件数(50KG)</td>
|
|
|
+ </tr>
|
|
|
+ <tr v-for="(item, index) in Printinglist" :key="index">
|
|
|
+ <td width="200">{{ item.fTruckno }}</td>
|
|
|
+ <td width="200">{{ item.fGoodsids }}</td>
|
|
|
+ <td width="200">{{ item.fMblno }}</td>
|
|
|
+ <td width="200">{{item.fBusinessTypes}}/{{item.fMarks}}</td>
|
|
|
+ <td width="200">{{item.fNetweight}}</td>
|
|
|
+ <td width="200">{{ item.fQty }}</td>
|
|
|
</tr>
|
|
|
<tr>
|
|
|
<td width="1400" colspan="6"> </td>
|
|
|
@@ -2970,6 +2993,8 @@ export default {
|
|
|
},
|
|
|
// 部门树选项
|
|
|
fWarehouseidOptions:[],
|
|
|
+ fWarehouseIdOptions:[],
|
|
|
+ fWarehouseidOption:[],
|
|
|
activeNames:['1'],
|
|
|
isrequired:2,
|
|
|
isrequired_s:2,
|
|
|
@@ -2978,6 +3003,7 @@ export default {
|
|
|
doNot:false,
|
|
|
// 修改查看状态
|
|
|
browseStatus: false,
|
|
|
+ key_id:'',
|
|
|
contrOl:false,
|
|
|
// 审批状态控制
|
|
|
approvalStatus: false,
|
|
|
@@ -2987,6 +3013,7 @@ export default {
|
|
|
formBrowseStatus: false,
|
|
|
fTruckno: "",
|
|
|
fBsdates: "",
|
|
|
+ fMblno:"",
|
|
|
fCntrtype: "",
|
|
|
fGoodsids: "",
|
|
|
fPlaNnumber: "",
|
|
|
@@ -3154,6 +3181,7 @@ export default {
|
|
|
choiceWarehouse:false,
|
|
|
// 查询参数
|
|
|
queryParams: {
|
|
|
+ fWarehouselocid:null,
|
|
|
pageNum: 1,
|
|
|
pageSize: 10,
|
|
|
fBillno: null,
|
|
|
@@ -3309,6 +3337,11 @@ export default {
|
|
|
this.getDicts("data_customer_category").then(response => {
|
|
|
this.fleetOptions = response.data;
|
|
|
});
|
|
|
+ treeselect().then(response => {
|
|
|
+ console.log(response)
|
|
|
+ this.warehouseOptions = response.data
|
|
|
+ })
|
|
|
+ this.warehousesssMethod()
|
|
|
},
|
|
|
activated() {
|
|
|
this.adoPt()
|
|
|
@@ -3321,12 +3354,18 @@ export default {
|
|
|
this.addAgreements(key)
|
|
|
},
|
|
|
/** 查询部门下拉树结构 */
|
|
|
+ treeseLect(tree){
|
|
|
+ console.log(tree)
|
|
|
+ this.queryParams.fWarehouselocid = tree.id
|
|
|
+ },
|
|
|
getTreeselect(row) {
|
|
|
this.treeselectList.fWarehouselocid = null
|
|
|
this.inDex = row.$index
|
|
|
this.choiceWarehouse = true
|
|
|
treeselect(this.form.fWarehouseid).then(response => {
|
|
|
+ console.log(response)
|
|
|
this.fWarehouseidOptions = response.data;
|
|
|
+ this.fWarehouseidOption = response.data;
|
|
|
})
|
|
|
this.Warehouse = this.dataList[this.inDex].fWarehouseInformation
|
|
|
},
|
|
|
@@ -3651,13 +3690,16 @@ export default {
|
|
|
}
|
|
|
},
|
|
|
showEditDialog_ss() {
|
|
|
+ console.log("000")
|
|
|
if (this.Printinglist.length > 0) {
|
|
|
+ console.log("111")
|
|
|
for (let li in this.Printinglist) {
|
|
|
if (this.dataListSelection.length > 0) {
|
|
|
this.fTruckno = this.dataListSelection[0].fTruckno;
|
|
|
this.fCntrtype = this.dataListSelection[0].fCntrtype;
|
|
|
this.fGoodsids = this.dataListSelection[0].fGoodsids;
|
|
|
this.fPackagespecs = this.dataListSelection[0].fPackagespecs;
|
|
|
+ console.log(this.Printinglist)
|
|
|
var date = new Date(this.dataListSelection[0].fBsdate);
|
|
|
var Y = date.getFullYear() + "-";
|
|
|
var M =
|
|
|
@@ -3766,11 +3808,16 @@ export default {
|
|
|
}
|
|
|
}
|
|
|
if (this.dataListSelection.length > 0) {
|
|
|
+ console.log(this.dataListSelection)
|
|
|
this.fTruckno = this.dataListSelection[0].fTruckno
|
|
|
this.fCntrtype = this.dataListSelection[0].fCntrtype
|
|
|
this.fGoodsids = this.dataListSelection[0].fGoodsids
|
|
|
this.fDriverTel = this.dataListSelection[0].fDriverTel
|
|
|
this.fPackagespecs = this.dataListSelection[0].fPackagespecs
|
|
|
+ this.fMblno = this.dataListSelection[0].fMblno
|
|
|
+ this.fQty = this.dataListSelection[0].fQty
|
|
|
+ // this.fQtys = this.dataListSelection[0].fQty
|
|
|
+ console.log(this.fQtys)
|
|
|
var date = new Date(this.dataListSelection[0].fBsdate)
|
|
|
var Y = date.getFullYear() + '-'
|
|
|
var M = (date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1) + '-'
|
|
|
@@ -3861,29 +3908,34 @@ export default {
|
|
|
},
|
|
|
// 查询作业费信息
|
|
|
getWhgenlegList(kye) {
|
|
|
- // this.queryParams.fCorpid = this.form.fCorpid;
|
|
|
- // this.queryParams.fLineno = this.form.fCorpid;
|
|
|
let data = {}
|
|
|
- if (kye === 1){
|
|
|
+ let fTaskType = kye
|
|
|
+ if (kye == 2){
|
|
|
+ this.key_id = kye
|
|
|
this.Navigation = true
|
|
|
data = {
|
|
|
pageNum:1,
|
|
|
pageSize:10,
|
|
|
+ fTaskType:Number(fTaskType),
|
|
|
fLabour:this.form.fLabour
|
|
|
}
|
|
|
- }else if (kye === 2) {
|
|
|
+ }else if (kye == 1) {
|
|
|
+ this.key_id = kye
|
|
|
this.Navigation = true
|
|
|
data = {
|
|
|
pageNum:1,
|
|
|
pageSize:10,
|
|
|
- fCorpid:this.form.fCorpid
|
|
|
+ fTaskType:Number(fTaskType),
|
|
|
+ fFleet:this.form.fFleet
|
|
|
+
|
|
|
}
|
|
|
}else {
|
|
|
this.Navigation = false
|
|
|
+ this.key_id = kye
|
|
|
data = {
|
|
|
pageNum:1,
|
|
|
pageSize:10,
|
|
|
- fFleet:this.form.fFleet
|
|
|
+ fCorpid:this.form.fCorpid
|
|
|
}
|
|
|
}
|
|
|
operationAgreement(data).then( response => {
|
|
|
@@ -4018,6 +4070,7 @@ export default {
|
|
|
for (let zhgen in this.dialogWhgenlegList) {
|
|
|
let feeId = this.dialogWhgenlegList[zhgen].feeFId;
|
|
|
getFees(feeId).then((response) => {
|
|
|
+ console.log(response)
|
|
|
this.fWbuOptions.push(response.data);
|
|
|
});
|
|
|
let qty = 1;
|
|
|
@@ -4033,21 +4086,43 @@ export default {
|
|
|
// qty=(qty/1000).toFixed(2);
|
|
|
let fAmount = parseFloat(Number(this.dialogWhgenlegList[zhgen].fPrice) * Number(qty)).toFixed(2)
|
|
|
|
|
|
- this.warehouseCrList.push({
|
|
|
- fQty: qty,
|
|
|
- fCorpid: this.dialogWhgenlegList[zhgen].fCorpid,
|
|
|
- fFeeid: feeId,
|
|
|
- fFeeunitid: this.dialogWhgenlegList[zhgen].fFeeUnitid + '',
|
|
|
- fUnitprice: this.dialogWhgenlegList[zhgen].fPrice,
|
|
|
- fCurrency: 'RMB',
|
|
|
- fExrate: 1,
|
|
|
- fAmount: fAmount,
|
|
|
- fTaxrate: this.fTaxrate,
|
|
|
- fMblno:this.form.fMblno,
|
|
|
- fProductName:this.form.fProductName,
|
|
|
- fMarks:this.form.fMarks,
|
|
|
- fBusinessType:this.$set(this.warehouseCrList,'fBusinessType',this.form.fBusinessType)
|
|
|
- })
|
|
|
+
|
|
|
+ if(this.key_id == 3){
|
|
|
+ console.log("111")
|
|
|
+ this.warehouseDrList.push({
|
|
|
+ fQty: qty,
|
|
|
+ fCorpid: this.dialogWhgenlegList[zhgen].fCorpid,
|
|
|
+ fFeeid: feeId,
|
|
|
+ fFeeunitid: this.dialogWhgenlegList[zhgen].fFeeUnitid + '',
|
|
|
+ fUnitprice: this.dialogWhgenlegList[zhgen].fPrice,
|
|
|
+ fCurrency: 'RMB',
|
|
|
+ fExrate: 1,
|
|
|
+ fAmount: fAmount,
|
|
|
+ fTaxrate: this.fTaxrate,
|
|
|
+ fMblno:this.form.fMblno,
|
|
|
+ fProductName:this.form.fProductName,
|
|
|
+ fMarks:this.form.fMarks,
|
|
|
+ fBusinessType:this.$set(this.warehouseDrList,'fBusinessType',this.form.fBusinessType)
|
|
|
+ })
|
|
|
+ }else{
|
|
|
+ this.warehouseCrList.push({
|
|
|
+ fQty: qty,
|
|
|
+ fCorpid: this.dialogWhgenlegList[zhgen].fCorpid,
|
|
|
+ fFeeid: feeId,
|
|
|
+ fFeeunitid: this.dialogWhgenlegList[zhgen].fFeeUnitid + '',
|
|
|
+ fUnitprice: this.dialogWhgenlegList[zhgen].fPrice,
|
|
|
+ fCurrency: 'RMB',
|
|
|
+ fExrate: 1,
|
|
|
+ fAmount: fAmount,
|
|
|
+ fTaxrate: this.fTaxrate,
|
|
|
+ fMblno:this.form.fMblno,
|
|
|
+ fProductName:this.form.fProductName,
|
|
|
+ fMarks:this.form.fMarks,
|
|
|
+ fBusinessType:this.$set(this.warehouseCrList,'fBusinessType',this.form.fBusinessType)
|
|
|
+ })
|
|
|
+
|
|
|
+ }
|
|
|
+
|
|
|
}
|
|
|
this.warehousingagreements = false;
|
|
|
}
|
|
|
@@ -4265,7 +4340,6 @@ export default {
|
|
|
this.detailsHidden = false;
|
|
|
this.formBrowseStatus = false;
|
|
|
const fId = row.fId || this.ids;
|
|
|
- this.dataList = [];
|
|
|
console.log(fId)
|
|
|
this.goodsRemoteMethod()
|
|
|
getWarehousebills(fId).then((response) => {
|
|
|
@@ -4294,9 +4368,13 @@ export default {
|
|
|
if (this.dataList[list].fBillstatus > 10) {
|
|
|
this.formBrowseStatus = true;
|
|
|
this.$set(this.dataList[list], "fBusinessType", this.dataList[list].fBusinessType + '')
|
|
|
+ }else{
|
|
|
+ this.formBrowseStatus = false;
|
|
|
}
|
|
|
if(this.dataList[list].fBillstatus === 40){
|
|
|
this.contrOl = true
|
|
|
+ }else{
|
|
|
+ this.contrOl = false
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
@@ -4328,7 +4406,10 @@ export default {
|
|
|
}
|
|
|
this.kqhouseOptions = response.data.warehouseAreas;
|
|
|
this.warehouseDrList = response.data.warehousebillsfeesDr;
|
|
|
+ console.log(this.businessTypeOption)
|
|
|
+ console.log(this.warehouseDrList)
|
|
|
for (let dr in this.warehouseDrList) {
|
|
|
+ this.$forceUpdate()
|
|
|
this.$set(this.warehouseDrList[dr], "fFeeUnitid", this.warehouseDrList[dr].fFeeunitid + "");
|
|
|
this.$set(this.warehouseDrList[dr], "fQty", this.warehouseDrList[dr].fQty.toFixed(2));
|
|
|
this.$set(this.warehouseDrList[dr], "fAmount", this.warehouseDrList[dr].fAmount.toFixed(2));
|
|
|
@@ -4338,6 +4419,7 @@ export default {
|
|
|
this.$set(this.warehouseCrList[cr], "fFeeUnitid", this.warehouseCrList[cr].fFeeunitid + "");
|
|
|
}
|
|
|
this.userOptions = response.data.sysUser;
|
|
|
+ this.warehouseDrList[0].fBusinessType = this.form.fBusinessType
|
|
|
this.open = true;
|
|
|
this.title = "修改仓入库";
|
|
|
});
|
|
|
@@ -4648,6 +4730,7 @@ export default {
|
|
|
this.fid = response.data;
|
|
|
this.formBrowseStatus = false;
|
|
|
this.msgSuccess("撤销入账成功");
|
|
|
+ this.contrOl = false
|
|
|
for (let li in this.dataWithdrawList) {
|
|
|
for (let i in this.dataList) {
|
|
|
if (this.dataWithdrawList[li].fId === this.dataList[i].fId) {
|
阿伏兔