haoxuan
2023-10-18 9e9adeb2711ce710c677f4653f12bc335c098737
修改 上架规则 编辑状态和 不编辑状态的冲突
2个文件已修改
6 ■■■■ 已修改文件
src/components/makepager/CommonFormTableView.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/warehouseManage/listingRules/index.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/makepager/CommonFormTableView.vue
@@ -149,7 +149,7 @@
              <!-- 位置 -->
              <el-form-item v-else-if="item.location" label=" " :prop="'tableData.' + scope.$index + '.' + item.prop">
                <div class="custom-name">
                  <span v-if="scope.row.isEdit || scope.row.editable">{{ scope.row[item.prop] }}</span>
                  <span v-if="scope.row.isEdit || scope.row.editable">{{ scope.row[item.prop].label }}</span>
                  <el-select
                    v-else
                    v-model="scope.row[item.prop]"
src/views/warehouseManage/listingRules/index.vue
@@ -122,8 +122,8 @@
          const list = res.data.map((item) => {
            return {
              ...item,
              areaName: item.area.jointName,
              subLocation: item.location.jointName,
              areaName: {label:item.area.jointName,value:item.area.id},
              subLocation: {label:item.location.jointName,value:item.location.id},
              productName: item.product.name,
              productCategory: item.productCategory.name,
              isSet: false,