浏览代码

bug 修复

lilei 4 年之前
父节点
当前提交
5ada160c73

+ 3 - 2
src/views/basicData/expenseType/editModal.vue

@@ -123,9 +123,10 @@ export default {
         this.$emit('close')
         this.$refs.ruleForm.resetFields()
       } else {
+        console.log(this.nowData)
         //  获取父级分类 名称
-        if (this.nowData && this.nowData.namePaths) {
-          this.parentType = this.nowData.namePaths.replace(/,/g, '>') + '>' + this.nowData.name
+        if (this.nowData) {
+          this.parentType = (this.nowData.namePaths ? (this.nowData.namePaths.replace(/,/g, '>') + '>') : '') + this.nowData.name
         } else {
           this.parentType = ''
         }

+ 1 - 1
src/views/power/role/roleList.vue

@@ -16,7 +16,7 @@
           </a-col>
           <a-col :md="6" :sm="24">
             <a-form-item label="状态">
-              <v-select code="CHECK_ENABLE_STATE" v-model="queryParam.isEnable" allowClear placeholder="请选择状态" id="roleList-isEnable"></v-select>
+              <v-select code="ENABLE_FLAG" v-model="queryParam.isEnable" allowClear placeholder="请选择状态" id="roleList-isEnable"></v-select>
             </a-form-item>
           </a-col>
           <a-col :md="6" :sm="24">

+ 1 - 1
src/views/power/user/userList.vue

@@ -15,7 +15,7 @@
           </a-col>
           <a-col :md="6" :sm="24">
             <a-form-item label="状态">
-              <v-select code="CHECK_ENABLE_STATE" v-model="queryParam.loginFlag" allowClear placeholder="请选择状态"></v-select>
+              <v-select code="ENABLE_FLAG" v-model="queryParam.loginFlag" allowClear placeholder="请选择状态"></v-select>
             </a-form-item>
           </a-col>
           <a-col :md="4" :sm="24">

+ 1 - 1
src/views/salesManagement/salesReturn/queryPart.vue

@@ -47,7 +47,7 @@
       :data="loadData"
       :customRow="handleClickRow"
       :defaultLoadData="false"
-      :scroll="{ x: grabFlag == '1' ? 1700 : 860, y: 300 }"
+      :scroll="{ x: grabFlag == '1' ? 1100 : 660, y: 300 }"
       bordered>
       <!-- 价格 -->
       <template slot="price" slot-scope="text, record">

+ 1 - 1
src/views/salesManagement/salesReturn/salesReturnGrabEdit.vue

@@ -88,7 +88,7 @@
         :rowKey="(record) => record.id"
         :columns="columns"
         :data="loadData"
-        :scroll="{ x: 1500, y: 300 }"
+        :scroll="{ x: 1770, y: 300 }"
         bordered>
         <!-- 本次退货数量 -->
         <template slot="qty" slot-scope="text, record">