修改货代费用和轮胎退货

src/views/iosBasicData/AirtransportExport/bills/assembly/feecenter.vue

@@ -154,10 +154,16 @@
                         @blur="priceinputfun($event, row)"></el-input>
                     <span v-else>{{ row.price }}</span>
                 </template>
-                <template slot="quantity" slot-scope="{ row }">
+                <!-- <template slot="quantity" slot-scope="{ row }">
                     <el-input v-if="row.edit" type="number" v-model="row.quantity" size="small" :min="1"
                         placeholder="请输入" @blur="quantityinputfun(row)"></el-input>
                     <span v-else>{{ row.quantity }}</span>
+                </template> -->
+                <template slot="quantity" slot-scope="{ row }">
+                    <el-input-number v-if="row.edit" type="number" v-model="row.quantity" size="small" :min="1"
+                        :controls="false" :precision="3" placeholder="请输入"  style="width: 100%;"
+                        @blur="quantityinputfun(row)"></el-input-number>
+                    <span v-else>{{ row.quantity }}</span>
                 </template>
                 <template slot="remarks" slot-scope="{ row }">
                     <el-input v-if="row.edit" v-model="row.remarks" size="small" placeholder="请输入"></el-input>
@@ -297,10 +303,16 @@
                         @blur="priceinputfun($event, row)"></el-input>
                     <span v-else>{{ row.price }}</span>
                 </template>
-                <template slot="quantity" slot-scope="{ row }">
+                <!-- <template slot="quantity" slot-scope="{ row }">
                     <el-input v-if="row.edit" type="number" v-model="row.quantity" size="small" :min="1"
                         placeholder="请输入" @blur="quantityinputfun(row)"></el-input>
                     <span v-else>{{ row.quantity }}</span>
+                </template> -->
+                <template slot="quantity" slot-scope="{ row }">
+                    <el-input-number v-if="row.edit" type="number" v-model="row.quantity" size="small" :min="1"
+                        :controls="false" :precision="3" placeholder="请输入"  style="width: 100%;"
+                        @blur="quantityinputfun(row)"></el-input-number>
+                    <span v-else>{{ row.quantity }}</span>
                 </template>
                 <template slot="remarks" slot-scope="{ row }">
                     <el-input v-if="row.edit" v-model="row.remarks" size="small" placeholder="请输入"></el-input>

src/views/iosBasicData/AirtransportImport/bills/assembly/feecenter.vue

@@ -154,10 +154,16 @@
                         @blur="priceinputfun($event, row)"></el-input>
                     <span v-else>{{ row.price }}</span>
                 </template>
-                <template slot="quantity" slot-scope="{ row }">
+                <!-- <template slot="quantity" slot-scope="{ row }">
                     <el-input v-if="row.edit" type="number" v-model="row.quantity" size="small" :min="1"
                         placeholder="请输入" @blur="quantityinputfun(row)"></el-input>
                     <span v-else>{{ row.quantity }}</span>
+                </template> -->
+                <template slot="quantity" slot-scope="{ row }">
+                    <el-input-number v-if="row.edit" type="number" v-model="row.quantity" size="small" :min="1"
+                        :controls="false" :precision="3" placeholder="请输入" style="width: 100%;"
+                        @blur="quantityinputfun(row)"></el-input-number>
+                    <span v-else>{{ row.quantity }}</span>
                 </template>
                 <template slot="remarks" slot-scope="{ row }">
                     <el-input v-if="row.edit" v-model="row.remarks" size="small" placeholder="请输入"></el-input>
@@ -297,10 +303,16 @@
                         @blur="priceinputfun($event, row)"></el-input>
                     <span v-else>{{ row.price }}</span>
                 </template>
-                <template slot="quantity" slot-scope="{ row }">
+                <!-- <template slot="quantity" slot-scope="{ row }">
                     <el-input v-if="row.edit" type="number" v-model="row.quantity" size="small" :min="1"
                         placeholder="请输入" @blur="quantityinputfun(row)"></el-input>
                     <span v-else>{{ row.quantity }}</span>
+                </template> -->
+                <template slot="quantity" slot-scope="{ row }">
+                    <el-input-number v-if="row.edit" type="number" v-model="row.quantity" size="small" :min="1"
+                        :controls="false" :precision="3" placeholder="请输入" style="width: 100%;"
+                        @blur="quantityinputfun(row)"></el-input-number>
+                    <span v-else>{{ row.quantity }}</span>
                 </template>
                 <template slot="remarks" slot-scope="{ row }">
                     <el-input v-if="row.edit" v-model="row.remarks" size="small" placeholder="请输入"></el-input>

src/views/iosBasicData/OceanFreightImport/bills/assembly/feecenter.vue

@@ -153,7 +153,7 @@
                 </template>
                 <template slot="quantity" slot-scope="{ row }">
                     <el-input-number v-if="row.edit" v-model="row.quantity" size="small" :min="1" :controls="false"
-                        :precision="0" placeholder="请输入" @blur="quantityinputfun(row)"></el-input-number>
+                        :precision="3" placeholder="请输入" @blur="quantityinputfun(row)"></el-input-number>
                     <span v-else>{{ row.quantity }}</span>
                 </template>
                 <template slot="remarks" slot-scope="{ row }">
@@ -285,7 +285,7 @@
                 </template>
                 <template slot="quantity" slot-scope="{ row }">
                     <el-input-number v-if="row.edit" type="number" v-model="row.quantity" size="small" :min="1"
-                        :controls="false" :precision="0" placeholder="请输入"
+                        :controls="false" :precision="3" placeholder="请输入"
                         @blur="quantityinputfun(row)"></el-input-number>
                     <span v-else>{{ row.quantity }}</span>
                 </template>

src/views/iosBasicData/SeafreightExportF/bills/assembly/feecenter.vue

@@ -161,7 +161,7 @@
                 </template>
                 <template slot="quantity" slot-scope="{ row }">
                     <el-input-number v-if="row.edit" v-model="row.quantity" size="small" :min="1" :controls="false"
-                        :precision="2" placeholder="请输入" @blur="quantityinputfun(row)"></el-input-number>
+                        :precision="3" placeholder="请输入" @blur="quantityinputfun(row)"></el-input-number>
                     <span v-else>{{ row.quantity }}</span>
                 </template>
                 <template slot="remarks" slot-scope="{ row }">
@@ -295,7 +295,7 @@
                 </template>
                 <template slot="quantity" slot-scope="{ row }">
                     <el-input-number v-if="row.edit" v-model="row.quantity" size="small" :min="1" :controls="false"
-                        :precision="2" placeholder="请输入" @blur="quantityinputfun(row)"></el-input-number>
+                        :precision="3" placeholder="请输入" @blur="quantityinputfun(row)"></el-input-number>
                     <span v-else>{{ row.quantity }}</span>
                 </template>
                 <template slot="remarks" slot-scope="{ row }">

src/views/tirePartsMall/basicData/sharedSales/detailsPage.vue

@@ -19,10 +19,12 @@
                     销售退货
                 </el-button>
                 <el-button v-if="form.status != '已发货'" class="el-button--small-yh" style="margin-left: 6px;"
-                    type="success" size="small" :disabled="!form.id || editButton" @click="confirm(1)">确认到货
+                    type="success" size="small" :disabled="!form.id || editButton || form.businessSource == '外部销售'"
+                    @click="confirm(1)">确认到货
                 </el-button>
                 <el-button v-if="form.status == '已发货'" class="el-button--small-yh" style="margin-left: 6px;"
-                    type="danger" size="small" :disabled="!form.id || editButton" @click="confirm(2)">撤销到货
+                    type="danger" size="small" :disabled="!form.id || editButton || form.businessSource == '外部销售'"
+                    @click="confirm(2)">撤销到货
                 </el-button>
             </div>
         </div>
@@ -74,7 +76,7 @@
                                     :disabled="selectionMultilist.length == 0 || editButton || form.status == '已发货'"
                                     @click="allClick('派发销售单')">派发销售单</el-button>
                                 <el-button type="danger" plain size="small" @click="allClick('撤销派发')"
-                                    :disabled="selectionMultilist.length == 0 || editButton || form.status == '已发货'">撤销派发</el-button>
+                                    :disabled="selectionMultilist.length == 0 || editButton || form.status != '已发货'">撤销派发</el-button>
                                 <el-button type="primary" icon="el-icon-printer" size="small"
                                     @click="handlePrint">打印</el-button>
                                 <el-button type="danger" plain size="small" @click="batchDelete"
@@ -1400,7 +1402,7 @@ export default {
                 this.$router.push({
                     path: "/tirePartsMall/salesService/returns/index",
                     query: {
-                        bsType: 'TKGX',
+                        bsType: 'TKXS',
                         id: this.form.id,
                     }
                 });

src/views/tirePartsMall/salesManagement/outboundWorkOrderL/index.vue

@@ -127,15 +127,10 @@ export default {
         column: [
           {
             label: '商品名称',
-            prop: 'goodsId',
+            prop: 'goodsName',
             disabled: true,
             width: 200,
             overHidden: true,
-            props: {
-              label: 'cname',
-              value: 'id'
-            },
-            dicUrl: '/api/blade-sales-part/goodsDesc/goodsListAll'
           }, {
             label: '商品编码',
             disabled: true,

src/views/tirePartsMall/salesManagement/saleOrder/index.vue

@@ -35,7 +35,7 @@
         <template slot-scope="{type,size,row,index}" slot="menu">
           <!-- <el-button :size="size" :type="type" @click="check(row)">查看</el-button> -->
           <el-button :size="size" :type="type"
-            :disabled="row.status != '录入' && row.status != '待确认' && row.item >= 1 || row.businessSource == '外部销售'"
+            :disabled="row.status != '录入' && row.status != '待确认' && row.item >= 1 || row.businessSource == '外部销售' || row.billType == 1"
             @click="$refs.crud.rowDel(row, index)">删除</el-button>
         </template>
         <template slot="corpNameSearch">

src/views/tirePartsMall/salesService/returns/detailsPage.vue

@@ -623,7 +623,7 @@ export default {
         this.optionContacts = await this.getColumnData(this.getColumnName(343), this.optionContactsBack);
         this.optionPaymentDetails = await this.getColumnData(this.getColumnName(344), this.optionPaymentDetailsBack);
         this.optionOutboundRecords = await this.getColumnData(this.getColumnName(345), this.optionOutboundRecordsBack);
-        if (this.$route.query.id && this.$route.query.bsType == 'TKXS') {
+        if (this.$route.query.id && (this.$route.query.bsType == 'TKXS')) {
             this.generateData(this.$route.query)
         } else {
             if (this.detailData.id) {

src/views/tirePartsMall/statisticAnalysis/outboundStatistics/index.vue

@@ -1,6 +1,6 @@
 <template>
     <div>
-        <basic-container class="page-crad">
+        <basic-container>
             <avue-crud ref="crud" :option="option" :data="dataList" :page.sync="page" :search.sync="search"
                 :cell-style="cellStyle" @search-change="searchChange" @current-change="currentChange"
                 @size-change="sizeChange" @refresh-change="refreshChange" @on-load="onLoad" :table-loading="loading"
@@ -63,7 +63,10 @@ export default {
                 viewBtn: false,
                 editBtn: false,
                 delBtn: false,
+                searchSpan: 6,
                 searchMenuSpan: 18,
+                searchIcon: true,
+                searchIndex: 3,
                 emptyBtnText: '清空所有条件',
                 menu: false,
                 column: [