Browse Source

修改乱七八糟

master
陈薪名 1 year ago
parent
commit
f1a2453cce
  1. 2
      src/components/BasicForm/src/BasicForm.vue
  2. 3
      src/components/Detail/src/Detail.vue
  3. 6
      src/components/rowDrop/index.vue
  4. 4
      src/views/wms/basicDataManage/itemManage/productionlineitem/index.vue
  5. 1
      src/views/wms/purchaseclaimRequestMain/index.vue

2
src/components/BasicForm/src/BasicForm.vue

@ -254,7 +254,7 @@ const open = async (type: string, row?: any, masterParmas?: any) => {
}
}
}
if (row.id || row.masterId) {
if (row?.id || row?.masterId) {
formLoading.value = true
try {
nextTick(() => {

3
src/components/Detail/src/Detail.vue

@ -23,6 +23,7 @@
@button-base-click="buttonBaseClick"
:routeName="routeName"
@searchFormClick="searchFormClick"
:allSchemas="detailAllSchemas"
/>
<Descriptions v-if="isBasic" :data="detailData" :schema="allSchemas.detailSchema" :columns="2" />
<Table
@ -284,7 +285,7 @@ const { tableObject, tableMethods } = useTable({
const { getList } = tableMethods
//
const HeadButttondata = ref([
defaultButtons.defaultAddBtn({ hide: masterParmas.value.status=='REQUEST_NEW'?false:true}), //
defaultButtons.defaultAddBtn(null), //
defaultButtons.defaultFilterBtn(null), //
])
//

6
src/components/rowDrop/index.vue

@ -119,7 +119,7 @@ const dragover = (e) => {
//
const initSelectSta = () => {
RedisApi.getRedis(routeName.value).then(res => {
const _myTableColumns = props.allSchemas.tableColumns
const _myTableColumns = props.allSchemas?.tableColumns
//
if (res) {
checkedDataList.value = []
@ -140,7 +140,7 @@ const initSelectSta = () => {
}
})
//
_myTableColumns.forEach((myTableItem, index) => {
_myTableColumns?.forEach((myTableItem, index) => {
//
//
if (index != 0) {
@ -157,7 +157,7 @@ const initSelectSta = () => {
} else { //
checkedDataList.value = []
allData.value = []
_myTableColumns.forEach((item, index) => {
_myTableColumns?.forEach((item, index) => {
//
//
if (index != 0) {

4
src/views/wms/basicDataManage/itemManage/productionlineitem/index.vue

@ -67,8 +67,8 @@ import * as ProductionLineCodeApi from '@/api/wms/productionline'
import BasicForm from '@/components/BasicForm/src/BasicForm.vue'
// import { Itembasic, Productionline, Location } from '@/utils/disposition/tableColumns'
import { Itembasic } from './../itembasic/itembasic.data'
import { Productionline } from './../productionline/productionline.data'
import { Location } from './../location/location.data'
import { Productionline } from './../../factoryModeling/productionline/productionline.data'
import { Location } from './../../factoryModeling/location/location.data'
import { Productionlineitem, ProductionlineitemRules } from './productionlineitem.data'
import * as defaultButtons from '@/utils/disposition/defaultButtons'
import TableHead from '@/components/TableHead/src/TableHead.vue'

1
src/views/wms/purchaseclaimRequestMain/index.vue

@ -13,6 +13,7 @@
:routeName="routeName"
@updataTableColumns="updataTableColumns"
@searchFormClick="searchFormClick"
:allSchemas="PurchaseclaimRequestMain.allSchemas"
/>
<!-- 列表 -->

Loading…
Cancel
Save