轮胎商品库存查询

src/components/bill/config/mainList.json

@@ -104,6 +104,13 @@
       "index": 4
     },
     {
+      "label": "币别",
+      "prop": "currency",
+      "overHidden": true,
+      "width": 150,
+      "index": 6
+    },
+    {
       "label": "金额",
       "prop": "amount",
       "overHidden": true,

src/components/bill/selectOrderDetailList.vue

@@ -84,16 +84,17 @@ export default {
   },
   watch: {
     'params.corpId'(newVal, oldVal) {
+        console.log(newVal,87)
       if (newVal != oldVal) {
         this.onLoad(this.page, this.search)
       }
-    }
+    },
   },
   async created() {
     // this.option = await this.getColumnData(this.getColumnName(281), option);
   },
     mounted() {
-        // this.onLoad(this.page)
+        this.onLoad(this.page,this.params)
     },
     methods: {
     importStagList(row, index) {
@@ -132,24 +133,30 @@ export default {
       this.goodsListSave = row
     },
     onLoad(page, params) {
-        console.log(page,params,133)
       if(params && params.rentStartDate ){
         params.createStartDate = params.rentStartDate[0] + " " + "00:00:00"?params.rentStartDate[0] + " " + "00:00:00":'';
         params.createEndDate = params.rentStartDate[1] + " " + "23:59:59"?params.rentStartDate[1] + " " + "23:59:59":'';
         this.$delete(params, 'rentStartDate')
       }
-
       this.loading = true;
+        // 把老数据进行更新  从父组件调用的子组件方法
+        if (params.customerId != this.params.customerId) {
+            this.params = params
+        }
       params = {
-        ...params,
-        ...this.params
+        // ...params,
+          ...page,
+          ...this.params
       }
+
+    // ...this.params 使用之前的老数据 回请求之前的ID造成数据不对
       params.billType = this.billType
       if (this.$store.getters.userInfo.tenant_id === "673511") {
         params.type = "CMY"
       }
       params.flag = this.flag
       getListOrder(page.currentPage, page.pageSize, params).then(res => {
+          console.log(res,155)
         this.data = res.data.data.records
         this.page.total = res.data.data.total
       }).finally(() => {

src/components/boxCost/index.vue

@@ -699,9 +699,13 @@ export default {
       this.findObject(this.option.column, "corpName").label = "付款对象"
     }
     this.findObject(this.option.column, "price").change = ({value, column}) => {
+        console.log(value,this.form.quantity,this.form.exchangeRate,702)
       if (value && this.form.quantity) {
         if (this.form.exchangeRate) {
-          this.form.amount = value * this.form.quantity * this.form.exchangeRate
+            // 之前的金额要乘汇率
+          // this.form.amount = value * this.form.quantity * this.form.exchangeRate
+          //   现在的金额计算不需要乘汇率
+            this.form.amount = value * this.form.quantity
         } else {
           this.form.amount = value * this.form.quantity
         }

src/views/boxManagement/stockpilingManage/detailsPage.vue

@@ -58,7 +58,7 @@
           @saveColumn="saveColumnTwo('crud','option','optionBack',252.1)">
         <template slot-scope="{type,size,row,index,disabled}" slot="menu">
           <el-button icon="el-icon-edit" :size="size" :disabled="disabled" :type="type"
-                     @click="$refs.crud.rowEdit(row,index)">编辑
+                     @click="rowEditfun(row,index)">编辑
           </el-button>
           <el-button icon="el-icon-delete" :size="size" :disabled="disabled || row.count > 0" :type="type"
                      @click="rowDel(row,index,'MX')">删除
@@ -190,6 +190,7 @@ import {selectByName} from "@/api/boxManagement";
 import {getToken} from "@/util/auth";
 import {dateFormat} from "@/util/date";
 import reportDialog from "@/components/report-dialog/main.vue";
+import {getParities} from "@/api/basicData/customerInquiry";
 export default {
   name: "detailsPage",
   props: {
@@ -199,6 +200,8 @@ export default {
   components:{checkSchedule,reportDialog},
   data() {
     return {
+        // 获取的汇率数据
+        huiludate:{},
       switchDialog:false,
       excelOption: {
         submitBtn: false,
@@ -388,7 +391,8 @@ export default {
         delBtn: false,
         menuWidth: 140,
         dialogTop: 25,
-        height:600,
+        // height:600,
+          maxHeight:600,
         dialogWidth: "80%",
         showSummary: true,
         sumColumnList: [{
@@ -745,6 +749,19 @@ export default {
     }
   },
   methods: {
+      // 箱信息里的遍布按钮
+      rowEditfun(row,index) {
+          console.log(this.$refs.boxCost.dataList,751)
+          this.$refs.boxCost.dataList.map(item=>{
+              if (item.code == row.code && item.itemName == '堆存费' && item.submitPay == 0) {
+                  // 0 未生成 1已生成
+                  this.findObject(this.option.column, "currency").disabled = false
+              }else {
+                  this.findObject(this.option.column, "currency").disabled = true
+              }
+          })
+          this.$refs.crud.rowEdit(row,index)
+      },
     // 报表
     openReport() {
       this.switchDialog = !this.switchDialog;
@@ -1209,7 +1226,26 @@ export default {
       }
       done(form)
     },
+      // 根据币别获取 汇率
+      // getParitiesfun(value){
+      //      getParities({
+      //         currency: value,
+      //         businesDate: dateFormat(new Date(), "yyyy-MM-dd") + " 00:00:00"
+      //     }).then(res=>{
+      //          this.huiludate = res.data.data
+      //     })
+      // },
+      // 编辑弹窗点击确认的按钮事件
     rowUpdate(form, index, done, loading) {
+          // 箱管理那边的修改币别 费用信息那边也要更改
+        this.$refs.boxCost.dataList.map(item=>{
+            if (item.code == form.code && item.itemName == '堆存费' && item.submitPay == 0) {
+                // 0 未生成 1已生成
+                item.currency = form.currency
+                // 汇率参数
+                // exchangeRate
+            }
+        })
       if (!Number(form.price) || Number(form.price) < 0){
         loading()
         return this.$message.error('堆存费/天,不能不能为0或不能为负')

src/views/tirePartsMall/basicData/listingManagement/index.vue

@@ -571,7 +571,19 @@ export default {
   },
   //编辑确定
   rowUpdate(form, index, done, loading) {
+      console.log(this.form.filesList,574)
     if (this.form.filesList.length > 0) {
+        // 循环把编辑状态变成保存状态
+        this.form.filesList.map((item)=>{
+            if (item.$cellEdit == true) {
+                // this.$set(item, "$cellEdit", false);
+                item.$cellEdit = false
+            } else {
+                // this.$set(item, "$cellEdit", true);
+                item.$cellEdit = true
+            }
+        })
+
       let flag = this.form.filesList.some(item => {
         return item.$version == '主图'
       })

src/views/tirePartsMall/financialManagement/paymentSettlement/detailsPage.vue

@@ -80,6 +80,7 @@ export default {
         // 上传附件的需要参数
         loadingBtn:false,
         filesList:[],
+        params:{},
 
       billDetailDialog: false,
       isSave: 0,
@@ -326,14 +327,15 @@ export default {
         this.$message.warning("请先选择客户!")
         return
       }
+        console.log(this.form,329)
       this.params = {
         customerId: this.form.corpId,
         status: '待确认',
         bsType: 'CG',
         actualPaymentStatus: '2'
       }
+        this.billDetailDialog = true;
 
-      this.billDetailDialog = true;
       // 调用一次弹窗的方法，防止不刷新数据
         let page = {
             pageSize: 20,
@@ -343,6 +345,7 @@ export default {
         }
         this.$refs.billDetailRef.onLoad(page,this.params)
 
+
     },
     confirmEditing() {
       this.editButton = true

src/views/tirePartsMall/inventory/index.vue

@@ -202,7 +202,7 @@ export default {
             hide: true,
             width: 120,
             searchLabelWidth: 120,
-            searchValue:'否',
+            searchValue:0,
             dicData: [{
               "label": "是",
               "value": "1"
@@ -215,7 +215,8 @@ export default {
     }
   },
   async created() {
-    this.option = await this.getColumnData(this.getColumnName(268), this.optionList);
+    // this.option = await this.getColumnData(this.getColumnName(268), this.optionList);
+      this.option = this.optionList
     this.key++
     let i = 0;
     this.option.column.forEach(item => {
@@ -285,7 +286,7 @@ export default {
       done();
       this.onLoad(this.page, params)
     },
-    onLoad(page, params = {}) {
+    onLoad(page, params = {whether:0}) {
       console.log(params);
       params = {
         storageId:params.storageName,

src/views/tirePartsMall/purchasingManagement/warehouseEntryOrder/detailsPage.vue

@@ -32,9 +32,22 @@
                             :data="form.shipItemsList" :key="key" @row-save="rowSave" @row-update="rowUpdate"
                             @resetColumn="resetColumnTwo('formContacts', 'optionContacts', 'optionContactsBack', 274.1)"
                             @saveColumn="saveColumnTwo('formContacts', 'optionContacts', 'optionContactsBack', 274.1)">
+
+                            <!--<template slot-scope="{ row }" slot="dot">-->
+                            <!--    <el-select v-model="row.dot" placeholder="请选择">-->
+                            <!--        <el-option-->
+                            <!--            v-for="item in options"-->
+                            <!--            :key="item.value"-->
+                            <!--            :label="item.label"-->
+                            <!--            :value="item.value">-->
+                            <!--        </el-option>-->
+                            <!--    </el-select>-->
+                            <!--</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)">编辑
+                                    :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 || form.statusName == '已入库' || isEdit || isEdits" :type="type"
@@ -296,7 +309,7 @@ export default {
                 editBtn: false,
                 delBtn: false,
                 border: true,
-                menuWidth: 120,
+                menuWidth: 160,
                 stripe: true,
                 span: 8,
                 index: true,
@@ -305,6 +318,10 @@ export default {
                 disabled: false,
                 dialogWidth: "80%",
                 showSummary: true,
+
+                saveBtn:false, // 表格弹窗保存按钮
+                cancelBtn:false, // 行内查看取消按钮
+                cellBtn:true, // 行编辑
                 sumColumnList: [
                     {
                         name: 'sendNum',
@@ -351,6 +368,8 @@ export default {
                 {
                     label: "实际数量",
                     prop: "sendNum",
+                    width:100,
+                    cell: true,
                     disabled: false,
                     overHidden: true,
                     rules: [{
@@ -370,6 +389,8 @@ export default {
                     }]
                 }, {
                     label: "批次号",
+                        cell:true,
+                        width:120,
                     prop: "dot",
                     type: "select",
                     disabled: false,
@@ -436,7 +457,9 @@ export default {
                     ovrHidden: true,
                 }, {
                     label: "备注",
+                        cell:true,
                     prop: "remarks",
+                        width:150,
                     span: 16,
                     disabled: false,
                     overHidde: true
@@ -818,6 +841,9 @@ export default {
                         background: 'rgba(255,255,255,0.7)'
                     });
                     this.form.customerName = this.form.$customerId
+                    this.form.shipItemsList.map(item=>{
+                        item.$cellEdit = false
+                    })
                     submit({
                         ...this.form,
                         bizTypeName: "SHGD",
@@ -841,6 +867,8 @@ export default {
                 spinner: 'el-icon-loading',
                 background: 'rgba(255,255,255,0.7)'
             })
+            console.log(id,847)
+            console.log(this.detailData.id,848)
             if (!this.detailData.id) {
                 getDetails({ id: id }).then(res => {
                     this.form = res.data.data
@@ -858,21 +886,24 @@ export default {
                     loading.close();
                 })
             }
-
-
         },
         //编辑
         rowEdit(row, index) {
-            console.log(row, index);
-            this.confirmEditing()
+            console.log(row, index,887);
+            if (row.$cellEdit) {
+                this.$set(row,'$cellEdit',false)
+            }else {
+                this.$set(row,'$cellEdit',true)
+            }
+            // this.confirmEditing()
             dotList({
                 storageId: this.form.storageId,
                 goodsId: row.goodsId
             }).then(res => {
-                console.log('789');
                 this.findObject(this.optionContactsBack.column, "dot").dicData = res.data.data
+                // console.log(this.dicData)
             })
-            this.$refs.formContacts.rowEdit(row, index)
+            // this.$refs.formContacts.rowEdit(row, index)
         },
         rowDelBox(row, index) {
             this.$confirm("确定将选择数据删除?", {
@@ -896,6 +927,7 @@ export default {
             console.log(form)
             done(form)
         },
+        // 更新数据后确定触发该事件
         rowUpdate(form, index, done, loading) {
             console.log(form)
             done(form);

src/views/tirePartsMall/salesManagement/purchaseOrder/detailsPage.vue

@@ -18,7 +18,7 @@
                     {{ buttonText }}
                 </el-button>
                 <el-dropdown style="padding: 0 6px;line-height: 0">
-                    <el-button type="danger" :loading="buttonLoading" :disabled="!form.id || viewDisabled" size="small">
+                    <el-button v-show="!(!form.id || viewDisabled)" type="danger" :loading="buttonLoading" :disabled="!form.id || viewDisabled" size="small">
                         请 核<i class="el-icon-arrow-down el-icon--right"></i>
                     </el-button>
                     <el-dropdown-menu slot="dropdown">

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

@@ -515,6 +515,7 @@ export default {
       }).catch(() => {
       });
     },
+      // 点击搜索触发
     searchChange(params, done) {
       done();
       this.onLoad(this.page, params)

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

@@ -19,7 +19,7 @@
                 </el-button>
 
                 <el-dropdown style="padding: 0 6px;line-height: 0">
-                    <el-button type="danger" :loading="buttonLoading" :disabled="!form.id || viewDisabled" size="small">
+                    <el-button v-show="!(!form.id || viewDisabled)" type="danger" :loading="buttonLoading" :disabled="!form.id || viewDisabled" size="small">
                         售 后<i class="el-icon-arrow-down el-icon--right"></i>
                     </el-button>
                     <el-dropdown-menu slot="dropdown">

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

@@ -71,7 +71,8 @@
           <avue-crud ref="crud" :option="option" :data="dataList" :page.sync="page" :search.sync="search"
             @search-change="searchChange" @current-change="currentChange" @size-change="sizeChange"
             @refresh-change="refreshChange" @on-load="onLoad" :table-loading="loading" @saveColumn="saveColumn"
-            @resetColumn="resetColumn" :cell-style="cellStyle" @search-criteria-switch="searchCriteriaSwitch">
+            @resetColumn="resetColumn" :cell-style="cellStyle" @search-criteria-switch="searchCriteriaSwitch"
+                     @search-reset="qingkongss">
             <template slot="menuLeft">
               <!-- <el-button type="primary" size="mini" @click.stop="newAdd()">新建客户
                 </el-button>
@@ -438,6 +439,12 @@ export default {
     newAdd() {
       this.show = false;
     },
+      // 清空检索条件
+      qingkongss(params,done){
+          this.search = ''
+          this.onLoad(this.page)
+      },
+      // 获取列表数据
     onLoad(page, params = {}) {
       let data = this.deepClone(Object.assign(params, this.search));
       if (data.date && data.date.length > 0) {

src/views/tirePartsMall/statisticAnalysis/supplierTransactions/js/optionList.js

@@ -35,7 +35,7 @@ export const option = {
         label: 'cname',
         value: 'id'
       },
-      dicUrl: '/api/blade-sales-part/corpsDesc/listAll?cname={{key}}&corpType=GYS&enableOrNot=1',
+      dicUrl: '/api/blade-sales-part/corpsDesc/listAll?cname={{key}}&corpType=GYS',
     },
     // {
     //   label: "电话",