| src/pages/inspectionUpload/index.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/pages/productionManagement/operationScheduling/components/formDia.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/pages/productionManagement/operationScheduling/index.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/pages/productionManagement/productionReporting/index.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
src/pages/inspectionUpload/index.vue
@@ -702,10 +702,8 @@ // 获取当前分类的文件列表 const getCurrentFiles = () => { console.log('currentUploadType',currentUploadType.value) switch (currentUploadType.value) { case 'before': console.log('beforeModelValue',beforeModelValue.value) return beforeModelValue.value case 'after': return afterModelValue.value @@ -817,7 +815,6 @@ infoData.value.storageBlobDTO = arr; // 添加异常状态信息 infoData.value.hasException = hasException.value; const result = await uploadInspectionTask({...infoData.value}); // 检查提交结果 @@ -940,7 +937,19 @@ const getAttachmentsByType = (typeValue) => { return attachmentList.value.filter(file => file.type === typeValue) || [] } // 获取type值 const getTabType = () => { switch (currentUploadType.value) { case 'before': return 0 case 'after': return 1 case 'issue': return 2 default: return 0 } } // 获取当前查看类型的附件 const getCurrentViewAttachments = () => { switch (currentViewType.value) { @@ -1299,13 +1308,12 @@ filePath: filePath, name: 'files', formData: { type: uploadStatusType.value || 0 type: getTabType() || 0 }, header: { 'Authorization': `Bearer ${token}` } }; console.log('uploadParams',uploadParams) const uploadTask = uni.uploadFile({ ...uploadParams, success: (res) => { @@ -1385,7 +1393,6 @@ // 上传成功回调 const handleUploadSuccess = (res, file) => { console.log(res,file) if (res.code === 200 && res.data && Array.isArray(res.data) && res.data.length > 0) { const uploadedFile = res.data[0];
@@ -26,22 +26,38 @@ <up-input v-model="row.type" placeholder="请输入" /> </up-form-item> <up-form-item label="排产数量" label-width="80"> <up-input v-model.number="row.schedulingNum" type="number" placeholder="请输入" /> <uni-number-box v-model="row.schedulingNum" :min="0" :step="0.1" style="width: 100%;" background="#2979FF" color="#fff" /> </up-form-item> <up-form-item label="工时定额" label-width="80"> <up-input v-model.number="row.workHours" type="number" placeholder="请输入" /> <uni-number-box v-model="row.workHours" :min="0" :step="0.1" style="width: 100%;" background="#2979FF" color="#fff" /> </up-form-item> <up-form-item label="排产日期" label-width="80" @click="openDatePicker(index)"> <up-input v-model="row.schedulingDate" placeholder="选择日期" readonly @click="openDatePicker(index)" /> <up-form-item label="排产日期" label-width="80"> <view class="select-box" @click.stop="openDatePicker(index)"> <view class="label" :class="[row.schedulingDate?'':'un-value']"> {{row.schedulingDate||'选择日期'}} </view> <view class="value"> <up-icon name="calendar"></up-icon> </view> </view> <!-- <up-input v-model="row.schedulingDate" placeholder="选择日期" :border="false" readonly @click="openDatePicker(index)" /> <template #right> <up-icon name="calendar" @click="openDatePicker(index)"></up-icon> </template> </template> --> </up-form-item> <up-form-item label="排产人" label-width="80" @click="openUserPicker(index)"> <up-input v-model="row.schedulingUserName" placeholder="选择人员" readonly @click="openUserPicker(index)" /> <up-form-item label="排产人" label-width="80"> <view class="select-box" @click.stop="openUserPicker(index)"> <view class="label" :class="[row.schedulingUserName?'':'un-value']"> {{row.schedulingUserName||'选择人员'}} </view> <view class="value"> <up-icon name="arrow-right"></up-icon> </view> </view> <!-- <up-input v-model="row.schedulingUserName" placeholder="选择人员" readonly @click="openUserPicker(index)" /> <template #right> <up-icon name="arrow-right" @click="openUserPicker(index)"></up-icon> </template> </template> --> </up-form-item> <up-form-item label="备注" label-width="80"> <up-input v-model="row.remark" placeholder="请输入备注" /> @@ -252,10 +268,13 @@ min-height: 0; } .row-card { background: #fff; background: #f5f5f5; border-radius: 10px; padding: 8px; padding: 20rpx; box-shadow: 0 2px 8px rgba(0,0,0,0.05); box-sizing: border-box; // border: 1px solid #f5f5f5; margin-bottom: 20rpx; } .row-header { display: flex; @@ -279,4 +298,26 @@ justify-content: flex-end; padding-top: 8px; } .select-box{ display: flex; flex-direction: row; align-items: center; justify-content: space-between; flex: 1; border-radius: 4px; box-sizing: border-box; padding: 6px 9px; border-width: 0.5px !important; border-color: #dadbde !important; border-style: solid; height: 100%; .label{ min-height: 1.4em; color: rgb(48, 49, 51); font-size: 15px; } .un-value{ color: #999; } } </style> src/pages/productionManagement/operationScheduling/index.vue
@@ -6,15 +6,13 @@ <u-form> <view class="form-row"> <u-form-item label="客户名称" label-width="80"> <up-input v-model="searchForm.customerName" placeholder="请输入" clearable @change="handleQuery" /> </u-form-item> <u-form-item label="项目名称" label-width="80"> <up-input v-model="searchForm.projectName" placeholder="请输入" clearable @change="handleQuery" /> <up-input v-model="searchForm.customerName" placeholder="请输入" clearable /> </u-form-item> </view> <view class="form-row"> <u-form-item label="状态" label-width="80"> <up-input v-model="statusDisplay" placeholder="请选择状态" readonly @click="showStatusPicker = true" /> <u-form-item label="状态" label-width="80" style="flex:1"> <uni-data-select v-model="searchForm.status" :localdata="statusList"></uni-data-select> <!-- <up-input v-model="statusDisplay" placeholder="请选择状态" readonly @click="showStatusPicker = true" /> --> </u-form-item> </view> <view class="form-actions"> @@ -39,11 +37,12 @@ <view class="row"><text class="label">派工日期</text><text class="value">{{ item.schedulingDate }}</text></view> <view class="row"><text class="label">派工人</text><text class="value">{{ item.schedulingUserName }}</text></view> <view class="row"><text class="label">合同号</text><text class="value">{{ item.salesContractNo }}</text></view> <view class="row"><text class="label">客户合同号</text><text class="value">{{ item.customerContractNo }}</text></view> <!-- <view class="row"><text class="label">客户合同号</text><text class="value">{{ item.customerContractNo }}</text></view> --> <view class="row"><text class="label">客户名称</text><text class="value">{{ item.customerName }}</text></view> <view class="row"><text class="label">产品大类</text><text class="value">{{ item.productCategory }}</text></view> <view class="row"><text class="label">规格型号</text><text class="value">{{ item.specificationModel }}</text></view> <view class="row"><text class="label">绑定机器</text><text class="value">{{ item.speculativeTradingName }}</text></view> <view class="row"><text class="label">产线</text><text class="value">{{ item.productionLine }}</text></view> <view class="row inline"> <view class="col"><text class="label">单位</text><text class="value">{{ item.unit }}</text></view> <view class="col"><text class="label">排产总数</text><text class="value">{{ item.schedulingNum }}</text></view> @@ -94,6 +93,17 @@ import dayjs from 'dayjs' import { listPageProcess, productionDispatchDelete } from '@/api/productionManagement/operationScheduling.js' const statusList = reactive([{ text:'待排产', value: 1 },{ text:'排产中', value: 2 },{ text:'已排产', value: 3 }]) const data = reactive({ searchForm: { staffName: "", src/pages/productionManagement/productionReporting/index.vue
@@ -8,13 +8,11 @@ <u-form-item label="客户名称" label-width="80"> <up-input v-model="searchForm.customerName" placeholder="请输入" clearable @change="handleQuery" /> </u-form-item> <u-form-item label="项目名称" label-width="80"> <up-input v-model="searchForm.projectName" placeholder="请输入" clearable @change="handleQuery" /> </u-form-item> </view> <view class="form-row"> <u-form-item label="状态" label-width="80"> <up-input v-model="statusDisplay" placeholder="请选择状态" readonly @click="showStatusPicker = true" /> <u-form-item label="状态" label-width="80" style="flex:1"> <uni-data-select v-model="searchForm.status" :localdata="statusList"></uni-data-select> <!-- <up-input v-model="statusDisplay" placeholder="请选择状态" readonly @click="showStatusPicker = true" /> --> </u-form-item> </view> <view class="form-actions"> @@ -37,7 +35,7 @@ <view class="row"><text class="label">排产日期</text><text class="value">{{ item.schedulingDate }}</text></view> <view class="row"><text class="label">排产人</text><text class="value">{{ item.schedulingUserName }}</text></view> <view class="row"><text class="label">合同号</text><text class="value">{{ item.salesContractNo }}</text></view> <view class="row"><text class="label">客户合同号</text><text class="value">{{ item.customerContractNo }}</text></view> <!-- <view class="row"><text class="label">客户合同号</text><text class="value">{{ item.customerContractNo }}</text></view> --> <view class="row"><text class="label">客户名称</text><text class="value">{{ item.customerName }}</text></view> <view class="row"><text class="label">产品大类</text><text class="value">{{ item.productCategory }}</text></view> <view class="row"><text class="label">规格型号</text><text class="value">{{ item.specificationModel }}</text></view> @@ -70,6 +68,18 @@ import PageHeader from '@/components/PageHeader.vue' import FormDia from './components/formDia.vue' import { workListPage } from "@/api/productionManagement/productionReporting.js"; const statusList = reactive([{ text:'待生产', value: 1 },{ text:'排产中', value: 2 },{ text:'生产中', value: 3 }]) const data = reactive({ searchForm: { customerName: "",
