提交审核静态页面

src/views/base/apply/apply.vue

@@ -0,0 +1,92 @@
+<template>
+  <div class="body">
+    <div class="line">
+      <div class="el-descriptions__title">流程状态</div>
+      <el-timeline style="max-width: 600px; margin-top: 20px">
+        <el-timeline-item center timestamp="2018/4/12" placement="top">
+          <el-card>
+            <h4>Update Github template</h4>
+            <p>Tom committed 2018/4/12 20:46</p>
+          </el-card>
+        </el-timeline-item>
+        <el-timeline-item center timestamp="2018/4/3" placement="top">
+          <el-card>
+            <h4>Update Github template</h4>
+            <p>Tom committed 2018/4/3 20:46</p>
+          </el-card>
+        </el-timeline-item>
+      </el-timeline>
+    </div>
+    <div class="form">
+      <div class="description">
+        <el-descriptions title="User Info" border>
+          <el-descriptions-item label="Username"
+            >kooriookami</el-descriptions-item
+          >
+          <el-descriptions-item label="Telephone"
+            >18100000000</el-descriptions-item
+          >
+          <el-descriptions-item label="Place">Suzhou</el-descriptions-item>
+          <el-descriptions-item label="Remarks">
+            <el-tag size="small">School</el-tag>
+          </el-descriptions-item>
+          <el-descriptions-item label="Address">
+            No.1188, Wuzhong Avenue, Wuzhong District, Suzhou, Jiangsu Province
+          </el-descriptions-item>
+        </el-descriptions>
+      </div>
+      <div class="el-descriptions__title">提交申请</div>
+      <div class="applyForm">
+        <el-form :model="form">
+          <el-form-item label="签章人员：">
+            <el-select v-model="form.qzId">
+              <el-option
+                v-for="option in options"
+                :key="option.value"
+                :label="option.label"
+                :value="option.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="工艺路线编号">
+            <el-input v-model="form.processRouteCode" />
+          </el-form-item>
+          <el-form-item label="工艺路线编号">
+            <el-input v-model="form.processRouteCode" />
+          </el-form-item>
+        </el-form>
+      </div>
+      <div class="btns">
+        <el-button type="primary">提交</el-button>
+      </div>
+    </div>
+  </div>
+</template>
+<script setup>
+const form = ref({
+  qzId: 0,
+});
+const options = ref([]);
+</script>
+<style lang="scss" scoped>
+.body {
+  display: flex;
+
+  .line {
+    width: 400px;
+  }
+  .form {
+    width: calc(100% - 400px);
+    padding-left: 20px;
+    .description {
+      margin-bottom: 20px;
+    }
+  }
+  .applyForm {
+    margin: 20px auto;
+    border: 1px solid rgb(235, 238, 245);
+    border-radius: 16px;
+    padding: 20px;
+  }
+}
+</style>

src/views/base/apply/index.vue

@@ -0,0 +1,313 @@
+<template>
+  <div class="mainContentBox">
+    <avue-crud
+      ref="crudRef"
+      v-model:search="search"
+      v-model="form"
+      :data="data"
+      :option="option"
+      v-model:page="page"
+      @row-save="addRow"
+      @row-update="updateRow"
+      @row-del="deleteRow"
+      @search-change="searchChange"
+      @search-reset="resetChange"
+      @size-change="dataList"
+      @current-change="dataList"
+      @selection-change="selectionChange"
+    >
+      <template #enable="scope">
+        <el-switch
+          active-value="1"
+          inactive-value="0"
+          inline-prompt
+          active-text="启用"
+          inactive-text="禁用"
+          v-model="scope.row.enable"
+          @click="changeItem(scope.row)"
+          class="ml-2"
+          style="--el-switch-on-color: #13ce66; --el-switch-off-color: #ff4949"
+        />
+      </template>
+      <template #menu="{ row, index, type }">
+        <!-- <el-button @click="deleteRecord(row, index, done)" text type="primary"
+          >删除</el-button
+        > -->
+      </template>
+    </avue-crud>
+
+    <ExcelUpload ref="uploadRef" @finished="uploadFinished" />
+  </div>
+  <CommonTable
+    ref="ctableRef"
+    tableTitle="BOM添加"
+    tableType="MARTERIAL"
+    @selected-sure="onSelectedFinish"
+  />
+  <el-dialog
+    v-model="dialog.visible"
+    :title="dialog.title"
+    width="80%"
+    @close="dialog.visible = false"
+    ><Apply />
+  </el-dialog>
+</template>
+<script setup>
+import { ref, getCurrentInstance } from "vue";
+import { useCrud } from "@/hooks/userCrud";
+import { useCommonStoreHook, useDictionaryStore } from "@/store";
+import { updateDrawaing } from "@/api/drawing";
+import dictDataUtil from "@/common/configs/dictDataUtil";
+import Apply from "./apply.vue";
+const { isShowTable, tableType } = toRefs(useCommonStoreHook());
+// 数据字典相关
+const { dicts } = useDictionaryStore();
+const fileUrl = ref(""); //单文件
+const pdfUrlList = ref([]);
+const srcList = ref([]);
+const fileNameList = ref([]);
+const dialog = ref({
+  visible: true,
+  title: "归档申请",
+});
+const ctableRef = ref(null);
+const changeItem = (row) => {
+  updateDrawaing(row).then(() => {
+    ElMessage.success("操作成功");
+    dataList();
+  });
+};
+
+const addRow = (form2, done) => {
+  createRow(form, done, done);
+  pdfUrlList.value = [];
+  srcList.value = [];
+  fileNameList.value = [];
+};
+// 传入一个url，后面不带/
+const { form, data, option, search, page, toDeleteIds, Methords, Utils } =
+  useCrud({
+    src: "/api/v1/base/drawing",
+  });
+const {
+  dataEditList,
+  createRow,
+  updateRow,
+  deleteRow,
+  searchChange,
+  dataList,
+  resetChange,
+} = Methords; //增删改查
+const { selectionChange, multipleDelete } = Methords; //选中和批量删除事件
+const { checkBtnPerm, downloadTemplate, exportData } = Utils; //按钮权限等工具
+
+const crudRef = ref(null); //crudRef.value 获取avue-crud对象
+const router = useRouter?.();
+
+onMounted?.(() => {
+  // console.log("crudRef", crudRef)
+  dataEditList();
+});
+
+const onSelectedFinish = (selectedValue) => {
+  form.value.associationCode = selectedValue.materialCode;
+  form.value.associationName = selectedValue.materialName;
+  form.value.materialCode = selectedValue.materialCode;
+};
+
+/**
+ * 上传excel相关
+ */
+const uploadRef = ref(null);
+
+// 设置表格列或者其他自定义的option
+option.value = Object.assign(option.value, {
+  selection: false,
+  viewBtn: false,
+  editBtn: false,
+  delBtn: false,
+  menu: true,
+  column: [
+    {
+      label: "图纸编号",
+      prop: "drawingCode",
+      width: 150,
+      search: true,
+      overHidden: true,
+      rules: [
+        {
+          required: true,
+          message: "请填写图纸编号",
+          trigger: "blur",
+        },
+      ],
+    },
+    {
+      label: "图纸名称",
+      prop: "drawingTitle",
+      width: 150,
+      overHidden: true,
+      search: true,
+      rules: [
+        {
+          required: true,
+          message: "请填写图纸名称",
+          trigger: "blur",
+        },
+      ],
+    },
+    {
+      label: "物料编号",
+      prop: "associationCode",
+      width: 150,
+      search: true,
+      overHidden: true,
+      editDisplay: false,
+      addDisplay: false,
+      rules: [
+        {
+          required: true,
+          message: "请填写物料编号",
+          trigger: "blur",
+        },
+      ],
+    },
+
+    {
+      label: "物料编号",
+      prop: "materialCode",
+      width: 150,
+      overHidden: true,
+      editDisplay: false,
+      hide: true,
+      rules: [
+        {
+          required: true,
+          message: "请填写物料编号",
+          trigger: "blur",
+        },
+      ],
+      click() {
+        if (ctableRef.value) {
+          ctableRef.value.startSelect();
+        }
+      },
+    },
+    {
+      label: "物料名称",
+      prop: "associationName",
+      width: 180,
+      search: true,
+      overHidden: true,
+      disabled: true,
+      rules: [
+        {
+          required: true,
+          message: "请填写物料名称",
+          trigger: "blur",
+        },
+      ],
+    },
+    {
+      label: "图纸类型",
+      prop: "drawingDictValue",
+      search: true,
+      filterable: true,
+      type: "select",
+      width: 100,
+      overHidden: true,
+      dicUrl: dictDataUtil.request_url + "drawing_type",
+      props: { label: "dictLabel", value: "dictValue" },
+      rules: [
+        {
+          required: true,
+          message: "请选择图纸类型",
+          trigger: "blur",
+        },
+      ],
+    },
+    {
+      label: "文件",
+      prop: "drawingPath",
+      span: 24,
+      slot: true,
+      hide: true,
+      rules: [
+        {
+          required: true,
+          message: "请选择文件",
+          trigger: "blur",
+        },
+      ],
+    },
+    {
+      label: "文件名称",
+      prop: "fileName",
+      span: 24,
+      width: 120,
+      overHidden: true,
+      display: false,
+    },
+    {
+      label: "文件数组",
+      prop: "drawingPathList",
+      span: 24,
+      hide: true,
+      display: false,
+    },
+    {
+      label: "pdf数组",
+      prop: "pdfPathList",
+      span: 24,
+      hide: true,
+      display: false,
+    },
+
+    {
+      label: "文件名称数组",
+      prop: "fileNameList",
+      span: 24,
+      slot: true,
+      hide: true,
+      display: false,
+    },
+    /*{ label: "文件",
+      prop: "drawing",
+      type: 'img',
+      span: 24,
+      display:false,
+      slot: true,
+      formatter: (row, column, cellValue, index) => {
+        return import.meta.env.VITE_APP_UPLOAD_URL + `${row.drawingPath}`;} },*/
+    {
+      label: "版本",
+      prop: "drawingVersion",
+      type: "number",
+      precision: 1,
+      min: 0,
+      rules: [
+        {
+          required: true,
+          message: "版本号不能为空",
+          trigger: "blur",
+        },
+      ],
+    },
+    {
+      label: "创建时间",
+      prop: "created",
+      width: 120,
+      overHidden: true,
+      display: false,
+    },
+    {
+      label: "启用状态",
+      slot: true,
+      headerAlign: "center",
+      prop: "enable",
+      width: 100,
+      addDisplay: false,
+    },
+  ],
+});
+</script>

src/views/base/check/apply.vue

@@ -0,0 +1,20 @@
+<template>
+  <div class="body">
+    <div class="line"></div>
+    <div class="form"></div>
+  </div>
+</template>
+<script setup></script>
+<style lang="scss" scoped>
+.body {
+  display: flex;
+
+  .line {
+    width: 200px;
+
+  }
+  .form {
+    width: calc(100% - 120px);
+  }
+}
+</style>

src/views/base/check/index.vue

@@ -0,0 +1,347 @@
+<template>
+  <div class="mainContentBox">
+    <avue-crud
+      ref="crudRef"
+      v-model:search="search"
+      v-model="form"
+      :data="data"
+      :option="option"
+      v-model:page="page"
+      @row-save="addRow"
+      @row-update="updateRow"
+      @row-del="deleteRow"
+      @search-change="searchChange"
+      @search-reset="resetChange"
+      @size-change="dataList"
+      @current-change="dataList"
+      @selection-change="selectionChange"
+    >
+      <template #drawingPath-form="scope">
+        <!--        <single-upload v-model="form.drawingPath" :generatePdf="true"/>-->
+        <FilesUpload
+          v-model:src-list="srcList"
+          v-model:pdf-list="pdfUrlList"
+          v-model:file-name-list="fileNameList"
+          :limit="10"
+          :generate-pdf="true"
+          @finished="testFiles"
+        />
+      </template>
+      <template #enable="scope">
+        <el-switch
+          active-value="1"
+          inactive-value="0"
+          inline-prompt
+          active-text="启用"
+          inactive-text="禁用"
+          v-model="scope.row.enable"
+          @click="changeItem(scope.row)"
+          class="ml-2"
+          style="--el-switch-on-color: #13ce66; --el-switch-off-color: #ff4949"
+        />
+      </template>
+      <template #menu="{ row, index, type }">
+        <PDFView
+          :need-to-show-pdf="true"
+          content-type="button"
+          :is-link="true"
+          :pdf-source="filePath + row.pdfPath"
+        />
+        <el-button @click="deleteRecord(row, index, done)" text type="primary"
+          >删除</el-button
+        >
+      </template>
+    </avue-crud>
+
+    <ExcelUpload ref="uploadRef" @finished="uploadFinished" />
+  </div>
+  <CommonTable
+    ref="ctableRef"
+    tableTitle="BOM添加"
+    tableType="MARTERIAL"
+    @selected-sure="onSelectedFinish"
+  />
+</template>
+<script setup lang="ts">
+import { ref, getCurrentInstance } from "vue";
+import { useCrud } from "@/hooks/userCrud";
+import { useCommonStoreHook, useDictionaryStore } from "@/store";
+import { updateDrawaing } from "@/api/drawing";
+import dictDataUtil from "@/common/configs/dictDataUtil";
+import PDFView from "@/components/PDFView/index.vue";
+const { isShowTable, tableType } = toRefs(useCommonStoreHook());
+// 数据字典相关
+const { dicts } = useDictionaryStore();
+const fileUrl = ref(""); //单文件
+const pdfUrlList = ref([]);
+const srcList = ref([]);
+const fileNameList = ref([]);
+const testFiles = () => {
+  form.value.pdfPathList = pdfUrlList.value;
+  form.value.drawingPathList = srcList.value;
+  form.value.drawingPath = srcList.value[0];
+  form.value.fileNameList = fileNameList.value;
+};
+const filePath = import.meta.env.VITE_APP_UPLOAD_URL;
+const test = () => {
+  isShowTable.value = true;
+  tableType.value = tableType.value == 1 ? 2 : 1;
+};
+const ctableRef = ref(null);
+const changeItem = (row) => {
+  updateDrawaing(row).then(() => {
+    ElMessage.success("操作成功");
+    dataList();
+  });
+};
+const form2 = ref(null);
+const addRow = (form2, done) => {
+  createRow(form, done, done);
+  pdfUrlList.value = [];
+  srcList.value = [];
+  fileNameList.value = [];
+};
+// 传入一个url，后面不带/
+const { form, data, option, search, page, toDeleteIds, Methords, Utils } =
+  useCrud({
+    src: "/api/v1/base/drawing",
+  });
+const {
+  dataEditList,
+  createRow,
+  updateRow,
+  deleteRow,
+  searchChange,
+  dataList,
+  resetChange,
+} = Methords; //增删改查
+const { selectionChange, multipleDelete } = Methords; //选中和批量删除事件
+const { checkBtnPerm, downloadTemplate, exportData } = Utils; //按钮权限等工具
+// checkBtnPerm(ButtonPermKeys.PLAN.BTNS.order_add) :permission="permission"
+// const permission = reactive({
+//   delBtn: checkPerm(buttonPermission.PLAN.BTNS.order_del),
+//   addBtn: checkPerm(buttonPermission.PLAN.BTNS.order_add),
+//   editBtn: checkPerm(buttonPermission.PLAN.BTNS.order_edit),
+//   menu: true,
+// });
+
+const crudRef = ref(null); //crudRef.value 获取avue-crud对象
+const router = useRouter?.();
+
+onMounted?.(() => {
+  // console.log("crudRef", crudRef)
+  dataEditList();
+});
+
+const onSelectedFinish = (selectedValue) => {
+  form.value.associationCode = selectedValue.materialCode;
+  form.value.associationName = selectedValue.materialName;
+  form.value.materialCode = selectedValue.materialCode;
+};
+
+/**
+ * 上传excel相关
+ */
+const uploadRef = ref(null);
+const uploadFinished = () => {
+  // 上传完成后的刷新操作
+  page.currentPage = 1;
+  dataEditList();
+};
+
+// 设置表格列或者其他自定义的option
+option.value = Object.assign(option.value, {
+  selection: false,
+  viewBtn: false,
+  editBtn: false,
+  delBtn: false,
+  menu: true,
+  column: [
+    {
+      label: "图纸编号",
+      prop: "drawingCode",
+      width: 150,
+      search: true,
+      overHidden: true,
+      rules: [
+        {
+          required: true,
+          message: "请填写图纸编号",
+          trigger: "blur",
+        },
+      ],
+    },
+    {
+      label: "图纸名称",
+      prop: "drawingTitle",
+      width: 150,
+      overHidden: true,
+      search: true,
+      rules: [
+        {
+          required: true,
+          message: "请填写图纸名称",
+          trigger: "blur",
+        },
+      ],
+    },
+    {
+      label: "物料编号",
+      prop: "associationCode",
+      width: 150,
+      search: true,
+      overHidden: true,
+      editDisplay: false,
+      addDisplay: false,
+      rules: [
+        {
+          required: true,
+          message: "请填写物料编号",
+          trigger: "blur",
+        },
+      ],
+    },
+
+    {
+      label: "物料编号",
+      prop: "materialCode",
+      width: 150,
+      overHidden: true,
+      editDisplay: false,
+      hide: true,
+      rules: [
+        {
+          required: true,
+          message: "请填写物料编号",
+          trigger: "blur",
+        },
+      ],
+      click() {
+        if (ctableRef.value) {
+          ctableRef.value.startSelect();
+        }
+      },
+    },
+    {
+      label: "物料名称",
+      prop: "associationName",
+      width: 180,
+      search: true,
+      overHidden: true,
+      disabled: true,
+      rules: [
+        {
+          required: true,
+          message: "请填写物料名称",
+          trigger: "blur",
+        },
+      ],
+    },
+    {
+      label: "图纸类型",
+      prop: "drawingDictValue",
+      search: true,
+      filterable: true,
+      type: "select",
+      width: 100,
+      overHidden: true,
+      dicUrl: dictDataUtil.request_url + "drawing_type",
+      props: { label: "dictLabel", value: "dictValue" },
+      rules: [
+        {
+          required: true,
+          message: "请选择图纸类型",
+          trigger: "blur",
+        },
+      ],
+    },
+    {
+      label: "文件",
+      prop: "drawingPath",
+      span: 24,
+      slot: true,
+      hide: true,
+      rules: [
+        {
+          required: true,
+          message: "请选择文件",
+          trigger: "blur",
+        },
+      ],
+    },
+    {
+      label: "文件名称",
+      prop: "fileName",
+      span: 24,
+      width: 120,
+      overHidden: true,
+      display: false,
+    },
+    {
+      label: "文件数组",
+      prop: "drawingPathList",
+      span: 24,
+      hide: true,
+      display: false,
+    },
+    {
+      label: "pdf数组",
+      prop: "pdfPathList",
+      span: 24,
+      hide: true,
+      display: false,
+    },
+
+    {
+      label: "文件名称数组",
+      prop: "fileNameList",
+      span: 24,
+      slot: true,
+      hide: true,
+      display: false,
+    },
+    /*{ label: "文件",
+      prop: "drawing",
+      type: 'img',
+      span: 24,
+      display:false,
+      slot: true,
+      formatter: (row, column, cellValue, index) => {
+        return import.meta.env.VITE_APP_UPLOAD_URL + `${row.drawingPath}`;} },*/
+    {
+      label: "版本",
+      prop: "drawingVersion",
+      type: "number",
+      precision: 1,
+      min: 0,
+      rules: [
+        {
+          required: true,
+          message: "版本号不能为空",
+          trigger: "blur",
+        },
+      ],
+    },
+    {
+      label: "创建时间",
+      prop: "created",
+      width: 120,
+      overHidden: true,
+      display: false,
+    },
+    {
+      label: "启用状态",
+      slot: true,
+      headerAlign: "center",
+      prop: "enable",
+      width: 100,
+      addDisplay: false,
+    },
+  ],
+});
+
+const deleteRecord = (row, index, done) => {
+  deleteRow(row, index, done);
+  dataEditList();
+};
+</script>

src/views/plan/workOrder/components/work-order-page.vue

@@ -15,7 +15,10 @@
       @selection-change="selectionChange"
     >
       <template #footer>
-        <div v-if="multipleKey" style="width:60px;height:35px;float:right;margin-top: 15px;">
+        <div
+          v-if="multipleKey"
+          style="width: 60px; height: 35px; float: right; margin-top: 15px"
+        >
           <el-button type="primary" @click="onSelected"> 确定 </el-button>
         </div>
       </template>
@@ -40,12 +43,18 @@ const props = defineProps({
       return "0";
     },
   },
-  multipleKey:{
+  opType: {
     type: String,
-    default: ()=>{
+    default: () => {
       return null;
-    }
-  }
+    },
+  },
+  multipleKey: {
+    type: String,
+    default: () => {
+      return null;
+    },
+  },
 });
 // 传入一个url，后面不带/
 const { form, data, option, search, page, toDeleteIds, Methords, Utils } =
@@ -63,17 +72,16 @@ const emit = defineEmits(["orderInfo"]);
 const rowClick = (row) => {
   emit("orderInfo", row);
 };
-const multipleKeyVal = ref(null)
+const multipleKeyVal = ref(null);
 
 const onSelected = () => {
   emit("orderInfo", toDeleteIds.value);
 };
-const clickItem = (row)=>{
-  if(!props.multipleKey){
-    rowClick(row)
+const clickItem = (row) => {
+  if (!props.multipleKey) {
+    rowClick(row);
   }
-}
-
+};
 
 // 设置表格列或者其他自定义的option
 option.value = Object.assign(option.value, {
@@ -253,8 +261,11 @@ option.value = Object.assign(option.value, {
 });
 
 onMounted(() => {
-  multipleKeyVal.value = props.multipleKey
+  multipleKeyVal.value = props.multipleKey;
   search.value.queryType = String(props.queryType);
+  if (props.workOrderState != null) {
+    search.value.workOrderState = String(props.workOrderState);
+  }
   dataList();
 });
 </script>

src/views/pro/traceability/components/testData.vue

@@ -22,9 +22,9 @@
   </div>
   <el-dialog title="详细信息" v-model="dialogVisible">
     <el-table :data="tableData" class="tableView-cssj">
-      <el-table-column fixed prop="proName" label="测试项目" align="center" />
-      <el-table-column fixed prop="name" label="测试名称" align="center" />
-      <el-table-column fixed prop="value" label="测试值" align="center" />
+      <el-table-column prop="parameterName" label="测试项目" align="center" />
+      <el-table-column prop="deviceCode" label="测试设备" align="center" />
+      <el-table-column prop="value" label="测试值" align="center" />
       <el-table-column prop="flag" align="center" label="是否合格">
         <template #default="scope">
           <span
@@ -136,7 +136,7 @@ const dialogVisible = ref(false);
 const tableData = ref([]);
 const lookData = (row) => {
   tableData.value = JSON.parse(row.testData);
-
+  console.log(tableData.value);
   dialogVisible.value = true;
 };
 

src/views/storage/semi/index.vue

@@ -36,7 +36,11 @@
       width="950px"
       @close="dialog1.visible = false"
     >
-      <work-order-page @order-info="materialInfo1" />
+      <work-order-page
+        :queryType="2"
+        :workOrderState="6"
+        @order-info="materialInfo1"
+      />
     </el-dialog>
     <el-dialog
       v-model="dialog2.visible"
@@ -103,9 +107,12 @@ const dialog3 = reactive({
 });
 const selectId = ref(null);
 const materialInfo1 = (value) => {
-  form.value.workOrderCode = value.workOrderCode;
+  if (form.value.stockType == "1") {
+    form.value.inWorkOrderId = value.workOrderCode;
+  } else if (form.value.stockType == "2") {
+    form.value.outWorkOrderId = value.workOrderCode;
+  }
   form.value.workOrderId = value.id;
-  form.value.stockType = "1";
   form.value.workOrderSeqNos = [];
   dialog1.visible = false;
 };
@@ -160,11 +167,25 @@ option.value = Object.assign(option.value, {
         },
       ],
     },
+
+    {
+      label: "出库/入库数量",
+      prop: "operateNum",
+      addDisplay: false,
+      editDisabled: true,
+      rules: [
+        {
+          required: true,
+          trigger: "trigger",
+        },
+      ],
+    },
+
     {
       label: "出入库类型",
       prop: "stockType",
       editDisabled: true,
-      addDisplay: false,
+      addDisplay: true,
       rules: [
         {
           required: true,
@@ -182,30 +203,54 @@ option.value = Object.assign(option.value, {
           value: "2",
         },
       ],
+      control: (val, form) => {
+        return {
+          inWorkOrderId: {
+            display: val == "1",
+          },
+          outWorkOrderId: {
+            display: val == "2",
+          },
+        };
+      },
     },
     {
-      label: "出库/入库数量",
-      prop: "operateNum",
-      addDisplay: false,
+      label: "入库工单",
+      prop: "inWorkOrderId",
       editDisabled: true,
+      display: true,
+      addDisplay: false,
       rules: [
         {
           required: true,
           trigger: "trigger",
         },
       ],
+      type: "select",
+      click: ({ value, column }) => {
+        if (column.boxType) {
+          dialog1.visible = true;
+        }
+      },
+      change: ({ value, column }) => {
+        if (value != form.value.materialCode) {
+          dialog1.visible = true;
+        }
+      },
     },
     {
-      label: "工单编号",
-      prop: "workOrderCode",
+      label: "出库工单",
+      prop: "outWorkOrderId",
       editDisabled: true,
-      addDisplay: true,
+      addDisplay: false,
+      display: true,
       rules: [
         {
           required: true,
           trigger: "trigger",
         },
       ],
+      type: "select",
       click: ({ value, column }) => {
         if (column.boxType) {
           dialog1.visible = true;
@@ -237,26 +282,25 @@ option.value = Object.assign(option.value, {
         }
       },
       change: ({ value, column }) => {
-        if (value != form.value.workOrderCode && dialog1.visible == false) {
+        if (
+          form.value.stockType == "1"
+            ? form.value.inWorkOrderId && dialog1.visible == false
+            : form.value.outWorkOrderId && dialog1.visible == false
+        ) {
           dialog2.visible = true;
         }
       },
     },
     {
-      label: "单位",
-      prop: "unit",
+      label: "库位",
+      prop: "location",
       addDisplay: true,
-      filterable: true,
-      type: "select",
-      dataType: "string",
       rules: [
         {
           required: true,
           trigger: "trigger",
         },
       ],
-      dicData: dicts.danwei_type,
-      props: { label: "dictLabel", value: "dictValue" },
     },
 
     // {