Merge branch 'dev' of http://git.echepei.com/caojunjie/Smart_platform_ui into dev

src/components/fee-info/main.vue

@@ -13,7 +13,7 @@
         :cell-style="cellStyle"
       >
         <template slot="menuLeft">
-          <el-tabs v-model="activeName" @tab-click="">
+          <el-tabs v-model="activeName" @tab-click="tabHandle">
             <el-tab-pane label="应收"  name="first" :key="'first'">
             </el-tab-pane>
             <el-tab-pane label="应付" name="second" :key="'second'">
@@ -33,7 +33,7 @@
             size="small"
             @click.stop="billingDetails('收费')"
             :loading="buttonLoading"
-            :disabled="disabled || selectionList.length == 0"
+            :disabled="(financeDisabled && disabled) || selectionList.length == 0"
             v-if="selectTab === 1"
           >生成账单</el-button>
           <el-button
@@ -41,7 +41,7 @@
             size="small"
             @click.stop="billingDetails('申请')"
             :loading="buttonLoading"
-            :disabled="disabled || selectionList.length == 0"
+            :disabled="(financeDisabled && disabled) || selectionList.length == 0"
             v-if="selectTab === 2"
           >申请付费</el-button>
         </template>
@@ -318,6 +318,7 @@ export default {
       data_two:[],
       selectTab:1,
       activeName:"first",
+      enableName:"first",
       tab1:true,
       tab2:false,
       corpList: [],
@@ -351,7 +352,11 @@ export default {
     },
     billNoList:{
       type:Array
-    }
+    },
+    financeDisabled: {
+      type: Boolean,
+      default: true
+    },
   },
   filters: {
     isPercentage(val) {
@@ -787,6 +792,10 @@ export default {
         this.$refs.feeCrud.$refs.dialogColumn.columnBox = false;
       }
     },
+    tabHandle(data) {
+      // if (data.name == this.enableName) return
+      // this.enableName = data.name
+    },
   },
 };
 </script>

src/views/businessManagement/deliveryNotice/detailsPageEdit.vue

@@ -231,7 +231,7 @@
         <fee-info
           ref="feeInfo"
           :orderFeesList="advantageProjectData"
-          :disabled="detailData.seeDisabled || arrivalDisabled || deliverDisabled"
+          :disabled="detailData.seeDisabled || arrivalDisabled"
           :srcType="3"
           optionType="GN"
           itemType="发货"
@@ -1155,7 +1155,7 @@ export default {
             delete item.id
             delete item.pid
           })
-          this.form.deliveryStatus == '录入'
+          this.form.deliveryStatus = '录入'
         }
         if (type == '发货') {
           this.$nextTick(() => {

src/views/businessManagement/deliveryNotice/index.vue

@@ -23,7 +23,8 @@
                  @tree-load="treeLoad"
                  @saveColumn="saveColumn"
                  @resetColumn="resetColumn"
-                 @search-criteria-switch="searchCriteriaSwitch">
+                 @search-criteria-switch="searchCriteriaSwitch"
+                 :cell-style="cellStyle">
         <template slot="menuLeft" slot-scope="{size}">
           <el-button type="success" :size="size" @click="copyOrder" :disabled="single">复制单据</el-button>
           <el-button type="info" :size="size" icon="el-icon-printer">报 表</el-button>
@@ -195,6 +196,9 @@ export default {
     }, 100);
   },
   methods: {
+    cellStyle() {
+      return "padding:0;height:40px;";
+    },
     searchCriteriaSwitch(type){
       if (type){
         this.option.height = this.option.height - 140

src/views/businessManagement/inventoryAccount/index.vue

@@ -10,7 +10,8 @@
         :search.sync="search"
         :table-loading="loading"
         @on-load="onLoad"
-        @row-update="rowUpdate">
+        @row-update="rowUpdate"
+        :cell-style="cellStyle">
         <template slot-scope="scope" slot="lockingQuantity">
           <span v-if="Number(scope.row.lockingQuantity) > 0" style="color: #409EFF;cursor: pointer" @click.stop="viewCell(scope.row,scope.index)">{{ scope.row.lockingQuantity }}</span>
           <span v-else>{{ scope.row.lockingQuantity }}</span>
@@ -136,6 +137,9 @@ export default {
     }
   },
   methods: {
+    cellStyle() {
+      return "padding:0;height:40px;";
+    },
     derivation() {
       this.$confirm("是否下载模板?", "提示", {
         confirmButtonText: "确定",

src/views/businessManagement/purchaseOrder/index.vue

@@ -21,7 +21,8 @@
                  @tree-load="treeLoad"
                  @saveColumn="saveColumn"
                  @resetColumn="resetColumn"
-                 @search-criteria-switch="searchCriteriaSwitch">
+                 @search-criteria-switch="searchCriteriaSwitch"
+                 :cell-style="cellStyle">
         <template slot="menuLeft" slot-scope="{size}">
           <el-button type="success" :size="size" icon="el-icon-copy-document" @click="copyOrder" :disabled="single">复制单据</el-button>
           <el-button type="info" :size="size" icon="el-icon-printer">报 表</el-button>
@@ -239,6 +240,9 @@ export default {
     }
   },
   methods: {
+    cellStyle() {
+      return "padding:0;height:40px;";
+    },
     searchCriteriaSwitch(type){
       if (type){
         this.option.height = this.option.height - 90

src/views/businessManagement/receipt/index.vue

@@ -23,7 +23,8 @@
                  @tree-load="treeLoad"
                  @saveColumn="saveColumn"
                  @resetColumn="resetColumn"
-                 @search-criteria-switch="searchCriteriaSwitch">
+                 @search-criteria-switch="searchCriteriaSwitch"
+                 :cell-style="cellStyle">
         <template slot="menuLeft" slot-scope="{size}">
           <el-button type="success" :size="size" @click="copyOrder" :disabled="single">复制单据</el-button>
           <el-button type="info" :size="size" icon="el-icon-printer">报 表</el-button>
@@ -197,6 +198,9 @@ export default {
     }, 100);
   },
   methods: {
+    cellStyle() {
+      return "padding:0;height:40px;";
+    },
     searchCriteriaSwitch(type){
       if (type){
         this.option.height = this.option.height - 190

src/views/businessManagement/salesOrder/detailsPageEdit.vue

@@ -415,12 +415,13 @@
         <fee-info
           ref="feeInfo"
           :orderFeesList="advantageProjectData"
-          :disabled="detailData.seeDisabled || form.status < 3"
+          :disabled="detailData.seeDisabled || form.status >= 3"
           feeUrl="/blade-purchase-sales/orderfees/update"
           optionType="GN"
           itemType="销售"
           @beforeFinance="beforeFinance"
           :corpId="form.corpId"
+          :financeDisabled="false"
         />
 <!--        <containerTitle title="费用明细"></containerTitle>-->
 <!--        <basic-container style="margin-bottom: 10px">-->
@@ -3360,6 +3361,9 @@ export default {
         this.saveLoading = false
       })
     },
+    cellStyle() {
+      return "padding:0;height:40px;";
+    },
   },
 }
 </script>

src/views/businessManagement/salesOrder/index.vue

@@ -29,7 +29,7 @@
                  @search-criteria-switch="searchCriteriaSwitch"
       >
         <template slot-scope="scope" slot="expand">
-          <el-table :data="scope.row.insideList" v-loading="scope.row.loading">
+          <el-table :data="scope.row.insideList" v-loading="scope.row.loading" :cell-style="tableRowClassName">
             <el-table-column  label="产品分类" prop="priceCategory" align="center" show-overflow-tooltip width="200"></el-table-column>
             <el-table-column  label="价格类别" prop="priceType" align="center" show-overflow-tooltip width="180"></el-table-column>
             <el-table-column  label="商品名称" prop="cname" align="center" show-overflow-tooltip width="120"></el-table-column>
@@ -223,7 +223,7 @@ export default {
       } else if (row.orderStatus == '未成交') {
         return 'warning-row'
       }
-      return '';
+      return "padding:0;height:40px;";
     },
     //删除列表后面的删除按钮触发触发(row, index, done)
     rowDel(row, index, done) {