|
|
@@ -151,6 +151,7 @@
|
|
|
</el-table>
|
|
|
</el-tab-pane>
|
|
|
|
|
|
+
|
|
|
|
|
|
<el-tab-pane label="技术附件" @click="showTable('技术附件')" name="fourth">
|
|
|
<el-table ref="multipleTable"
|
|
|
@@ -174,9 +175,54 @@
|
|
|
</el-table-column>
|
|
|
</el-table>
|
|
|
</el-tab-pane>
|
|
|
+
|
|
|
+ <el-tab-pane label="BOM资料" @click="showTable('BOM资料')" name="six">
|
|
|
+ <el-table ref="multipleTable"
|
|
|
+ :row-style="{ height: '20px' }"
|
|
|
+ :cell-style="{ padding: '0px' }" :header-row-style="{ height: '20px' }"
|
|
|
+ :header-cell-style="{ padding: '0px' }"
|
|
|
+ :show-overflow-tooltip="true"
|
|
|
+ :cell-class-name="planUsageCellClass"
|
|
|
+ highlight-current-row="true"
|
|
|
+ @row-dblclick="gdbomupdateCompanyFunc"
|
|
|
+ style="width: 100%;height: 36vh" border tooltip-effect="dark" :data="bomtableData" row-key="ID" @selection-change="handleSelectionChange">
|
|
|
+<!-- <el-table-column type="selection" width="30" />-->
|
|
|
+ <el-table-column align="left" label="方案" prop="方案" width="120"/>
|
|
|
+ <el-table-column align="left" label="物料编号" prop="物料编号" width="100"/>
|
|
|
+ <el-table-column align="left" label="物料名称" prop="物料名称" width="400"/>
|
|
|
+ <el-table-column align="left" label="消耗定量" prop="消耗定量" width="210"/>
|
|
|
+ <el-table-column align="left" label="计划用量" prop="计划用量" width="100" />
|
|
|
+ <el-table-column align="left" label="建档用户" prop="建档用户" width="120"/>
|
|
|
+ <el-table-column align="left" label="建档时间" prop="建档时间" width="160"/>
|
|
|
+ <el-table-column align="left" label="更新时间" prop="更新时间" width="160"/>
|
|
|
+ </el-table>
|
|
|
+ </el-tab-pane>
|
|
|
+
|
|
|
+ <el-tab-pane label="面料资料" @click="showTable('面料资料')" name="seven">
|
|
|
+ <el-table ref="multipleTable"
|
|
|
+ :row-style="{ height: '20px' }"
|
|
|
+ :cell-style="{ padding: '0px' }" :header-row-style="{ height: '20px' }"
|
|
|
+ :header-cell-style="{ padding: '0px' }"
|
|
|
+ :show-overflow-tooltip="true"
|
|
|
+ :cell-class-name="planUsageCellClass"
|
|
|
+ highlight-current-row="true"
|
|
|
+ @row-dblclick="gdbomupdateCompanyFunc"
|
|
|
+ style="width: 100%;height: 36vh" border tooltip-effect="dark" :data="mltableData" row-key="ID" @selection-change="handleSelectionChange">
|
|
|
+<!-- <el-table-column type="selection" width="30" />-->
|
|
|
+ <el-table-column align="left" label="面料" prop="面料" width="240"/>
|
|
|
+ <el-table-column align="left" label="面料编号" prop="面料编号" width="100"/>
|
|
|
+ <el-table-column align="left" label="颜色" prop="颜色" width="100"/>
|
|
|
+ <el-table-column align="left" label="入库数量" prop="入库数量" width="210"/>
|
|
|
+ <el-table-column align="left" label="领料数量" prop="领料数量" width="100" />
|
|
|
+ <el-table-column align="left" label="剩余数量" prop="剩余数量" width="120"/>
|
|
|
+ <el-table-column align="left" label="建档时间" prop="建档时间" width="160"/>
|
|
|
+ <el-table-column align="left" label="更新时间" prop="更新时间" width="160"/>
|
|
|
+ </el-table>
|
|
|
+ </el-tab-pane>
|
|
|
</el-tabs>
|
|
|
|
|
|
|
|
|
+
|
|
|
<!-- 修改颜色资料弹窗 -->
|
|
|
<el-dialog v-model="dialogFormVisible" :before-close="edit_closeDialog"
|
|
|
style="width: 80%; max-height: 80%; overflow-y: auto; margin-top: 4%;"
|
|
|
@@ -962,21 +1008,21 @@ const currentDates = `${year}-${month}-${day}`;
|
|
|
//测试环境前端
|
|
|
// const uploadUrl = ref('http://mes-dacheng-api:8083/index.php/api/work_order/ImgUpload')
|
|
|
|
|
|
-// 获取环境变量
|
|
|
-const basePath = import.meta.env.VITE_BASE_PATH;
|
|
|
-const uploadsPort = import.meta.env.VITE_UPLOADS_PORT;
|
|
|
-// 动态生成路径
|
|
|
-let path = basePath && uploadsPort ? `${basePath}:${uploadsPort}` : undefined;
|
|
|
-// 如果 path 是 undefined,则使用默认地址
|
|
|
-if (!path || path.includes("undefined")) {
|
|
|
- console.log("第一路径获取失败,尝试使用备用地址 http://192.168.28.22:8082");
|
|
|
- path = "http://192.168.28.22:8082";
|
|
|
-}
|
|
|
-// 如果还是 undefined,再降级到本地地址
|
|
|
-if (path.includes("undefined")) {
|
|
|
- console.log("备用地址获取失败,使用本地地址 http://127.0.0.1:58082");
|
|
|
- path = "http://127.0.0.1:58082";
|
|
|
-}
|
|
|
+// 获取环境变量
|
|
|
+const basePath = import.meta.env.VITE_BASE_PATH;
|
|
|
+const uploadsPort = import.meta.env.VITE_UPLOADS_PORT;
|
|
|
+// 动态生成路径
|
|
|
+let path = basePath && uploadsPort ? `${basePath}:${uploadsPort}` : undefined;
|
|
|
+// 如果 path 是 undefined,则使用默认地址
|
|
|
+if (!path || path.includes("undefined")) {
|
|
|
+ console.log("第一路径获取失败,尝试使用备用地址 http://192.168.28.22:8082");
|
|
|
+ path = "http://192.168.28.22:8082";
|
|
|
+}
|
|
|
+// 如果还是 undefined,再降级到本地地址
|
|
|
+if (path.includes("undefined")) {
|
|
|
+ console.log("备用地址获取失败,使用本地地址 http://127.0.0.1:58082");
|
|
|
+ path = "http://127.0.0.1:58082";
|
|
|
+}
|
|
|
console.log("最终获取地址:", path);
|
|
|
|
|
|
// 上传的URL
|
|
|
@@ -1896,6 +1942,10 @@ const gytableData = reactive([])
|
|
|
const ddtableData = reactive([])
|
|
|
//技术附件
|
|
|
const jstableData = reactive([])
|
|
|
+//BOM附件
|
|
|
+const bomtableData = reactive([])
|
|
|
+//面料附件
|
|
|
+const mltableData = reactive([])
|
|
|
|
|
|
//点击订单资料行
|
|
|
const tableRowClick = async (row) => {
|
|
|
@@ -1935,6 +1985,9 @@ const tableRowClick = async (row) => {
|
|
|
jstableData.splice(0,jsOrderAttachments.data.length,...jsOrderAttachments.data);
|
|
|
ddtableData.splice(0,ddOrderAttachments.data.length,...ddOrderAttachments.data);
|
|
|
}
|
|
|
+ //BOM资料
|
|
|
+
|
|
|
+ //面料资料
|
|
|
} catch (error) {
|
|
|
console.error(error);
|
|
|
}
|
|
|
@@ -2379,7 +2432,7 @@ const jsfjenterDialog = () => {
|
|
|
width: 20px;
|
|
|
height: 20px;
|
|
|
}
|
|
|
-::v-deep(.el-checkbox__input.is-checked .el-checkbox__inner::after) {
|
|
|
+::v-deep(.el-checkbox__input.is-checked .el-checkbox__inner::after) {
|
|
|
top: 30%;
|
|
|
left: 30%;
|
|
|
}
|