Browse Source

Merge branch 'master_hella' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-ui into master_hella

master_hella_20240701
yufei0306 7 months ago
parent
commit
0f9e280397
  1. 38
      src/views/mes/orderDay/components/schedule.vue
  2. 4
      src/views/mes/orderDay/index.vue
  3. 1
      src/views/qms/basicDataManage/inspectionScheme/addForm.vue
  4. 2
      src/views/qms/basicDataManage/inspectionScheme/index.vue
  5. 1
      src/views/qms/basicDataManage/inspectionScheme/inspectionScheme.data.ts
  6. 2
      src/views/qms/inspection/inspectionRequest/index.vue
  7. 22
      src/views/qms/inspection/inspectionRequest/inspectionRequestMain.data.ts
  8. 11
      src/views/qms/sampleCode/sampleCode.data.ts
  9. 35
      src/views/qms/samplingProcess/samplingProcess.data.ts
  10. 1
      src/views/wms/productionManage/productputaway/productputawayRequestMain/productputawayRequestMain.data.ts
  11. 1
      src/views/wms/productionManage/productrepair/productrepairRequestMain/productrepairRequestMain.data.ts

38
src/views/mes/orderDay/components/schedule.vue

@ -36,24 +36,25 @@
<el-table :data="processData" ref="tableProcess" style="width: 100%; height: 80%" @cell-dblclick="userAddNode">
<el-table-column prop="code" label="工序编码" />
<el-table-column prop="name" label="工序名称" />
<el-table-column prop="opera" label="" width="60">
<!-- <el-table-column prop="opera" label="" width="60">
<template #header>
<span>操作</span>
</template>
<!-- <template #default="scope">
<template #default="scope">
<el-button type="danger" size="mini" text @click="deleteNode(scope.row)"
>移除</el-button
>
</template> -->
</el-table-column>
</template>
</el-table-column> -->
</el-table>
</el-card>
</el-aside>
<el-main style="height: 320px;width: calc(100% - 980px);padding: 0px; margin:0px 20px">
<el-main style="height: 480px; width: calc(100% - 980px);padding: 0px; margin:0px 20px">
<div ref="graphContainer"></div
></el-main>
<el-aside width="640px">
<el-tabs v-model="activeName">
<el-tag>工序编码{{currentNode.id}} -工序名称:{{currentNode.attrs.title.text }}</el-tag>
<el-tabs v-model="activeName" >
<el-tab-pane label="工序工位" name="workstation">
<el-table :data="workstationData" ref="tableWorkstations" style="width: 100%; height: 80%">
<el-table-column prop="stationName" label="工位名称" />
@ -76,7 +77,17 @@
<el-table-column prop="sourceMaterialCounts" label="需求物料数">
<template #default="scope">{{ getTotalcounts(scope.row.repMaterialCounts) }}</template>
</el-table-column>
<el-table-column prop="replaceFlag" label="是否替换" />
<el-table-column prop="replaceFlag" label="是否替换" >
<template #default="scope">
<el-switch
v-model="scope.row.replaceFlag"
active-color="#13ce66"
inactive-color="#ff4949"
active-text="是"
inactive-text="否"
/>
</template>
</el-table-column>
</el-table>
</el-tab-pane>
<el-tab-pane label="工序人员" name="workers">
@ -211,7 +222,7 @@ const graphContainer = ref<HTMLElement | null>(null)
const graph = ref<Graph>()
const message = useMessage() //
const { t } = useI18n() //
const activeName = ref('process')
const activeName = ref('workstation')
const formLoading = ref(false)
const dialogFormVisibleUser = ref(false)
const processData = ref([])
@ -249,6 +260,7 @@ const workstationData=ref([])
const dialogVisible = ref(false) //
const dialogTitle = ref('') //
const graphJson =ref()
const currentNode = ref({})
/*班组数据*/
const teamData = ref([])
/*班组弹窗搜索条件*/
@ -309,9 +321,9 @@ const open = async (type: string, row?: any, titleName?: any) => {
queryParams.batchCode=row.batchCode
//
if (titleName) {
dialogTitle.value = t('action.' + titleName)
dialogTitle.value = titleName
} else {
dialogTitle.value = t('action.' + type)
dialogTitle.value = type
}
nextTick?.(() => {
graph.value = createGraph(graphContainer.value as HTMLElement, true, 240, 320)
@ -388,6 +400,7 @@ const nodeClick = (e, x, y, node, view) => {
getConfigProcessWorker(node.id)
getConfigProcessEquipment(node.id)
processCode.value = node.id
currentNode.value=node
}
const searchTableRef = ref()
@ -453,9 +466,10 @@ const doPublishPlan= ()=>{
endTime: detailData.value.endTime,
taskMode: detailData.value.taskMode
}
//console.log("-------",data)
let res = OrderDayApi.publishPlan(data)
if(res.code==0){
console.log("---doPublishPlan-- 458--",res)
if(res.code===0){
message.success("计划发布成功")
}else {
message.error(res.msg)

4
src/views/mes/orderDay/index.vue

@ -264,7 +264,7 @@ const openForm = (type: string, row?: any) => {
const formsSuccess = async (formType,data) => {
if (formType === 'create') {
let ret=await OrderDayApi.createOrderDay(data)
let ret= OrderDayApi.createOrderDay(data)
if(ret===undefined || ret===null){
message.error(t('common.networkError'))
}else{
@ -272,7 +272,7 @@ const formsSuccess = async (formType,data) => {
}
} else {
let ret=await OrderDayApi.updateOrderDay(data)
let ret= OrderDayApi.updateOrderDay(data)
if(ret.code==0){
message.success(t('common.updateSuccess'))
}else{

1
src/views/qms/basicDataManage/inspectionScheme/addForm.vue

@ -845,6 +845,7 @@ const open = async (type: string, row?: any, masterParmas?: any, titleName?: any
available: 'TRUE',
dynamicUpdateCode:'',
description:"",
samplePieceSize:"",
isWhole:"TRUE",
process: []
}

2
src/views/qms/basicDataManage/inspectionScheme/index.vue

@ -180,6 +180,8 @@ const submitForm = async (formType,data) => {
inspectionLevel: data.inspectionLevel,
effectiveDate: data.effectiveDate,
expirationDate: data.expirationDate,
samplePieceSize: data.samplePieceSize,
isWhole: data.isWhole,
available: data.available,
content:JSON.stringify(data.process)
}

1
src/views/qms/basicDataManage/inspectionScheme/inspectionScheme.data.ts

@ -67,6 +67,7 @@ export const InspectionTemplateRules = reactive({
quantifyQuantifyCode: [
{ required: true, message: '请输入选择集编码', trigger: 'blur' }
],
isWhole: [{ required: true}],
})
export const InspectionSchemeMain = useCrudSchemas(reactive<CrudSchema[]>([
{

2
src/views/qms/inspection/inspectionRequest/index.vue

@ -61,7 +61,7 @@
<script setup lang="ts">
import download from '@/utils/download'
import { InspectionMain, InspectionMainRules,InspectionRequestPackage,InspectionRequestPackageRules } from './inspectionMain.data'
import { InspectionMain, InspectionMainRules,InspectionRequestPackage,InspectionRequestPackageRules } from './inspectionRequestMain.data'
import * as InspectionMainApi from '@/api/qms/inspectionRequest'
import * as InspectionRequestPackageApi from '@/api/qms/inspectionRequest/InspectionRequestPackage'
import * as defaultButtons from '@/utils/disposition/defaultButtons'

22
src/views/qms/inspection/inspectionRequest/inspectionMain.data.ts → src/views/qms/inspection/inspectionRequest/inspectionRequestMain.data.ts

@ -338,8 +338,26 @@ export const InspectionMain = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
}
},
{
}, {
label: '检验水平',
field: 'inspectionLevel',
sort: 'custom',
dictType: DICT_TYPE.INSPECTION_LEVEL,
dictClass: 'string',
table: {
width: 150
},
isSearch: true,
}, {
label: 'aql',
field: 'aql',
sort: 'custom',
dictType: DICT_TYPE.BASIC_AQL,
dictClass: 'string',
table: {
width: 150
}
}, {
label: '操作',
field: 'action',
isForm: false,

11
src/views/qms/sampleCode/sampleCode.data.ts

@ -7,9 +7,14 @@ import {validateNum} from "@/utils/validator";
export const SampleCodeRules = reactive({
code: [required],
batchLowLimiting: [{ validator:validateNum, message: '请输入整数', trigger: 'blur'}],
batchUpperLimiting: [
{ required:true, message: '该项为必填', trigger: 'blur'},
{ validator:validateNum, message: '请输入整数', trigger: 'blur'}],
batchUpperLimiting: [{ required:true, message: '该项为必填', trigger: 'blur'}, { validator:validateNum, message: '请输入整数', trigger: 'blur'}],
s1: [{ required }],
s2: [{ required }],
s3: [{ required }],
s4: [{ required }],
g1: [{ required }],
g2: [{ required }],
g3: [{ required }]
})
const samplingSchemeList = await getSamplingScheme()
export const SampleCode = useCrudSchemas(reactive<CrudSchema[]>([

35
src/views/qms/samplingProcess/samplingProcess.data.ts

@ -29,10 +29,7 @@ export const SamplingProcess = useCrudSchemas(reactive<CrudSchema[]>([
label: '描述',
field: 'description',
sort: 'custom',
isSearch: true,
table: {
width: 175
}
isSearch: true
},
{
label: '取样类型',
@ -43,31 +40,22 @@ export const SamplingProcess = useCrudSchemas(reactive<CrudSchema[]>([
isSearch: true,
form: {
component: 'Select'
},
table: {
width: 140
}
},
{
label: '评估模式',
field: 'evaluationMode',
sort: 'custom',
dictType: DICT_TYPE.EVALUATION_MODE,
dictClass: 'string', // 默认都是字符串类型其他暂不考虑
form: {
component: 'Select'
},
table: {
width: 140
}
dictType: DICT_TYPE.EVALUATION_MODE,
dictClass: 'string', // 默认都是字符串类型其他暂不考虑
form: {
component: 'Select'
}
},
{
label: '样品份数',
field: 'sampleQty',
sort: 'custom',
table: {
width: 140
}
sort: 'custom'
},
{
label: '采样方案编码',
@ -82,9 +70,6 @@ export const SamplingProcess = useCrudSchemas(reactive<CrudSchema[]>([
valueField: 'code'
},
}
},
table: {
width: 175
}
},
{
@ -104,9 +89,6 @@ export const SamplingProcess = useCrudSchemas(reactive<CrudSchema[]>([
dateFormat: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'x',
}
},
table: {
width: 175
}
},
{
@ -122,9 +104,6 @@ export const SamplingProcess = useCrudSchemas(reactive<CrudSchema[]>([
inactiveValue: 'FALSE',
activeValue: 'TRUE'
}
},
table: {
width: 110
}
},
{

1
src/views/wms/productionManage/productputaway/productputawayRequestMain/productputawayRequestMain.data.ts

@ -774,6 +774,7 @@ export const ProductputawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
field: 'action',
isDetail: false,
isForm: false ,
hiddenInMain:true,
table: {
width: 150,
fixed: 'right'

1
src/views/wms/productionManage/productrepair/productrepairRequestMain/productrepairRequestMain.data.ts

@ -1006,6 +1006,7 @@ export const ProductrepairRequestDetaila = useCrudSchemas(reactive<CrudSchema[]>
{
label: '操作',
field: 'action',
hiddenInMain:true,
isDetail: false,
isForm: false ,
table: {

Loading…
Cancel
Save