Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-VUEUI

dytyqx

2 天以前 18a0aa073a27fcd7da2d65d8aa5c9850bf7524c7

Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-VUEUI

 src/views/logistics/transportGPS/Add_Edit_WL_YayBill.vue

@@ -249,15 +249,15 @@
                                <el-col :span="6">
                                    <el-form-item label="物流状态" prop="HCarryStatus">
                                        <el-select v-model="form.HCarryStatus" placeholder="请选择物流状态" disabled>
                                            <el-option label="申请中" value="1"></el-option>
                                            <el-option label="已审核" value="2"></el-option>
                                            <el-option label="承运商确认" value="3"></el-option>
                                            <el-option label="待提货" value="4"></el-option>
                                            <el-option label="已到厂" value="5"></el-option>
                                            <el-option label="已提货" value="6"></el-option>
                                            <el-option label="运输中" value="7"></el-option>
                                            <el-option label="已签收" value="8"></el-option>
                                            <el-option label="已核算" value="9"></el-option>
                                            <el-option label="申请中" value="申请中"></el-option>
                                            <el-option label="待供应商确认" value="待供应商确认"></el-option>
                                            <el-option label="指定驾驶员、车辆中" value="指定驾驶员、车辆中"></el-option>
                                            <el-option label="正在前往始发地" value="正在前往始发地"></el-option>
                                            <el-option label="提货中" value="提货中"></el-option>
                                            <el-option label="准备离厂" value="准备离厂"></el-option>
                                            <el-option label="送货中" value="送货中"></el-option>
                                            <el-option label="已签收" value="已签收"></el-option>
                                            <el-option label="已核算" value="已核算"></el-option>
                                        </el-select>
                                    </el-form-item>
                                </el-col>
@@ -850,7 +850,7 @@
                    this.form.HEndAddr = data.目的地
                    this.form.HEndAddrName = data.目的地名称
                    this.form.HPickAddr = data.提货地址
                    this.form.HArriverAddr = data.到货方式
                    this.form.HArriverAddr = data.到货地址
                    this.form.HTransType = data.运输方式
                    this.form.HCarTypeID = data.车型ID
                    this.form.HCarTypeName = data.车型名称

 src/views/logistics/transportGPS/WL_YayBill.vue

@@ -143,8 +143,24 @@
                </el-button>
            </el-col>
            <el-col :span="1.5">
                <el-button type="primary" icon="el-icon-edit-outline" size="mini" :disabled="single"
                    @click="set_CheckBill(0, form = rowForm)">审核</el-button>
            </el-col>
            <el-col :span="1.5">
                <el-button type="primary" icon="el-icon-edit-outline" size="mini" :disabled="single"
                    @click="set_CheckBill(1, form = rowForm)">反审核</el-button>
            </el-col>
            <el-col :span="1.5">
                <el-button type="primary" icon="el-icon-circle-check" size="mini" :disabled="single"
                    @click="handleVolume(rowForm)">维护零单占用体积</el-button>
            </el-col>
            <el-col :span="1.5">
                <el-button type="primary" icon="el-icon-circle-check" size="mini" :disabled="single"
                    @click="set_ConfirmBill">供应商确认</el-button>
            </el-col>
            <el-col :span="1.5">
                <el-button type="primary" icon="el-icon-edit-outline" size="mini" :disabled="single"
                    @click="openDataDialog(14, form = rowForm)">分配司机</el-button>
            </el-col>
            <el-col :span="1.5">
                <el-button type="primary" icon="el-icon-circle-check" size="mini" :disabled="single"
@@ -162,29 +178,9 @@
                <el-button type="primary" icon="el-icon-circle-check" size="mini" :disabled="single"
                    @click="set_ConfirmOtherBill(4)">到货签收确认</el-button>
            </el-col>
            <!-- <el-col :span="1.5">
                <el-button type="primary" icon="el-icon-circle-check" size="mini" :disabled="single"
                    @click="set_CheckBill(0, form = rowForm)">分配司机</el-button>
            </el-col> -->
            <el-col :span="1.5">
                <el-button type="primary" icon="el-icon-circle-check" size="mini" :disabled="single"
                    @click="handleVolume(rowForm)">维护零单占用体积</el-button>
            </el-col>
            <el-col :span="1.5">
                <el-button type="primary" icon="el-icon-edit-outline" size="mini"
                    @click="handlePush(row = rowForm, OperationType = 4)">下推（费用结算单）</el-button>
            </el-col>
            <el-col :span="1.5">
                <el-button type="primary" icon="el-icon-edit-outline" size="mini" :disabled="single"
                    @click="openDataDialog(14, form = rowForm)">分配司机</el-button>
            </el-col>
            <el-col :span="1.5">
                <el-button type="primary" icon="el-icon-edit-outline" size="mini" :disabled="single"
                    @click="set_CheckBill(0, form = rowForm)">审核</el-button>
            </el-col>
            <el-col :span="1.5">
                <el-button type="primary" icon="el-icon-edit-outline" size="mini" :disabled="single"
                    @click="set_CheckBill(1, form = rowForm)">反审核</el-button>
            </el-col>
            <el-col :span="1.5">
                <el-button type="primary" icon="el-icon-edit-outline" size="mini" :disabled="single"
@@ -208,17 +204,6 @@
            <el-col :span="1.5">
                <el-button type="primary" icon="el-icon-date" size="mini" @click="handleRowHide">隐藏列设置</el-button>
            </el-col>
            <!-- <el-col :span="1.5">
                <el-button type="primary" icon="el-icon-printer" size="mini" @click="get_PrintReport">打印</el-button>
            </el-col> 
            <el-col :span="1.5">
                <el-button type="primary" icon="el-icon-printer" size="mini" :disabled="single"
                    @click="get_BarCodeDetail">条码明细</el-button>
            </el-col>
            <el-col :span="1.5">
                <el-button type="primary" icon="el-icon-printer" size="mini" :disabled="single"
                    @click="get_PackStockDetail">包装容器出入库明细</el-button>
            </el-col>-->
        </el-row>
        <div class="tableBox" v-loading="loading">
            <el-table :data="tableData" ref="tableData" max-height="710" :summary-method="getSummaries"
@@ -734,8 +719,8 @@
        //#region 删除
        handleDelete() {
            this.$modal.confirm('确认要删除吗，删除后不能恢复').then(() => {
                axios.get(this.$baseUrl + "/Cg_ContractTransportBillListController/DeleteBill", {
                    params: { 'HInterID': this.rowForm.HInterID.toString(), 'user': sessionStorage["HUserName"] }
                axios.get(this.$baseUrl + "/WLYayBillController/deleteBill", {
                    params: { 'HItemID': this.rowForm.HInterID.toString(), 'user': sessionStorage["HUserName"] }
                }).then(response => {
                    if (response.data.count == 1) {
                        this.handleQuery()