Merge remote-tracking branch 'origin/master'

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingMapper.xml

@@ -130,12 +130,12 @@
         select name companyInvoicingName, sid companyInvoicingSid, purchaseSystemSid, purchaseSystemName
         from fin_company_invoicing
         where useOrgSid = #{useOrgSid}
-          and length(purchaseSystemSid) > 0
+          and length(purchaseSystemSid) > 0 and isDelete = 0
     </select>
 
     <select id="getAppInvoicingList" resultType="com.yxt.anrui.fin.api.fincompanyinvoicing.AppCompanyInvoicingVo">
         select name dictValue,sid as id,purchaseSystemSid,purchaseSystemName from fin_company_invoicing where useOrgSid
-        = #{useOrgSid} and length(purchaseSystemSid)>0
+        = #{useOrgSid} and length(purchaseSystemSid)>0 and isDelete = 0
         <if test="search != null and search != ''">
             and name like concat('%',#{search},'%')
         </if>

yxt-as-ui/src/views/warehouse/warehouseArea/index.vue

@@ -56,8 +56,8 @@
             </el-table-column> -->
             <el-table-column label="是否可用" align="center" width="140">
               <template slot-scope="scope">
-                <el-switch v-model="scope.row.usageStatus" active-text="是" inactive-text="否" active-value="0"
-                  inactive-value="1" @change="enableChange(scope.row.sid,scope.row.usageStatus)" />
+                <el-switch v-model="scope.row.usageStatus" active-text="是" inactive-text="否" active-value="1"
+                  inactive-value="0" @change="enableChange(scope.row.sid,scope.row.usageStatus)" />
               </template>
             </el-table-column>
             <el-table-column prop="areaName" label="库区名称" align="center" />