LAPTOP-FO2T5SIU\35838 6 月之前
父节点
当前提交
b0ef1e17f7

+ 1 - 0
src/views/customerManagement/roomChose/addHouse.vue

@@ -38,6 +38,7 @@
             <el-table-column label="操作" width="180">
               <template scope="scope">
                 <el-button
+                  :disabled="scope.row.status != '1'"
                   size="mini"
                   type="text"
                   @click="handleDelete(scope.$index)"

+ 7 - 7
src/views/customerManagement/roomChose/roomIndex.vue

@@ -191,13 +191,13 @@
               <el-table-column label="可售状态" prop="saleStatusStr" />
               <el-table-column label="已售状态" prop="soldStatusStr" />
               <el-table-column label="选房状态" prop="isChooseStr" />
-              <el-table-column label="操作" header-align="center" width="250">
-                <template scope="scope">
-                  <!--                  <el-button size="mini" type="text" @click="handleEdit(scope.row)">编辑</el-button>-->
-                  <!--                  <el-button size="mini" type="text" @click="handleDelete(scope.row)">删除</el-button>-->
-                  <el-button size="mini" type="text" @click="handleView(scope.row)">查看</el-button>
-                </template>
-              </el-table-column>
+<!--              <el-table-column label="操作" header-align="center" width="250">-->
+<!--                <template scope="scope">-->
+<!--                  &lt;!&ndash;                  <el-button size="mini" type="text" @click="handleEdit(scope.row)">编辑</el-button>&ndash;&gt;-->
+<!--                  &lt;!&ndash;                  <el-button size="mini" type="text" @click="handleDelete(scope.row)">删除</el-button>&ndash;&gt;-->
+<!--                  <el-button size="mini" type="text" @click="handleView(scope.row)">查看</el-button>-->
+<!--                </template>-->
+<!--              </el-table-column>-->
             </el-table>
             <div class="table-page">
               <el-pagination

+ 14 - 13
src/views/invoice/components/addInvoice.vue

@@ -101,19 +101,20 @@
               <el-col :span="4" class="col-txt"><span>税率</span></el-col>
               <el-col :span="20" class="col-input">
                 <el-form-item prop="invoiceTax">
-                  <el-select
-                    v-model="form.invoiceTax"
-                    filterable
-                    placeholder="请选择"
-                    popper-class="statistic_base"
-                  >
-                    <el-option
-                      v-for="item in dc_data.invoice_tax"
-                      :key="item.value"
-                      :label="item.label"
-                      :value="item.value"
-                    />
-                  </el-select>
+                  <!--                  <el-select-->
+                  <!--                    v-model="form.invoiceTax"-->
+                  <!--                    filterable-->
+                  <!--                    placeholder="请选择"-->
+                  <!--                    popper-class="statistic_base"-->
+                  <!--                  >-->
+                  <!--                    <el-option-->
+                  <!--                      v-for="item in dc_data.invoice_tax"-->
+                  <!--                      :key="item.value"-->
+                  <!--                      :label="item.label"-->
+                  <!--                      :value="item.value"-->
+                  <!--                    />-->
+                  <!--                  </el-select>-->
+                  <el-input v-model="form.invoiceTax" readonly />
                 </el-form-item>
               </el-col>
             </el-row>

+ 1 - 1
src/views/parkAssets/parkRoom/index.vue

@@ -572,7 +572,7 @@ export default {
                     jsonArray.push(item.roomNo)
                     jsonArray.push(item.actualInternalArea)
                     jsonArray.push(item.actualBuildArea)
-                    jsonArray.push(item.roomUse)
+                    jsonArray.push(item.roomUseStr)
                     jsonArray.push(item.decorationSituationStr)
                     jsonArray.push(item.saleStatusStr)
                     jsonArray.push(item.soldStatusStr)

+ 3 - 0
src/views/signingManagement/contractManagement/index.vue

@@ -165,6 +165,9 @@ export default {
         this.initDict(this.dc_key).then((res) => {
             this.getData()
         })
+        if (this.fromAddress === 'addInvoice') {
+            this.search.contractStatus = '2'
+        }
     },
     methods: {