Ver Fonte

控制数值精度 同步仓库 陆运轨迹

Qukatie há 7 meses atrás
pai
commit
c8c803f887

+ 3 - 0
src/enums/column-name.js

@@ -1184,6 +1184,9 @@ const columnName = [{
   code: 269.4,
   name: '轮胎商城-盘点-明细列表'
 },{
+  code: 269.6,
+  name: '轮胎商城-融资采购-明细-融资采购列表'
+},{
   code: 270,
   name: '轮胎商城-销售管理-出库工单-列表信息'
 },{

+ 7 - 1
src/views/landTransportation/bulkReportAnalysis/index.vue

@@ -179,7 +179,7 @@ import {
 import {getToken} from "@/util/auth";
 import {gaude} from "@/api/gaude";
 import {getSalesman} from "@/api/landTransportation/bulkCargo";
-
+import { dateFormat } from "@/util/date";
 export default {
   name: "index",
   data() {
@@ -1013,6 +1013,12 @@ export default {
     openTrack(row) {
       gaude({itemId: row.id, plateNo: row.plateNo, tenantId: '234557', color: '2'}).then(res => {
         this.lineArr = res.data.data.trackArray
+        res.data.data.parkArray.forEach((e,index)=>{
+          if((res.data.data.parkArray.length-1)==index){
+            e.color='rgb(255, 162, 30)'
+          }
+          e.time="停车时间:"+dateFormat(new Date(e.bte*1),'yyyy-MM-dd hh:mm:ss')+"至"+dateFormat(new Date(e.ete*1),'yyyy-MM-dd hh:mm:ss')
+        })
         this.parkingPoint = res.data.data.parkArray
         this.dialogVisibleTwo = true
         this.loadingDialog = true

+ 1 - 1
src/views/landTransportation/reportAnalysis/index.vue

@@ -852,7 +852,7 @@ export default {
           if((res.data.data.parkArray.length-1)==index){
             e.color='rgb(255, 162, 30)'
           }
-          e.time=dateFormat(new Date(e.ete*1),'yyyy-MM-dd hh:mm:ss')
+          e.time="停车时间:"+dateFormat(new Date(e.bte*1),'yyyy-MM-dd hh:mm:ss')+"至"+dateFormat(new Date(e.ete*1),'yyyy-MM-dd hh:mm:ss')
         })
         this.parkingPoint = res.data.data.parkArray
         this.dialogVisibleTwo = true

+ 1 - 1
src/views/tirePartsMall/pointsMall/customerPoints/detailsPage.vue

@@ -193,7 +193,7 @@ export default {
                 spinner: 'el-icon-loading',
                 background: 'rgba(255,255,255,0.7)'
             });
-            getDetail({ corpId: id }).then(res => {
+            getDetail({ corpId: '1823603949693837314' }).then(res => {
                 this.form = res.data.data
             }).finally(() => {
                 loading.close()

+ 20 - 9
src/views/tirePartsMall/purchaseService/outStorage/detailsPage.vue

@@ -12,8 +12,8 @@
         </el-button>
         <el-button class="el-button--small-yh" type="primary" size="small" :disabled="isSave" @click="editCustomer">保存数据
         </el-button>
-        <el-button class="el-button--small-yh" type="warning" size="small" v-if="form.statusName == '已出库'" @click="revoke"
-          :disabled="isSave">撤销出库
+        <el-button class="el-button--small-yh" type="warning" size="small" v-if="form.statusName == '已出库'"
+          @click="revoke" :disabled="isSave">撤销出库
         </el-button>
         <el-button class="el-button--small-yh" type="success" size="small" style="margin-left: 6px;"
           v-if="form.statusName == '待出库' || form.statusName == '撤销出库'" @click="complete" :disabled="isSave">出库完成
@@ -34,6 +34,11 @@
               <template slot-scope="scope" slot="menuLeft">
                 <el-button type="primary" icon="el-icon-printer" size="small" @click="handlePrint">打印</el-button>
               </template>
+              <template slot="sendNum" slot-scope="{ row }">
+                <el-input-number v-if="row.$cellEdit" size="small" v-model="row.sendNum" :controls="false"
+                  :precision="numberDecimal" :min="0" style="width: 100%"></el-input-number>
+                <span v-else>{{ row.sendNum }}</span>
+              </template>
               <template slot-scope="{type,size,row,index,disabled}" slot="menu">
                 <!--<el-button :size="size" :disabled="disabled || isAddDisabled" :type="type"-->
                 <!--  :icon="row.$cellEdit ? 'el-icon-plus' : 'el-icon-edit'" @click="rowEdit(row, index)">编辑-->
@@ -42,15 +47,16 @@
                              :icon="row.$cellEdit ? 'el-icon-plus' : 'el-icon-edit'" @click="rowEdit(row, index)">
                       {{row.$cellEdit?'保存':'编辑'}}
                   </el-button> -->
-                <el-button icon="el-icon-delete" :size="size" :disabled="disabled || isDisabled || form.statusName == '已出库'"
-                  :type="type" @click="rowDelBox(row, index)">删除
+                <el-button icon="el-icon-delete" :size="size"
+                  :disabled="disabled || isDisabled || form.statusName == '已出库'" :type="type"
+                  @click="rowDelBox(row, index)">删除
                 </el-button>
               </template>
             </avue-crud>
           </el-tab-pane>
           <el-tab-pane label="订单信息" name="payment_details">
-            <avue-crud :option="optionPaymentDetails" v-model="formContacts" ref="payment_details" :data="form.shipVOList"
-              :key="key" @row-save="rowSave" @row-update="rowUpdate"
+            <avue-crud :option="optionPaymentDetails" v-model="formContacts" ref="payment_details"
+              :data="form.shipVOList" :key="key" @row-save="rowSave" @row-update="rowUpdate"
               @resetColumn="resetColumnTwo('payment_details', 'optionPaymentDetails', 'optionPaymentDetailsBack', 358)"
               @saveColumn="saveColumnTwo('payment_details', 'optionPaymentDetails', 'optionPaymentDetailsBack', 358)">
             </avue-crud>
@@ -70,7 +76,8 @@
         deleteUrl="/api/trade-purchase/woodHarvestingCloud/removeByFileId" :data="filesList" display
         :enumerationValue="35.1"></c-upload>
 
-      <report-dialog :switchDialog="switchDialog" reportName="轮胎商城-退货出库" :reportId="form.id" @onClose="onClose()"></report-dialog>
+      <report-dialog :switchDialog="switchDialog" reportName="轮胎商城-退货出库" :reportId="form.id"
+        @onClose="onClose()"></report-dialog>
     </div>
   </div>
 </template>
@@ -81,12 +88,13 @@ import { getDetails, tradingBox, submit, warehousingComplete, revokeOutboundComp
 import { dateFormat } from "@/util/date";
 import reportDialog from "@/components/report-dialog/main";
 import { dotList } from "@/api/tirePartsMall/purchasingManagement/warehouseEntryOrder";
-
+import { isProcurement } from "@/api/basicData/configuration";
 
 export default {
   name: "detailsPage",
   data() {
     return {
+      numberDecimal: 0,
       // 上传附件的需要参数
       loadingBtn: false,
       filesList: [],
@@ -347,7 +355,7 @@ export default {
         }, {
           label: '退货数量',
           prop: 'sendNum',
-          cell: true,
+          // cell: true,
           disabled: false,
         }, {
           label: '备注',
@@ -458,6 +466,9 @@ export default {
       this.refresh()
     }
     this.$store.commit("DOMIO_IN_DETAIL");
+    isProcurement({ "param": "number.decimal" }).then(res => {
+      this.numberDecimal = res.data.data ? Number(res.data.data) : 0
+    })
   },
   activated() {
     if (this.detailData.id) {

+ 6 - 1
src/views/tirePartsMall/purchaseService/returns/detailsPage.vue

@@ -88,7 +88,7 @@
                             </template>
                             <template slot="returnsNumber" slot-scope="{ row }">
                                 <el-input-number v-if="!mingxibaocun" size="small" v-model="row.returnsNumber"
-                                    :controls="false" :precision="0" style="width: 100%"
+                                    :controls="false" :precision="numberDecimal" style="width: 100%"
                                     @change="retuNumChange(row, row.returnsNumber)"></el-input-number>
                                 <span v-else>{{ row.returnsNumber }}</span>
                             </template>
@@ -173,12 +173,14 @@ import SearchQuery from "@/components/iosbasic-data/searchquery.vue";
 import {
     getList as KHgetList
 } from "@/api/tirePartsMall/basicData/customerInformation";
+import { isProcurement } from "@/api/basicData/configuration";
 import _ from "lodash";
 export default {
     name: "detailsPage",
 
     data() {
         return {
+            numberDecimal: 0,
             reportName: '轮胎商城-采购退货', // 打印传的名字
             SelectSearch: {}, // 添加商品检索
             // 编辑还是保存
@@ -616,6 +618,9 @@ export default {
                 this.getDetail(this.detailData.id)
             }
         }
+        isProcurement({ "param": "number.decimal" }).then(res => {
+            this.numberDecimal = res.data.data?Number(res.data.data):0
+        })
     },
     methods: {
         retuNumChange(row, num) {

+ 8 - 4
src/views/tirePartsMall/purchasingManagement/financingProcurement/detailsPage.vue

@@ -130,8 +130,8 @@
                                 <span>{{ row.goodsName }}</span>
                             </template>
                             <template slot="goodsNum" slot-scope="{ row }">
-                                <el-input v-if="!mingxibaocun" size="small" v-model="row.goodsNum"
-                                    style="width: 100%"></el-input>
+                                <el-input-number v-if="!mingxibaocun" size="small" v-model="row.goodsNum" :controls="false" :precision="numberDecimal"
+                                    style="width: 100%"></el-input-number>
                                 <span v-else>{{ row.goodsNum }}</span>
                             </template>
                             <template slot="price" slot-scope="{ row }">
@@ -298,7 +298,7 @@
                                 </el-tabs>
                             </template>
                             <template slot="goodsNum" slot-scope="{row}">
-                                <el-input-number v-model="row.goodsNum" size="small" :controls="false" :precision="0"
+                                <el-input-number v-model="row.goodsNum" size="small" :controls="false" :precision="numberDecimal"
                                     @input="amountChange($event, row)" style="width: 100%" />
                             </template>
 
@@ -378,6 +378,7 @@ import M from "minimatch";
 import da from "element-ui/src/locale/lang/da";
 import { color, number } from "echarts";
 import { getDeptLazyTreeTwo } from "@/api/basicData/basicFeesDesc";
+import { isProcurement } from "@/api/basicData/configuration";
 import commodity from "./configuration/commodity.json";
 import dicSelect from "@/components/dicSelect/main";
 export default {
@@ -385,6 +386,7 @@ export default {
 
     data() {
         return {
+            numberDecimal:0,
             SelectSearch: {},
             // 编辑还是保存
             mingxibaocun: true,
@@ -1370,7 +1372,9 @@ export default {
         if (this.detailData.id) {
             this.getDetailsfun()
         }
-
+        isProcurement({ "param": "number.decimal" }).then(res => {
+            this.numberDecimal = res.data.data?Number(res.data.data):0
+        })
     },
 
     watch: {

+ 10 - 2
src/views/tirePartsMall/purchasingManagement/warehouseEntryOrder/detailsPage.vue

@@ -45,7 +45,11 @@
                             <!--        </el-option>-->
                             <!--    </el-select>-->
                             <!--</template>-->
-
+                            <template slot="sendNum" slot-scope="{ row }">
+                                <el-input-number v-if="row.$cellEdit" size="small" v-model="row.sendNum" :controls="false" :precision="numberDecimal" :min="0"
+                                    style="width: 100%"></el-input-number>
+                                <span v-else>{{ row.sendNum }}</span>
+                            </template>
                             <template slot-scope="{type,size,row,index,disabled}" slot="menu">
                                 <el-button :size="size" :disabled="disabled || isEdit" :type="type"
                                     :icon="row.$cellEdit ? 'el-icon-plus' : 'el-icon-edit'"
@@ -135,6 +139,7 @@ export default {
     name: "detailsPage",
     data() {
         return {
+            numberDecimal:0,
             // 上传附件的需要参数
             loadingBtn: false,
             filesList: [],
@@ -395,7 +400,7 @@ export default {
                     label: "到货数量",
                     prop: "sendNum",
                     width: 100,
-                    cell: true,
+                    // cell: true,
                     disabled: false,
                     overHidden: true,
                     rules: [{
@@ -702,6 +707,9 @@ export default {
             this.refresh(this.$route.query.srcId)
         }
         this.$store.commit("DOMIO_IN_DETAIL");
+        isProcurement({ "param": "number.decimal" }).then(res => {
+            this.numberDecimal = res.data.data?Number(res.data.data):0
+        })
     },
     components: {
         reportDialog

+ 7 - 3
src/views/tirePartsMall/salesManagement/purchaseOrder/detailsPage.vue

@@ -111,8 +111,8 @@
                                 <span>{{ row.goodsName }}</span>
                             </template>
                             <template slot="goodsNum" slot-scope="{ row }">
-                                <el-input v-if="!mingxibaocun" size="small" v-model="row.goodsNum"
-                                    style="width: 100%"></el-input>
+                                <el-input-number v-if="!mingxibaocun" size="small" v-model="row.goodsNum" :controls="false" :precision="numberDecimal"
+                                    style="width: 100%"></el-input-number>
                                 <span v-else>{{ row.goodsNum }}</span>
                             </template>
                             <template slot="price" slot-scope="{ row }">
@@ -264,7 +264,7 @@
                                 </el-tabs>
                             </template>
                             <template slot="goodsNum" slot-scope="{row}">
-                                <el-input-number v-model="row.goodsNum" size="small" :controls="false" :precision="0"
+                                <el-input-number v-model="row.goodsNum" size="small" :controls="false" :precision="numberDecimal"
                                     @input="amountChange($event, row)" style="width: 100%" />
                             </template>
 
@@ -350,6 +350,7 @@ export default {
 
     data() {
         return {
+            numberDecimal:0,
             SelectSearch: {},
             // 编辑还是保存
             mingxibaocun: true,
@@ -1204,6 +1205,9 @@ export default {
         if (this.detailData.id) {
             this.getDetailsfun()
         }
+        isProcurement({ "param": "number.decimal" }).then(res => {
+            this.numberDecimal = res.data.data?Number(res.data.data):0
+        })
     },
 
     watch: {

+ 150 - 73
src/views/tirePartsMall/salesManagement/saleOrder/detailsPage.vue

@@ -86,11 +86,11 @@
                         <avue-crud :option="optionContacts" v-model="formContacts" ref="formContacts"
                             :data="form.orderItemsList" :key="key" @row-save="rowSave" @row-update="rowUpdate"
                             @row-close="rowClose" :before-close="beforeClose" @selection-change="selectionContacts"
-                            @resetColumn="resetColumnTwo('formContacts', 'optionContacts', 'optionContactsBack', 269.1)"
-                            @saveColumn="saveColumnTwo('formContacts', 'optionContacts', 'optionContactsBack', 269.1)">
+                            @resetColumn="resetColumnTwo('formContacts', 'optionContacts', 'optionContactsBack', 269.6)"
+                            @saveColumn="saveColumnTwo('formContacts', 'optionContacts', 'optionContactsBack', 269.6)">
                             <template slot-scope="{scope,row}" slot="menuLeft">
                                 <el-button type="primary" icon="el-icon-plus" size="small" :disabled="isAddBtn"
-                                    @click="rowAdd(row,1)">添加商品</el-button>
+                                    @click="rowAdd(row, 1)">添加商品</el-button>
                                 <el-button type="success" size="small" :disabled="isAddBtn" icon="el-icon-bottom"
                                     @click="excelDialogfun('名称')">按名称导入
                                 </el-button>
@@ -108,16 +108,29 @@
                                         :disabled="selectionMultilist.length != 1">查看库存</el-button>
                                 </el-popover>
                                 <el-button type="primary" icon="el-icon-plus" size="small" :disabled="isAddBtn"
-                                @click="rowAdd(row,2)">无库存商品</el-button>
-                                <el-button type="primary" plain size="small">同步库存</el-button>
+                                    @click="rowAdd(row, 2)">无库存商品</el-button>
+                                <el-popover width="600" trigger="click">
+                                    <avue-crud :data="inventoryData2" :option="inventoryOption2">
+                                        <template slot-scope="{row}" slot="menu">
+                                            <el-button type="text" icon="el-icon-refresh" size="small"
+                                                :disabled="row.storageId != form.storageId"
+                                                @click.stop="synchronous(row)">更新库存
+                                            </el-button>
+                                        </template>
+                                    </avue-crud>
+                                    <el-button type="primary" plain size="small" slot="reference"
+                                        @click="viewInventory2"
+                                        :disabled="selectionMultilist.length != 1 || isAddBtn">同步库存</el-button>
+                                </el-popover>
                             </template>
                             <template slot="goodsId" slot-scope="{ row }">
                                 {{ row.goodsName }}
                             </template>
 
                             <template slot="goodsNum" slot-scope="{ row }">
-                                <el-input v-if="!mingxibaocun && form.businessSource != '外部销售'" size="small"
-                                    v-model="row.goodsNum" style="width: 100%" @blur="goodsNumblurfun(row)"></el-input>
+                                <el-input-number v-if="!mingxibaocun && form.businessSource != '外部销售'" size="small"
+                                    v-model="row.goodsNum" :precision="numberDecimal" :controls="false"
+                                    @blur="goodsNumblurfun(row)" style="width: 100%"></el-input-number>
                                 <span v-else>{{ row.goodsNum }}</span>
                             </template>
                             <template slot="price" slot-scope="{ row }">
@@ -264,8 +277,8 @@
                                 </el-tabs>
                             </template>
                             <template slot="goodsNum" slot-scope="{row}">
-                                <el-input-number v-model="row.goodsNum" size="small" :controls="false" :precision="0"
-                                    @input="amountChange($event, row)" style="width: 100%" />
+                                <el-input-number v-model="row.goodsNum" size="small" :controls="false"
+                                    :precision="numberDecimal" @input="amountChange($event, row)" style="width: 100%" />
                             </template>
                             <template slot="dot" slot-scope="{row}">
                                 <!--使用allow-create属性即可通过在输入框中输入文字来创建新的条目。注意此时filterable必须为真。-->
@@ -295,7 +308,7 @@
                             </template>
                             <template slot="inventory" slot-scope="scope">
                                 <span style="color: #489fef">
-                                    {{ Number(scope.row.inventory)}}
+                                    {{ Number(scope.row.inventory) }}
                                 </span>
                             </template>
                         </avue-crud>
@@ -327,7 +340,7 @@ import {
     confirmRefund,
     revokeCheckOrder,
     goodsListXs,
-    revokeGenerateShipTask, 
+    revokeGenerateShipTask,
     goodsPageXs,
     getGoodAllList,
     generateReturns,
@@ -362,7 +375,9 @@ export default {
 
     data() {
         return {
-            goodsType:1,
+            inventoryData2: [],
+            numberDecimal: 0,
+            goodsType: 1,
             inventoryOption: {
                 header: false,
                 menu: false,
@@ -386,6 +401,32 @@ export default {
                     }
                 ]
             },
+            inventoryOption2: {
+                header: false,
+                menu: true,
+                menuWidth: 90,
+                editBtn: false,
+                delBtn: false,
+                column: [
+                    {
+                        label: '商品名称',
+                        prop: 'cname',
+                        overHidden: true,
+                    }, {
+                        label: '仓库',
+                        prop: 'storageName',
+                        overHidden: true,
+                    }, {
+                        label: '库存数量',
+                        prop: 'balanceQuantity',
+                        overHidden: true,
+                    }, {
+                        label: '批次号',
+                        prop: 'dot',
+                        overHidden: true,
+                    }
+                ]
+            },
             inventoryData: [],
             excelBox: false,
             reportName: '', // 打印传的名字
@@ -540,7 +581,7 @@ export default {
                 //         if (!this.onLoad.id) {
                 //             // this.$set(this.optionContactsBack, "addBtn", true)
                 //             // this['optionContacts'] = this['optionContactsBack'];
-                //             // this.delColumnData(this.getColumnName('269.1'), this['optionContactsBack']);
+                //             // this.delColumnData(this.getColumnName('269.6'), this['optionContactsBack']);
                 //         }
                 //         if (this.$refs.form.DIC.customerId || !this.onLoad.id) {
                 //             getCustom({ id: data.value }).then(res => {
@@ -1213,7 +1254,7 @@ export default {
                 })
             }
         }
-        this.optionContacts = await this.getColumnData(this.getColumnName(269.1), this.optionContactsBack);
+        this.optionContacts = await this.getColumnData(this.getColumnName(269.6), this.optionContactsBack);
         isProcurement({ "param": "whether.model" }).then(res => {
             if (res.data.data == 1) {
                 this.findObject(this.optionContacts.column, "pattern").label = '规格型号1'
@@ -1298,7 +1339,7 @@ export default {
             this.viewDisabled = true;
             // this.$set(this.optionContactsBack, "addBtn", false)
             // this['optionContacts'] = this['optionContactsBack'];
-            // this.delColumnData(this.getColumnName('269.1'), this['optionContactsBack']);
+            // this.delColumnData(this.getColumnName('269.6'), this['optionContactsBack']);
         }
         if (!this.detailData.id) {
             this.editButton = false
@@ -1345,7 +1386,9 @@ export default {
         if (this.detailData.id) {
             this.getDetailsfun()
         }
-
+        isProcurement({ "param": "number.decimal" }).then(res => {
+            this.numberDecimal = res.data.data ? Number(res.data.data) : 0
+        })
     },
 
     watch: {
@@ -1402,7 +1445,7 @@ export default {
             //     console.log(3);
             //     // this.$set(this.optionContactsBack, "addBtn", false)
             //     this['optionContacts'] = this['optionContactsBack'];
-            //     this.delColumnData(this.getColumnName('269.1'), this['optionContactsBack']);
+            //     this.delColumnData(this.getColumnName('269.6'), this['optionContactsBack']);
             // }
             // if (!this.detailData.id) {
             //     this.form.businessSource = '内部销售'
@@ -1425,6 +1468,40 @@ export default {
                 this.inventoryData = res.data.data.records
             ])
         },
+        viewInventory2() {
+            inventoryList({ cname: this.selectionMultilist[0].goodsName }).then(res => [
+                this.inventoryData2 = res.data.data.records
+                // res.data.data.records.forEach(item => {
+                //     if (item.storageId == this.form.storageId && item.dot == this.selectionMultilist[0].dot) {
+                //         if (Number(item.balanceQuantity) == Number(this.selectionMultilist[0].inventory)) {
+                //             this.$message.success("库存一致,不需要同步");
+                //         }
+                //         if (Number(item.balanceQuantity) != Number(this.selectionMultilist[0].inventory)) {
+                //             this.$confirm('是否更新库存', '提示', {
+                //                 confirmButtonText: '确定',
+                //                 cancelButtonText: '取消',
+                //                 type: 'warning'
+                //             }).then(() => {
+                //                 this.form.orderItemsList.forEach(e => {
+                //                     if (e.goodsName == this.selectionMultilist[0].goodsName) {
+                //                         e.inventory = item.balanceQuantity
+                //                     }
+                //                 })
+                //                 //   this.editCustomer()
+                //             })
+                //         }
+                //     }
+                // })
+            ])
+        },
+        synchronous(row) {
+            this.form.orderItemsList.forEach(e => {
+                if (e.goodsName == this.selectionMultilist[0].goodsName) {
+                    e.inventory = row.balanceQuantity
+                    e.dot = row.dot
+                }
+            })
+        },
         uploadAfter(res, done, loading, column) {
             if (Array.isArray(res)) {
                 if (res instanceof Array) {
@@ -1553,7 +1630,7 @@ export default {
         },
         // 获取左侧筛选
         getAllWorkDicts() {
-            getCorpTypes({whetherIntegral: '0'}).then(res => {
+            getCorpTypes({ whetherIntegral: '0' }).then(res => {
                 this.treeDataGoods = res.data.data;
             });
         },
@@ -1567,7 +1644,7 @@ export default {
             this.treeDataGoods = [];
             this.treeDeptId = "";
             this.activeNameTabs = "searchList";
-            this.goodsType=1
+            this.goodsType = 1
         },
         //刷新触发
         refreshChange() {
@@ -1666,12 +1743,12 @@ export default {
                     // 价格
                     pricetype: false,
                 }
-                if(item.goodsFilesList&&item.goodsFilesList.length){
-                   for (let ite of item.goodsFilesList) {
-                    if (ite.version == '0') {
-                        obj.url = ite.url
+                if (item.goodsFilesList && item.goodsFilesList.length) {
+                    for (let ite of item.goodsFilesList) {
+                        if (ite.version == '0') {
+                            obj.url = ite.url
+                        }
                     }
-                   }
                 }
 
                 this.form.orderItemsList.push(obj)
@@ -1697,53 +1774,53 @@ export default {
         },
         //导入商品弹窗列表查询
         onLoadfun(page, params = { artsVision: this.form.belongToCorpId }) {
-            this.goodsListShow=[]
+            this.goodsListShow = []
             this.loading = true;
-            if(this.goodsType==1){
+            if (this.goodsType == 1) {
                 goodsPageXs({
-                current: page.currentPage,
-                size: page.pageSize,
-                customId: this.form.customerId,
-                stock: this.form.storageId,
-                enableOrNot: 1,
-                goodsTypeId: this.treeDeptId,
-                ...Object.assign(params, this.SelectSearch),
-                whetherIntegral: '0'
-            }).then(res => {
-                const data = res.data.data;
-                this.page.total = data.total;
-                this.pageList.total = data.total
-                this.data = data.records;
-                this.goodsListShow = data.records;
-
-                for (let item of this.goodsListShow) {
-                    item.goodsNum = item.goodsNum ? item.goodsNum : 0
-                }
-                this.loading = false;
-            })
+                    current: page.currentPage,
+                    size: page.pageSize,
+                    customId: this.form.customerId,
+                    stock: this.form.storageId,
+                    enableOrNot: 1,
+                    goodsTypeId: this.treeDeptId,
+                    ...Object.assign(params, this.SelectSearch),
+                    whetherIntegral: '0'
+                }).then(res => {
+                    const data = res.data.data;
+                    this.page.total = data.total;
+                    this.pageList.total = data.total
+                    this.data = data.records;
+                    this.goodsListShow = data.records;
+
+                    for (let item of this.goodsListShow) {
+                        item.goodsNum = item.goodsNum ? item.goodsNum : 0
+                    }
+                    this.loading = false;
+                })
             }
-            if(this.goodsType==2){
-            getGoodAllList({
-                current: page.currentPage,
-                size: page.pageSize,
-                customId: this.form.customerId,
-                stock: this.form.storageId,
-                enableOrNot: 1,
-                goodsTypeId: this.treeDeptId,
-                ...Object.assign(params, this.SelectSearch),
-                whetherIntegral: '0'
+            if (this.goodsType == 2) {
+                getGoodAllList({
+                    current: page.currentPage,
+                    size: page.pageSize,
+                    customId: this.form.customerId,
+                    stock: this.form.storageId,
+                    enableOrNot: 1,
+                    goodsTypeId: this.treeDeptId,
+                    ...Object.assign(params, this.SelectSearch),
+                    whetherIntegral: '0'
                 }).then(res => {
-                res.data.data.records.forEach(item=>{
-                    item.goodsNum = item.goodsNum ? item.goodsNum : 0
-                    item.inventory= item.inventory ? item.inventory : 0
+                    res.data.data.records.forEach(item => {
+                        item.goodsNum = item.goodsNum ? item.goodsNum : 0
+                        item.inventory = item.inventory ? item.inventory : 0
+                    })
+                    const data = res.data.data;
+                    this.page.total = data.total;
+                    this.pageList.total = data.total
+                    this.data = data.records;
+                    this.goodsListShow = data.records;
+                    this.loading = false;
                 })
-                const data = res.data.data;
-                this.page.total = data.total;
-                this.pageList.total = data.total
-                this.data = data.records;
-                this.goodsListShow = data.records;
-                this.loading = false;
-             })
             }
         },
         // 采购明细行编辑
@@ -2026,7 +2103,7 @@ export default {
                 //     }
                 // })
                 // this['optionContacts'] = this['optionContactsBack'];
-                // this.delColumnData(this.getColumnName(269.1), this['optionContactsBack']);
+                // this.delColumnData(this.getColumnName(269.6), this['optionContactsBack']);
 
 
                 // this.form.outboundRecordsList.forEach(item=>{
@@ -2345,7 +2422,7 @@ export default {
                         if (this.form.orderItemsList[i].goodsNum <= 0) {
                             return this.$message.warning(`销售明细序号${Number(i) + 1}的数量不能为零`);
                             picihao = true
-                            
+
                         }
                     }
                     this.mingxibaocun = true
@@ -2569,7 +2646,7 @@ export default {
                 //         }
                 //     })
                 //     this['optionContacts'] = this['optionContactsBack'];
-                //     this.delColumnData(this.getColumnName(269.1), this['optionContactsBack']);
+                //     this.delColumnData(this.getColumnName(269.6), this['optionContactsBack']);
                 //     this.optionContactsBack.column.forEach(item => {
                 //         if (item.prop == 'dot') {
                 //             this.$set(item, disabled, false)
@@ -2591,7 +2668,7 @@ export default {
                 //     })
                 //     console.log(324324);
                 //     this['optionContacts'] = this['optionContactsBack'];
-                //     this.delColumnData(this.getColumnName(269.1), this['optionContactsBack']);
+                //     this.delColumnData(this.getColumnName(269.6), this['optionContactsBack']);
                 // }
                 // // this.$set(this.form.orderItemsList,'goodsNum',66)
 
@@ -2883,13 +2960,13 @@ export default {
             done(form)
         },
         // 新增商品
-        rowAdd(row,type) {
+        rowAdd(row, type) {
             if (!this.form.customerId) {
                 this.$message.error('请选择客户')
                 return
             }
             this.findObject(this.optionContactsBack.column, 'goodsId').dicUrl = `/api/blade-sales-part/goodsDesc/goodsListXs?cname={{key}}&customId=${this.dicUrlWithCustomId}&enableOrNot=1&stock=${this.form.storageId}`
-            this.goodsType=type
+            this.goodsType = type
             this.optionContactsBack.column.forEach(its => {
                 if (its.prop == 'goodsId' || its.prop == 'goodsNum' || its.prop == 'price' || its.prop == 'dot' || its.prop == 'remarks') {
                     its.disabled = false
@@ -2898,7 +2975,7 @@ export default {
                 }
             })
             this.getAllWorkDicts()
-          
+
             this.goodsListSave = []
             setTimeout(res => {
                 this.refreshChange()

+ 11 - 3
src/views/tirePartsMall/salesService/inStorage/detailsPage.vue

@@ -44,7 +44,11 @@
                             <!--        </el-option>-->
                             <!--    </el-select>-->
                             <!--</template>-->
-
+                            <template slot="sendNum" slot-scope="{ row }">
+                                <el-input-number v-if="row.$cellEdit" size="small" v-model="row.sendNum" :controls="false" :precision="numberDecimal" :min="0"
+                                    style="width: 100%"></el-input-number>
+                                <span v-else>{{ row.sendNum }}</span>
+                            </template>
                             <template slot-scope="{type,size,row,index,disabled}" slot="menu">
                                 <!-- <el-button :size="size" :disabled="disabled || isEdit" :type="type"
                                   :icon="row.$cellEdit ? 'el-icon-plus' : 'el-icon-edit'" @click="rowEdit(row, index)">
@@ -127,14 +131,15 @@ import { getToken } from "@/util/auth";
 import { getMenu } from "@/api/system/menu";
 import reportDialog from "@/components/report-dialog/main";
 import { corpsDescListAll } from "@/api/tirePartsMall/salesService/saleOrder";
+import { isProcurement } from "@/api/basicData/configuration";
 export default {
     name: "detailsPage",
     data() {
         return {
+            numberDecimal: 0,
             // 上传附件的需要参数
             loadingBtn: false,
             filesList: [],
-
             switchDialog: false,
             isEdit: false,
             values: '',
@@ -403,7 +408,7 @@ export default {
                     label: "退货数量",
                     prop: "sendNum",
                     width: 100,
-                    cell: true,
+                    // cell: true,
                     disabled: false,
                     overHidden: true,
                     rules: [{
@@ -697,6 +702,9 @@ export default {
             this.refresh()
         }
         this.$store.commit("DOMIO_IN_DETAIL");
+        isProcurement({ "param": "number.decimal" }).then(res => {
+            this.numberDecimal = res.data.data?Number(res.data.data):0
+        })
     },
     components: {
         reportDialog

+ 6 - 1
src/views/tirePartsMall/salesService/returns/detailsPage.vue

@@ -88,7 +88,7 @@
                             </template>
                             <template slot="returnsNumber" slot-scope="{ row }">
                                 <el-input-number v-if="!mingxibaocun" size="small" v-model="row.returnsNumber"
-                                    :controls="false" :precision="0" style="width: 100%"
+                                    :controls="false" :precision="numberDecimal" style="width: 100%"
                                     @change="retuNumChange(row, row.returnsNumber)"></el-input-number>
                                 <span v-else>{{ row.returnsNumber }}</span>
                             </template>
@@ -173,12 +173,14 @@ import SearchQuery from "@/components/iosbasic-data/searchquery.vue";
 import {
     getList as KHgetList
 } from "@/api/tirePartsMall/basicData/customerInformation";
+import { isProcurement } from "@/api/basicData/configuration";
 import _ from "lodash";
 export default {
     name: "detailsPage",
 
     data() {
         return {
+            numberDecimal: 0,
             reportName: '轮胎商城-销售退货', // 打印传的名字
             SelectSearch: {}, // 添加商品检索
             // 编辑还是保存
@@ -621,6 +623,9 @@ export default {
                 this.getDetail(this.detailData.id)
             }
         }
+        isProcurement({ "param": "number.decimal" }).then(res => {
+            this.numberDecimal = res.data.data?Number(res.data.data):0
+        })
     },
     methods: {
         retuNumChange(row, num) {

+ 8 - 6
vue.config.js

@@ -8,7 +8,7 @@ module.exports = {
       'AMap': 'AMap' // 高德地图JS API
     },
     // 启用gzip
-    /*plugins: [
+    plugins: [
       new CompressionWebpackPlugin({
         algorithm: 'gzip',
         test: new RegExp('\\.(' + productionGzipExtensions.join('|') + ')$'),
@@ -20,7 +20,7 @@ module.exports = {
         maxChunks: 5,
         minChunkSize: 100
       })
-    ]*/
+    ]
   },
   //路径前缀
   publicPath: "/",
@@ -50,11 +50,12 @@ module.exports = {
       '/api': {
         //本地服务接口地址
         // target: 'http://192.168.3.64:1080',
-        // target: 'http://192.168.8.105:1080',
-        target: 'http://127.0.0.1:1080',
+        // target: 'http://192.168.8.102:1080',
+        // target: 'http://127.0.0.1:1080',
         // 打包地址
-        // target: 'http://121.37.83.47:10004',//服务器ip
-        //target: 'http://192.168.161.11:10004',//服务器ip
+        target: 'http://121.37.83.47:10004',//服务器ip
+        // target: 'http://192.168.161.11:10004',//服务器ip
+        //  target: 'http://127.0.0.1:10004',
         // target: 'http://trade.tubaosoft.com:10004',//服务器域名
         ws: true,
         pathRewrite: {
@@ -64,3 +65,4 @@ module.exports = {
     }
   }
 };
+