LAPTOP-FO2T5SIU\35838 hace 5 meses
padre
commit
068b4e96b4

+ 19 - 0
src/views/customerManagement/numberManagement/index.vue

@@ -63,6 +63,25 @@
           placeholder="请输入"
           class="ch-input ch-input-size"
         />
+        <span>
+          &nbsp;&nbsp;&nbsp;
+        </span>
+        <el-date-picker
+          v-model="search.roomSelectionDateFrom"
+          value-format="yyyy-MM-dd"
+          format="yyyy-MM-dd"
+          size="small"
+          type="date"
+          placeholder="选房开始日期"
+        />
+        <el-date-picker
+          v-model="search.roomSelectionDateTo"
+          value-format="yyyy-MM-dd"
+          format="yyyy-MM-dd"
+          size="small"
+          type="date"
+          placeholder="选房结束日期"
+        />
       </el-col>
       <el-col :span="24">
         <div style="display: flex;align-items: center">

+ 1 - 1
src/views/invoice/components/addInvoice.vue

@@ -207,7 +207,7 @@ export default {
             this.baseRequest('getBankTaxRateByFloor_2', data).then(res => {
                 if (res.data) {
                     this.form.invoiceSellerBank = res.data.invoiceSellerBank
-                    this.form.invoiceTax = res.data.invoiceTax == null ? '0' : res.data.invoiceTax
+                    // this.form.invoiceTax = res.data.invoiceTax == null ? '0' : res.data.invoiceTax
                 }
             })
         },

+ 26 - 24
src/views/parkAssets/parkFloorDisc/index.vue

@@ -5,31 +5,33 @@
         <el-card shadow="hover">
           <el-tag class="full space-vertical">当前所选:载体结构</el-tag>
           <!-- @node-click="handleDeptNodeClick" -->
-          <el-tree
-            ref="selectTree"
-            :render-content="renderContent"
-            :data="DeptTree"
-            node-key="id"
-            :indent="deptTreeIndent"
-            accordion
-            :expand-on-click-node="expandDeptClick"
-            :default-expanded-keys="expandedDeptKey"
-            node-click="(data, node, item) => nodeClick(data, node, item)"
-            @node-click="getCheckedNodes"
-          >
-            <span slot-scope="{ node, data }" class="custom-tree-node">
-              <span>
-                <i v-if="data.level == 0" class="el-icon-s-home" />
-                <i v-else-if="data.level == 1" class="el-icon-menu" />
-                <i v-else class="el-icon-link" />
-                {{ node.label }}
-              </span>
-              <span v-if="data.level == 0">
-                <el-link class="space" type="primary" @click="() => unFoldAll()">展开</el-link>
-                <el-link class="space" type="primary" @click="() => collapseAll()">折叠</el-link>
+          <div style="overflow-x: auto;">
+            <el-tree
+              ref="selectTree"
+              :render-content="renderContent"
+              :data="DeptTree"
+              node-key="id"
+              :indent="deptTreeIndent"
+              accordion
+              :expand-on-click-node="expandDeptClick"
+              :default-expanded-keys="expandedDeptKey"
+              node-click="(data, node, item) => nodeClick(data, node, item)"
+              @node-click="getCheckedNodes"
+            >
+              <span slot-scope="{ node, data }" class="custom-tree-node">
+                <span>
+                  <i v-if="data.level == 0" class="el-icon-s-home" />
+                  <i v-else-if="data.level == 1" class="el-icon-menu" />
+                  <i v-else class="el-icon-link" />
+                  {{ node.label }}
+                </span>
+                <span v-if="data.level == 0">
+                  <el-link class="space" type="primary" @click="() => unFoldAll()">展开</el-link>
+                  <el-link class="space" type="primary" @click="() => collapseAll()">折叠</el-link>
+                </span>
               </span>
-            </span>
-          </el-tree>
+            </el-tree>
+          </div>
         </el-card>
       </div>
       <div class="block-r">