修改表格宽度 选择商品bug 轮播图 上架管理 福达调整出厂价

src/views/exportTrade/customerInquiry/components/goodsInfo.vue

@@ -11,10 +11,12 @@
                         :disabled="detailData.status == 1">出口价格库</el-button> -->
                     <el-button type="primary" icon="el-icon-printer" size="small" @click.stop="openReport()">报表打印
                     </el-button>
-                    <el-button type="warning" size="small" @click.stop="savePurchase" :disabled="detailData.status == 1">
+                    <el-button type="warning" size="small" @click.stop="savePurchase"
+                        :disabled="detailData.status == 1">
                         采购询价
                     </el-button>
-                    <el-button type="warning" size="small" @click.stop="saveShipping" :disabled="detailData.status == 1">
+                    <el-button type="warning" size="small" @click.stop="saveShipping"
+                        :disabled="detailData.status == 1">
                         船务询价
                     </el-button>
                     <el-button type="warning" size="small" @click="cnameData">刷新基础资料</el-button>
@@ -26,7 +28,7 @@
                     </el-button>
                     <el-button type="success" size="small" @click="oceanUSD" :disabled="detailData.status == 1">海运费单列
                     </el-button>
-                    <el-popover placement="top" width="160" v-model="visible">
+                    <!-- <el-popover placement="top" width="160" v-model="visible">
                         <div style="text-align: center;">
                             <el-input-number v-model="priceAD" size="small" :controls="false"></el-input-number> %
                         </div>
@@ -36,7 +38,9 @@
                         </div>
                         <el-button type="success" size="small" slot="reference"
                             :disabled="detailData.status == 1">调整出厂价</el-button>
-                    </el-popover>
+                    </el-popover> -->
+                    <el-button type="success" size="small" @click="inPriceAD"
+                        :disabled="detailData.status == 1">调整出厂价</el-button>
                 </el-row>
             </template>
             <template slot="headerSerial">
@@ -93,9 +97,9 @@
                             <i v-if="index != 0" :disabled="detailData.status == 1" class="el-icon-arrow-up"
                                 @click="moveUp(row, index)" style="color:#409EFF;"></i>
                         </el-tooltip>
-                        <el-tooltip effect="dark" content="向下移动" placement="bottom"> <i v-if="index != (data.length - 1)"
-                                :disabled="detailData.status == 1" class="el-icon-arrow-down" @click="moveDown(row, index)"
-                                style="color:#409EFF;"></i>
+                        <el-tooltip effect="dark" content="向下移动" placement="bottom"> <i
+                                v-if="index != (data.length - 1)" :disabled="detailData.status == 1"
+                                class="el-icon-arrow-down" @click="moveDown(row, index)" style="color:#409EFF;"></i>
                         </el-tooltip>
                     </div>
                 </div>
@@ -105,7 +109,8 @@
                 <span style="display:flex">
                     <el-select v-model="goodsForm.itemId" placeholder="请选择" size="small" filterable
                         @change="cnameChange(goodsForm)">
-                        <el-option v-for="item in goodsoptions" :key="item.itemId" :label="item.cname" :value="item.itemId">
+                        <el-option v-for="item in goodsoptions" :key="item.itemId" :label="item.cname"
+                            :value="item.itemId">
                         </el-option>
                     </el-select>
                     <el-button icon="el-icon-search" size="small" @click="pickGoods"></el-button>
@@ -115,7 +120,8 @@
             <template slot="remarksOneForm" slot-scope="{type,disabled}">
                 <el-select v-model="goodsForm.remarksOne" placeholder="请选择" size="small" :disabled="disabled"
                     @change="propsChange(goodsForm)">
-                    <el-option v-for="item in ThreadList" :key="item.id" :label="item.dictValue" :value="item.dictValue">
+                    <el-option v-for="item in ThreadList" :key="item.id" :label="item.dictValue"
+                        :value="item.dictValue">
                     </el-option>
                 </el-select>
             </template>
@@ -123,7 +129,8 @@
             <template slot="customTwoForm" slot-scope="{type,disabled}">
                 <el-select v-model="goodsForm.customTwo" placeholder="请选择" size="small" :disabled="disabled"
                     @change="propsChange(goodsForm)">
-                    <el-option v-for="item in mediumList" :key="item.id" :label="item.dictValue" :value="item.dictValue">
+                    <el-option v-for="item in mediumList" :key="item.id" :label="item.dictValue"
+                        :value="item.dictValue">
                     </el-option>
                 </el-select>
             </template>
@@ -139,7 +146,8 @@
             <template slot="customFourForm" slot-scope="{type,disabled}">
                 <el-select v-model="goodsForm.customFour" placeholder="请选择" size="small" :disabled="disabled"
                     @change="propsChange(goodsForm)">
-                    <el-option v-for="item in stencilList" :key="item.id" :label="item.dictValue" :value="item.dictValue">
+                    <el-option v-for="item in stencilList" :key="item.id" :label="item.dictValue"
+                        :value="item.dictValue">
                     </el-option>
                 </el-select>
             </template>
@@ -154,7 +162,7 @@
                 <div style="display:flex;">
                     <el-input v-model="goodsForm.partsValveName" size="small" placeholder="" :disabled="disabled">
                         <template slot="append">{{ goodsForm.partsValveSalePrice ? goodsForm.partsValveSalePrice : 0
-                        }}</template>
+                            }}</template>
                     </el-input>
                     <el-button icon="el-icon-edit" size="mini" @click="openpart(0, goodsForm.partsValveValue)"
                         :disabled="disabled"></el-button>
@@ -165,7 +173,7 @@
                 <div style="display:flex;">
                     <el-input v-model="goodsForm.partsCapName" size="small" placeholder="" :disabled="disabled">
                         <template slot="append">{{ goodsForm.partsCapSalePrice ? goodsForm.partsCapSalePrice : 0
-                        }}</template>
+                            }}</template>
                     </el-input>
                     <el-button icon="el-icon-edit" size="mini" @click="openpart(1, goodsForm.partsCapValue)"
                         :disabled="disabled"></el-button>
@@ -176,7 +184,7 @@
                 <div style="display:flex;">
                     <el-input v-model="goodsForm.partsHandleName" size="small" placeholder="" :disabled="disabled">
                         <template slot="append">{{ goodsForm.partsHandleSalePrice ? goodsForm.partsHandleSalePrice : 0
-                        }}</template>
+                            }}</template>
                     </el-input>
                     <el-button icon="el-icon-edit" size="mini" @click="openpart(2, goodsForm.partsHandleValue)"
                         :disabled="disabled"></el-button>
@@ -187,7 +195,7 @@
                 <div style="display:flex;">
                     <el-input v-model="goodsForm.partsColourName" size="small" placeholder="" :disabled="disabled">
                         <template slot="append">{{ goodsForm.partsColourSalePrice ? goodsForm.partsColourSalePrice : 0
-                        }}</template>
+                            }}</template>
                     </el-input>
                     <el-button icon="el-icon-edit" size="mini" @click="openpart(3, goodsForm.partsColourValue)"
                         :disabled="disabled"></el-button>
@@ -198,7 +206,7 @@
                 <div style="display:flex;">
                     <el-input v-model="goodsForm.partsModeName" size="small" placeholder="" :disabled="disabled">
                         <template slot="append">{{ goodsForm.partsModeSalePrice ? goodsForm.partsModeSalePrice : 0
-                        }}</template>
+                            }}</template>
                     </el-input>
                     <el-button icon="el-icon-edit" size="mini" @click="openpart(4, goodsForm.partsModeValue)"
                         :disabled="disabled"></el-button>
@@ -207,10 +215,11 @@
             //认证
             <template slot="partsAuthenticationNameForm" slot-scope="{type,disabled}">
                 <div style="display:flex;">
-                    <el-input v-model="goodsForm.partsAuthenticationName" size="small" placeholder="" :disabled="disabled">
+                    <el-input v-model="goodsForm.partsAuthenticationName" size="small" placeholder=""
+                        :disabled="disabled">
                         <template slot="append">{{ goodsForm.partsAuthenticationSalePrice ?
                             goodsForm.partsAuthenticationSalePrice : 0
-                        }}</template>
+                            }}</template>
                     </el-input>
                     <el-button icon="el-icon-edit" size="mini" @click="openpart(5, goodsForm.partsAuthenticationValue)"
                         :disabled="disabled">
@@ -222,7 +231,7 @@
                 <div style="display:flex;">
                     <el-input v-model="goodsForm.partsOtherName" size="small" placeholder="" :disabled="disabled">
                         <template slot="append">{{ goodsForm.partsOtherSalePrice ? goodsForm.partsOtherSalePrice : 0
-                        }}</template>
+                            }}</template>
                     </el-input>
                     <el-button icon="el-icon-edit" size="mini" @click="openpart(6, goodsForm.partsOtherValue)"
                         :disabled="disabled"></el-button>
@@ -1020,6 +1029,51 @@ export default {
         moveDown(row, index) {
             this.data[index] = this.data.splice(index + 1, 1, row)[0]
         },
+        inPriceAD() {
+            this.$prompt('请输入出厂价', '调整出厂价', {
+                confirmButtonText: '确定',
+                cancelButtonText: '取消',
+                closeOnClickModal: false,
+                inputValue: 0,
+                inputType: 'number'
+            }).then(({ value }) => {
+                this.data.forEach(e => {
+                    e.outFactoryPrice = priceaAjustment(e.outFactoryPrice, value, 3)
+                    e.totalValue = multiply(e.outFactoryPrice, e.orderQuantity)
+                    e.price = addPrice(e.outFactoryPrice, e.shareAmount, e.internationalAmount)
+                    e.amount = amountCal(
+                        addPrice(e.outFactoryPrice, e.shareAmount, e.internationalAmount),
+                        e.orderQuantity,
+                        e.freight,
+                        e.insurance,
+                        e.discount
+                    );
+                    e.itemMargin = grossProfitCal(
+                        e.purchaseAmount,
+                        e.partsPrice,
+                        e.outFactoryPrice,
+                        this.form.exchangeRate
+                    );
+                    e.goodsGrossProfit = goodsGrossProfitCal(
+                        e.purchaseAmount,
+                        e.partsPrice,
+                        e.outFactoryPrice,
+                        this.form.exchangeRate
+                    );
+                    // 处理单品毛利率是 -00.00 的问题
+                    if (Number(e.itemMargin) === 0) {
+                        e.itemMargin = Number(e.itemMargin) + ''
+                    }
+                    if (Number(e.goodsGrossProfit) == 0) {
+                        e.goodsGrossProfit = Number(e.goodsGrossProfit)
+                    }
+                    // 出厂价格为零，单品毛利润为零
+                    if (e.outFactoryPrice == 0) {
+                        e.itemMargin = 0
+                    }
+                })
+            })
+        },
         submitPriceAD() {
             this.visible = false;
             this.data.forEach(e => {

src/views/exportTrade/salesContract/components/goodsInfo.vue

@@ -27,7 +27,7 @@
             @click.native="dialog = true; fudaSatus = 1">通知采购</el-button>
           <el-button :type="form.documentaryStatus ? 'primary' : 'warning'" size="small" :disabled="!form.id"
             @click.native="dialog = true; fudaSatus = 2">通知跟单</el-button>
-          <el-popover placement="top" width="160" v-model="visible">
+          <!-- <el-popover placement="top" width="160" v-model="visible">
             <div style="text-align: center;">
               <el-input-number v-model="priceAD" size="small" :controls="false"></el-input-number> %
             </div>
@@ -36,13 +36,14 @@
               <el-button size="mini" type="text" @click="submitPriceAD">确定</el-button>
             </div>
             <el-button type="success" size="small" slot="reference" :disabled="detailData.status == 1">调整出厂价</el-button>
-          </el-popover>
+          </el-popover> -->
+          <el-button type="success" size="small" @click="inPriceAD" :disabled="detailData.status == 1">调整出厂价</el-button>
           <!--          <el-button type="primary" size="small" :disabled="form.status > 0 || (!form.status && form.status !== 0)" @click.native="pleaseCheck">请核数据</el-button>-->
         </el-row>
       </template>
       <template slot="headerSerial">
-        <el-button type="primary" icon="el-icon-plus" size="mini" @click.stop="addRow" :disabled="detailData.status == 1"
-          circle></el-button>
+        <el-button type="primary" icon="el-icon-plus" size="mini" @click.stop="addRow"
+          :disabled="detailData.status == 1" circle></el-button>
       </template>
       <template slot="codeHeader" slot-scope="{column}">
         <span style="color: #409EFF;cursor: pointer" @click.stop="khEdit('cname')">{{ column.label }}</span>
@@ -89,9 +90,9 @@
             :disabled="detailData.status == 1">删除</el-button>
           <div v-if="!goodsEditShow"
             style="display:flex;flex-direction: column;justify-content: center;margin-left: 10px;">
-            <el-tooltip effect="dark" content="上"  placement="left">
-              <i v-if="index != 0" :disabled="detailData.status == 1" class="el-icon-arrow-up" @click="moveUp(row, index)"
-                style="color:#409EFF;"></i>
+            <el-tooltip effect="dark" content="上" placement="left">
+              <i v-if="index != 0" :disabled="detailData.status == 1" class="el-icon-arrow-up"
+                @click="moveUp(row, index)" style="color:#409EFF;"></i>
             </el-tooltip>
             <el-tooltip effect="dark" content="下" placement="right"> <i v-if="index != (data.length - 1)"
                 :disabled="detailData.status == 1" class="el-icon-arrow-down" @click="moveDown(row, index)"
@@ -195,7 +196,8 @@
           <el-input v-model="goodsForm.partsModeName" size="small" placeholder="" :disabled="disabled">
             <template slot="append">{{ goodsForm.partsModeSalePrice ? goodsForm.partsModeSalePrice : 0 }}</template>
           </el-input>
-          <el-button icon="el-icon-edit" size="mini" @click="openpart(4, goodsForm.partsModeValue)" :disabled="disabled">
+          <el-button icon="el-icon-edit" size="mini" @click="openpart(4, goodsForm.partsModeValue)"
+            :disabled="disabled">
           </el-button>
         </div>
       </template>
@@ -203,8 +205,9 @@
       <template slot="partsAuthenticationNameForm" slot-scope="{type,disabled}">
         <div style="display:flex;">
           <el-input v-model="goodsForm.partsAuthenticationName" size="small" placeholder="" :disabled="disabled">
-            <template slot="append">{{ goodsForm.partsAuthenticationSalePrice ? goodsForm.partsAuthenticationSalePrice : 0
-            }}</template>
+            <template slot="append">{{ goodsForm.partsAuthenticationSalePrice ? goodsForm.partsAuthenticationSalePrice :
+              0
+              }}</template>
           </el-input>
           <el-button icon="el-icon-edit" size="mini" @click="openpart(5, goodsForm.partsAuthenticationValue)"
             :disabled="disabled"></el-button>
@@ -250,8 +253,8 @@
       </template>
       //分摊金额
       <template slot="shareAmountForm" slot-scope="{type,disabled}">
-        <el-input-number v-model="goodsForm.shareAmount" size="small" style="width:100%" @change="priceChange(goodsForm)"
-          :controls="false" :precision="10"></el-input-number>
+        <el-input-number v-model="goodsForm.shareAmount" size="small" style="width:100%"
+          @change="priceChange(goodsForm)" :controls="false" :precision="10"></el-input-number>
       </template>
       //分摊金额
       <template slot="internationalAmountForm" slot-scope="{type,disabled}">
@@ -1088,6 +1091,51 @@ export default {
     moveDown(row, index) {
       this.data[index] = this.data.splice(index + 1, 1, row)[0]
     },
+    inPriceAD() {
+      this.$prompt('请输入出厂价', '调整出厂价', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        closeOnClickModal: false,
+        inputValue: 0,
+        inputType: 'number'
+      }).then(({ value }) => {
+        this.data.forEach(e => {
+          e.outFactoryPrice = priceaAjustment(e.outFactoryPrice, value, 3)
+          e.totalValue = multiply(e.outFactoryPrice, e.orderQuantity)
+          e.price = addPrice(e.outFactoryPrice, e.shareAmount, e.internationalAmount)
+          e.amount = amountCal(
+            addPrice(e.outFactoryPrice, e.shareAmount, e.internationalAmount),
+            e.orderQuantity,
+            e.freight,
+            e.insurance,
+            e.discount
+          );
+          e.itemMargin = grossProfitCal(
+            e.purchaseAmount,
+            e.partsPrice,
+            e.outFactoryPrice,
+            this.form.exchangeRate
+          );
+          e.goodsGrossProfit = goodsGrossProfitCal(
+            e.purchaseAmount,
+            e.partsPrice,
+            e.outFactoryPrice,
+            this.form.exchangeRate
+          );
+          // 处理单品毛利率是 -00.00 的问题
+          if (Number(e.itemMargin) === 0) {
+            e.itemMargin = Number(e.itemMargin) + ''
+          }
+          if (Number(e.goodsGrossProfit) == 0) {
+            e.goodsGrossProfit = Number(e.goodsGrossProfit)
+          }
+          // 出厂价格为零，单品毛利润为零
+          if (e.outFactoryPrice == 0) {
+            e.itemMargin = 0
+          }
+        })
+      })
+    },
     submitPriceAD() {
       this.visible = false;
       this.data.forEach(e => {

src/views/iosBasicData/SeafreightExportF/bills/assembly/DistributionBox/containers.vue

@@ -502,7 +502,7 @@ export default {
             this.findObject(this.excelOption.column, "excelFile").action = "/api/blade-los/containers/importBoxNo?billId="+this.assemblyForm.id
             this.excelBox = true
         },
-        uploadBefore(file, done, loading) {
+        uploadBefore(file, done, loading) {681169
             done();
             loading = true;
         },
@@ -811,7 +811,7 @@ export default {
         // 一键删除
         handleDelete() {
             for (let item of this.assemblyForm.containersList) {
-                if (item.quantity > 0) return this.$message.error('箱型:' + item.cntrTypeCode + '件数大于0不允许删除')
+                if (item.quantity > 0) return this.$message.error('请先撤销,再删除配箱')
             }
             this.$confirm("确定将全部数据删除?", {
                 confirmButtonText: "确定",

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

@@ -1132,7 +1132,9 @@ export default {
         },
         // 件数聚焦
         quantityFocus() {
-            if (Number(this.assemblyForm.quantity) != Number(this.assemblyForm.waitingBoxList[0].quantity)) {
+            console.log(this.assemblyForm.waitingBoxList,11111)
+            if (this.assemblyForm.waitingBoxList){
+                if (Number(this.assemblyForm.waitingBoxList[0].quantity) == 0) {
                 this.$alert('当前数据已经均分箱量，请撤销之后再修改', '提示', {
                     confirmButtonText: '确定',
                 });
@@ -1143,6 +1145,8 @@ export default {
                 })
                 return
             }
+            }
+
         },
         // 件数监听
         quantityInput(value) {

src/views/maintenance/rebate/detailsPage.vue

@@ -35,13 +35,13 @@ export default {
                 menuWidth: 60,
                 dialogWidth: '30%',
                 index: true,
-                indexFixed:false,
+                indexFixed: false,
                 tip: false,
                 border: true,
                 viewBtn: false,
                 editBtn: false,
                 delBtn: false,
-                refreshBtn:false,
+                refreshBtn: false,
                 columnBtn: false,
                 align: 'center',
                 column: [
@@ -81,6 +81,16 @@ export default {
                         addDisplay: false,
                         editDisplay: false,
                         overHidden: true
+                    },
+                    {
+                        label: "创建人",
+                        prop: "createName",
+                        overHidden: true,
+                    },
+                    {
+                        label: "创建时间",
+                        prop: "createTime",
+                        overHidden: true,
                     }
                 ]
             },
@@ -113,9 +123,9 @@ export default {
                 loading()
                 return
             }
-            let obj={
+            let obj = {
                 ...form,
-                corpId:this.detailData.id
+                corpId: this.detailData.id
             }
             typeSave2(obj).then(res => {
                 this.$message.success('保存成功')

src/views/maintenance/rebate/index.vue

@@ -85,16 +85,6 @@ export default {
             label: "本月待到账",
             prop: "monthProfit",
             overHidden: true,
-          },
-          {
-            label: "创建人",
-            prop: "createName",
-            overHidden: true,
-          },
-          {
-            label: "创建时间",
-            prop: "createTime",
-            overHidden: true,
           }
         ]
       },

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

@@ -30,7 +30,7 @@
       <trade-card title="基础信息">
         <avue-form :option="optionForm" v-model="form" ref="form"></avue-form>
       </trade-card>
-      <trade-card title="附件信息  (图片文件像素推荐700×400)">
+      <trade-card title="附件信息  (图片文件像素推荐860×260)">
         <c-upload
           basic
           :data="form.brandFilesList"

src/views/tirePartsMall/basicData/customerInformation/js/optionList.js

@@ -24,6 +24,7 @@ export const option = {
       label: "客户名称",
       prop: "cname",
       overHidden: true,
+      width:140,
       search: true,
     },
     {

src/views/tirePartsMall/basicData/listingManagement/commodity.json

@@ -1,7 +1,7 @@
 
 {
     "align": "center",
-    "height": "auto",
+    "height": "450",
     "calcHeight": 80,
     "stripe": true,
     "tip": false,

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

@@ -69,11 +69,11 @@
       width="80%" :close-on-click-modal="false" :destroy-on-close="true" :close-on-press-escape="false"
       @close="dialogVisibles = false">
       <el-row :style="{ height: rowHeight }">
-        <el-col :span="5" style="height: 100%;overflow-y: auto">
+        <el-col :span="5">
           <div>
             <el-scrollbar>
               <basic-container>
-                <avue-tree :option="treeOption" :data="treeData" @node-click="nodeClick" />
+                <avue-tree style="height: 60vh;overflow-y: auto" :option="treeOption" :data="treeData" @node-click="nodeClick" />
               </basic-container>
             </el-scrollbar>
           </div>

src/views/tirePartsMall/financialManagement/collectionSettlement/index.vue

@@ -112,6 +112,7 @@ export default {
           // remote: true,
           // filterable:true,
           searchOrder: 1,
+          width:140,
           // type: 'select',
           overHidden: true,
           // props: {

src/views/tirePartsMall/financialManagement/pointsDetail/index.vue

@@ -99,6 +99,7 @@ export default {
                         label: '客户名称',
                         prop: 'customerName',
                         overHidden: true,
+                        width:140,
                         search: true,
                         searchslot: true,
                         searchOrder: 3

src/views/tirePartsMall/financialManagement/purchaseDetail/index.vue

@@ -187,7 +187,7 @@ export default {
                     label: '供应商名称',
                     prop: 'customerName',
                     overHidden: true,
-                    width: 100,
+                    width:140,
                     search: true,
                     searchslot: true,
                     searchOrder: 3

src/views/tirePartsMall/financialManagement/saleDetail/index.vue

@@ -161,6 +161,7 @@ export default {
                     overHidden: true,
                     search: true,
                     searchslot: true,
+                    width:140,
                     searchOrder: 3
                 }, {
                     label: '业务员',

src/views/tirePartsMall/financingManagement/financingManagement/index.vue

@@ -108,6 +108,7 @@ export default {
             overHidden: true,
             type: 'select',
             filterable: true,
+            width:140,
             remote: true,
             props: {
               label: 'cname',

src/views/tirePartsMall/pointsMall/RotationChart/detailsPage.vue

@@ -30,7 +30,7 @@
       <trade-card title="基础信息">
         <avue-form :option="optionForm" v-model="form" ref="form"></avue-form>
       </trade-card>
-      <trade-card title="附件信息  (图片文件像素推荐700×400)">
+      <trade-card title="附件信息  (图片文件像素推荐860×260)">
         <c-upload
           basic
           :data="form.brandFilesList"

src/views/tirePartsMall/pointsMall/listingManagement/commodity.json

@@ -1,6 +1,6 @@
 {
   "align": "center",
-  "height": "auto",
+  "height": "450",
   "calcHeight": 80,
   "stripe": true,
   "tip": false,

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

@@ -69,11 +69,11 @@
       width="80%" :close-on-click-modal="false" :destroy-on-close="true" :close-on-press-escape="false"
       @close="dialogVisibles = false">
       <el-row :style="{ height: rowHeight }">
-        <el-col :span="5" style="height: 100%;overflow-y: auto">
+        <el-col :span="5" >
           <div>
             <el-scrollbar>
               <basic-container>
-                <avue-tree :option="treeOption" :data="treeData" @node-click="nodeClick" />
+                <avue-tree style="height: 60vh;overflow-y: auto" :option="treeOption" :data="treeData" @node-click="nodeClick" />
               </basic-container>
             </el-scrollbar>
           </div>

src/views/tirePartsMall/pointsMall/pointsOrder/index.vue

@@ -260,6 +260,7 @@ export default {
           remote: true,
           overHidden: true,
           cell: true,
+          width:140,
           // type: 'select',
           // filterable: true,
           // props: {

src/views/tirePartsMall/purchaseService/outStorage/index.vue

@@ -246,6 +246,7 @@ export default {
           search: true,
           overHidden: true,
           cell:true,
+          width:140,
           // type: 'select',
           // filterable:true,
           // remote:true,

src/views/tirePartsMall/purchaseService/returns/index.vue

@@ -113,6 +113,7 @@ export default {
             overHidden: true,
             type: 'select',
             filterable: true,
+            width:140,
             remote: true,
             props: {
               label: 'cname',

src/views/tirePartsMall/purchasingManagement/financingProcurement/configuration/commodity.json

@@ -1,6 +1,6 @@
 {
   "align": "center",
-  "height": "auto",
+  "height": "400",
   "calcHeight": 80,
   "stripe": true,
   "tip": false,

src/views/tirePartsMall/purchasingManagement/financingProcurement/configuration/commodityxsho.json

@@ -1,6 +1,6 @@
 {
   "align": "center",
-  "height": "auto",
+  "height": "400",
   "calcHeight": 80,
   "stripe": true,
   "tip": false,

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

@@ -272,11 +272,11 @@
         <el-dialog title="选择商品" append-to-body class="el-dialogDeep" :visible.sync="dialogVisible" width="80%"
             :close-on-click-modal="false" :destroy-on-close="true" :close-on-press-escape="false" @close="closeGoods">
             <el-row :style="{ height: rowHeight }">
-                <el-col :span="5" style="height: 100%;overflow-y: auto">
+                <el-col :span="5">
                     <div>
                         <el-scrollbar>
                             <basic-container>
-                                <avue-tree :option="treeOption" :data="treeDataGoods" @node-click="nodeClick" />
+                                <avue-tree  style="height: 70vh;overflow-y: auto" :option="treeOption" :data="treeDataGoods" @node-click="nodeClick" />
                             </basic-container>
                         </el-scrollbar>
                     </div>

src/views/tirePartsMall/purchasingManagement/financingProcurement/index.vue

@@ -324,6 +324,7 @@ export default {
             search: true,
             overHidden: true,
             filterable: true,
+            width:140,
             remote: true,
             props: {
               label: 'cname',
@@ -339,6 +340,7 @@ export default {
             search: true,
             overHidden: true,
             filterable: true,
+            width:140,
             remote: true,
             props: {
               label: 'cname',

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

@@ -218,6 +218,7 @@ export default {
           search: true,
           overHidden: true,
           cell:true,
+          width:140,
           // filterable: true,
           // type: 'select',
           // remote:true,

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

@@ -246,6 +246,7 @@ export default {
           search: true,
           overHidden: true,
           cell:true,
+          width:140,
           // filterable:true,
           // type: 'select',
           // remote:true,

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

@@ -246,7 +246,7 @@
                     <div>
                         <el-scrollbar>
                             <basic-container>
-                                <avue-tree height: 60vh;overflow-y: auto :option="treeOption" :data="treeDataGoods" @node-click="nodeClick" />
+                                <avue-tree style="height: 70vh;overflow-y: auto" :option="treeOption" :data="treeDataGoods" @node-click="nodeClick" />
                             </basic-container>
                         </el-scrollbar>
                     </div>

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

@@ -304,6 +304,7 @@ export default {
           search: true,
           overHidden: true,
           cell:true,
+          width:140,
           // filterable:true,
           // remote:true,
           // props: {

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

@@ -260,6 +260,7 @@ export default {
           remote: true,
           overHidden: true,
           cell:true,
+          width:140,
           // type: 'select',
           // filterable: true,
           // props: {

src/views/tirePartsMall/salesService/inStorage/index.vue

@@ -221,6 +221,7 @@ export default {
           search: true,
           overHidden: true,
           cell:true,
+          width:140,
           // type: 'select',
           // filterable:true,
           // remote:true,

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

@@ -113,6 +113,7 @@ export default {
             overHidden: true,
             type: 'select',
             filterable: true,
+            width:140,
             remote: true,
             props: {
               label: 'cname',