|
@@ -129,6 +129,22 @@
|
|
|
<el-button @click="dialog.visible = false">取消</el-button>
|
|
|
</div>
|
|
|
</el-dialog>
|
|
|
+ <el-dialog
|
|
|
+ v-model="dialog2.visible"
|
|
|
+ :title="dialog2.title"
|
|
|
+ width="70%"
|
|
|
+ @close="dialog2.visible = false"
|
|
|
+ >
|
|
|
+ <choice-workshop-page @workShopInfo="workShopInfo" />
|
|
|
+ </el-dialog>
|
|
|
+ <el-dialog
|
|
|
+ v-model="dialog3.visible"
|
|
|
+ :title="dialog3.title"
|
|
|
+ width="70%"
|
|
|
+ @close="dialog3.visible = false"
|
|
|
+ >
|
|
|
+ <choice-station-page @stationInfo="stationInfo" />
|
|
|
+ </el-dialog>
|
|
|
<ExcelUpload ref="uploadRef" @finished="uploadFinished" />
|
|
|
</div>
|
|
|
</template>
|
|
@@ -138,6 +154,8 @@ import { useCrud } from "@/hooks/userCrud";
|
|
|
import buttonPermission from "@/common/configs/buttonPermission";
|
|
|
import { configSave, configList, deviceUpdateCollect } from "@/api/device";
|
|
|
import { useCommonStoreHook } from "@/store";
|
|
|
+import ChoiceWorkshopPage from "../../plan/workOrder/components/choice-workshop-page.vue";
|
|
|
+import ChoiceStationPage from "./components/choice-station-page.vue";
|
|
|
import dictDataUtil from "@/common/configs/dictDataUtil";
|
|
|
const { isShowTable, tableType } = toRefs(useCommonStoreHook());
|
|
|
const test = () => {
|
|
@@ -218,7 +236,22 @@ const { dataList, createRow, updateRow, deleteRow, searchChange, resetChange } =
|
|
|
const { selectionChange, multipleDelete } = Methords; //选中和批量删除事件
|
|
|
const { checkBtnPerm, downloadTemplate, exportData } = Utils; //按钮权限等工具
|
|
|
const crudRef = ref(null); //crudRef.value 获取avue-crud对象
|
|
|
-
|
|
|
+const workShopInfo = (value) => {
|
|
|
+ form.value.workshop = value.name;
|
|
|
+ dialog2.visible = false;
|
|
|
+};
|
|
|
+const stationInfo = (value) => {
|
|
|
+ form.value.station = value.name;
|
|
|
+ dialog3.visible = false;
|
|
|
+};
|
|
|
+const dialog2 = reactive({
|
|
|
+ title: "车间选择",
|
|
|
+ visible: false,
|
|
|
+});
|
|
|
+const dialog3 = reactive({
|
|
|
+ title: "工位选择",
|
|
|
+ visible: false,
|
|
|
+});
|
|
|
// 设置表格列或者其他自定义的option
|
|
|
option.value = Object.assign(option.value, {
|
|
|
delBtn: false,
|
|
@@ -395,12 +428,29 @@ option.value = Object.assign(option.value, {
|
|
|
prop: "workshop",
|
|
|
width: 160,
|
|
|
overHidden: true,
|
|
|
+ click: ({ value, column }) => {
|
|
|
+ if (column.boxType) {
|
|
|
+ dialog2.visible = true;
|
|
|
+ }
|
|
|
+ },
|
|
|
},
|
|
|
{
|
|
|
label: "所在工位",
|
|
|
prop: "station",
|
|
|
width: 160,
|
|
|
overHidden: true,
|
|
|
+ click: ({ value, column }) => {
|
|
|
+ if (column.boxType) {
|
|
|
+ /*if(!form.value.workshop){
|
|
|
+ ElMessage({
|
|
|
+ message: "请先选择车间",
|
|
|
+ type: "warning",
|
|
|
+ });
|
|
|
+ return;
|
|
|
+ }*/
|
|
|
+ dialog3.visible = true;
|
|
|
+ }
|
|
|
+ },
|
|
|
},
|
|
|
{
|
|
|
label: "设备位置",
|
|
@@ -424,7 +474,6 @@ option.value = Object.assign(option.value, {
|
|
|
});
|
|
|
|
|
|
onMounted(() => {
|
|
|
- // console.log("crudRef", crudRef)
|
|
|
dataList();
|
|
|
});
|
|
|
/**
|