Merge branch 'qingban' of http://maven.jgiot.com:7012/jiaxiaoqiang/JG-ADMIN-TEMP into qingban

src/api/apply/index.ts

@@ -39,3 +39,9 @@ export function toCheckRes(data: string) {
     data,
   });
 }
+export function getExcelData(formId: string) {
+  return request({
+    url: `/api/v1/ProcessFormData/formData/${formId}`,
+    method: "get",
+  });
+}

src/views/base/apply/apply.vue

@@ -50,6 +50,9 @@
           </el-descriptions-item>
         </el-descriptions>
       </div>
+      <el-button type="success" style="margin-bottom: 10px" @click="showExcel"
+        >查看表格数据</el-button
+      >
       <div class="el-descriptions__title">提交申请</div>
       <div class="applyForm" v-if="checkList.length > 0">
         <template v-for="(item, index) in checkList" :key="item">
@@ -104,10 +107,24 @@
         >
       </div>
     </div>
+    <el-dialog
+      v-model="excelShow"
+      title="详情"
+      @close="excelShow = false"
+      width="1600"
+    >
+      <proWorkOrderExcel :data="ExDataObj" @close="excelShow = false" />
+    </el-dialog>
   </div>
 </template>
 <script setup>
-import { gerFormList, toCheck, logList, examineList } from "@/api/apply";
+import {
+  gerFormList,
+  toCheck,
+  logList,
+  examineList,
+  getExcelData,
+} from "@/api/apply";
 import { getUserList } from "@/api/system/user";
 const props = defineProps({
   rowData: {
@@ -117,6 +134,18 @@ const props = defineProps({
     type: Boolean,
   },
 });
+const excelShow = ref(false);
+const ExDataObj = ref({});
+const showExcel = async () => {
+  const { code, data } = await getExcelData(props.rowData.id);
+  if (code == "200") {
+    ExDataObj.value = data;
+    excelShow.value = true;
+  } else {
+    ExDataObj.value = {};
+    excelShow.value = false;
+  }
+};
 const emits = defineEmits(["close", "dataList"]);
 const getStatus = (val) => {
   switch (val) {
@@ -141,7 +170,6 @@ const submitList = ref([]);
 const LogList = ref([]);
 const getlogList = async () => {
   const { data } = await logList({ excelFormId: props.rowData.id });
-  console.log(data);
   LogList.value = data;
 };
 const submit = async () => {

src/views/base/apply/index.vue

@@ -106,6 +106,12 @@ option.value = Object.assign(option.value, {
   menu: true,
   column: [
     {
+      label: "工单编码",
+      prop: "workOrderCode",
+      search: true,
+      overHidden: true,
+    },
+    {
       label: "订单编号",
       prop: "orderCode",
       search: true,

src/views/base/check/check.vue

@@ -50,6 +50,9 @@
           </el-descriptions-item>
         </el-descriptions>
       </div>
+      <el-button type="success" style="margin-bottom: 10px" @click="showExcel"
+        >查看表格数据</el-button
+      >
       <div class="el-descriptions__title">提交申请</div>
       <div class="applyForm" v-if="checkList.length > 0">
         <template v-for="(item, index) in checkList" :key="item">
@@ -123,10 +126,24 @@
         >
       </div>
     </div>
+    <el-dialog
+      v-model="excelShow"
+      title="详情"
+      @close="excelShow = false"
+      width="1600"
+    >
+      <proWorkOrderExcel :data="ExDataObj" @close="excelShow = false" />
+    </el-dialog>
   </div>
 </template>
 <script setup>
-import { toCheck, logList, examineList, toCheckRes } from "@/api/apply";
+import {
+  toCheck,
+  logList,
+  examineList,
+  getExcelData,
+  toCheckRes,
+} from "@/api/apply";
 import { getUserList } from "@/api/system/user";
 const props = defineProps({
   rowData: {
@@ -138,7 +155,18 @@ const props = defineProps({
     type: Boolean,
   },
 });
-
+const excelShow = ref(false);
+const ExDataObj = ref({});
+const showExcel = async () => {
+  const { code, data } = await getExcelData(props.rowData.id);
+  if (code == "200") {
+    ExDataObj.value = data;
+    excelShow.value = true;
+  } else {
+    ExDataObj.value = {};
+    excelShow.value = false;
+  }
+};
 const emits = defineEmits(["close", "dataList"]);
 const getStatus = (val) => {
   switch (val) {
@@ -177,7 +205,6 @@ const checkOption = [
 const checkFormRef = ref(null);
 const getlogList = async () => {
   const { data } = await logList({ excelFormId: props.rowData.id });
-  console.log(data);
   LogList.value = data;
 };
 const submit = async () => {

src/views/base/check/index.vue

@@ -106,6 +106,12 @@ option.value = Object.assign(option.value, {
   menu: true,
   column: [
     {
+      label: "工单编码",
+      prop: "workOrderCode",
+      search: true,
+      overHidden: true,
+    },
+    {
       label: "订单编号",
       prop: "orderCode",
       search: true,

src/views/base/craftManagement/route/bindConfig.ts

@@ -15,6 +15,7 @@ const switchOp = [
 export const formOption = {
   submitBtn: false,
   emptyBtn: false,
+  labelWidth: 120,
   column: [
     {
       label: "工序类型",

src/views/storage/semi/index.vue

@@ -109,7 +109,7 @@ const selectId = ref(null);
 const materialInfo1 = (value) => {
   if (form.value.stockType == "1") {
     form.value.inWorkOrderId = value.workOrderCode;
-    form.value.outWorkOrderId = "-";
+    form.value.outWorkOrderId = null;
   } else if (form.value.stockType == "2") {
     form.value.outWorkOrderId = value.workOrderCode;
   }
@@ -127,9 +127,15 @@ const seqDisabled = computed(() => {
 const displayIn = computed(() => {
   return form.value.stockType == "2" || !form.value.stockType;
 });
+const displayShowIn = computed(() => {
+  return !(form.value.stockType == "2" || !form.value.stockType);
+});
 const displayOut = computed(() => {
   return form.value.stockType == "1" || !form.value.stockType;
 });
+const displayShowOut = computed(() => {
+  return !(form.value.stockType == "1" || !form.value.stockType);
+});
 // 设置表格列或者其他自定义的option
 option.value = Object.assign(option.value, {
   delBtn: false,
@@ -215,8 +221,8 @@ option.value = Object.assign(option.value, {
       label: "入库工单",
       prop: "inWorkOrderId",
       editDisabled: true,
+      addDisplay: displayShowIn,
       disabled: displayIn,
-      display: true,
       rules: [
         {
           required: true,
@@ -239,7 +245,7 @@ option.value = Object.assign(option.value, {
       label: "出库工单",
       prop: "outWorkOrderId",
       editDisabled: true,
-      display: true,
+      addDisplay: displayShowOut,
       disabled: displayOut,
       rules: [
         {
@@ -258,6 +264,9 @@ option.value = Object.assign(option.value, {
           dialog1.visible = true;
         }
       },
+      render: ({ row }) => {
+        return h("p", row.outWorkOrderId ? row.outWorkOrderId : "-");
+      },
     },
     {
       label: "流转卡号",