Prechádzať zdrojové kódy

更改工序关联表单

qinhb 4 mesiacov pred
rodič
commit
ffd7bc0474

+ 2 - 2
src/views/quality/handover/index.vue

@@ -120,7 +120,7 @@
             <el-input v-model="scope.row.remark"></el-input>
           </template>
         </el-table-column>
-        <el-table-column prop="remark" label="关联表单" width="120">
+<!--        <el-table-column prop="remark" label="关联表单" width="120">
           <template  #default="scope">
             <el-button
                 icon="el-icon-setting"
@@ -130,7 +130,7 @@
                 size="small"
             >表单列表</el-button>
           </template>
-        </el-table-column>
+        </el-table-column>-->
       </el-table>
 
       <div

+ 63 - 7
src/views/quality/opRecord/index.vue

@@ -65,17 +65,17 @@
             <el-date-picker value-format="YYYY-MM-DD" type="date" v-model="scope.row.reDate"></el-date-picker>
           </template>
         </el-table-column>
-        <el-table-column prop="reNum" label="接收数量" width="60">
+        <el-table-column prop="reNum" label="接收数量" width="80">
           <template v-if="dialog.type === 1" #default="scope">
             <el-input v-model="scope.row.reNum"></el-input>
           </template>
         </el-table-column>
-        <el-table-column prop="next0Num" label="合格品数" width="60">
+        <el-table-column prop="next0Num" label="合格品数" width="80">
           <template v-if="dialog.type === 1" #default="scope">
             <el-input v-model="scope.row.next0Num"></el-input>
           </template>
         </el-table-column>
-        <el-table-column prop="next1Num" label="不合格品数" width="60">
+        <el-table-column prop="next1Num" label="不合格品数" width="80">
           <template v-if="dialog.type === 1"  #default="scope">
             <el-input v-model="scope.row.next1Num"></el-input>
           </template>
@@ -90,7 +90,7 @@
             <el-input v-model="scope.row.useDevice"></el-input>
           </template>
         </el-table-column>
-        <el-table-column prop="craftCondition" label="工艺条件" width="140">
+        <el-table-column prop="craftCondition" label="工艺条件" width="160">
           <template v-if="dialog.type === 1"  #default="scope">
             <el-input v-model="scope.row.craftCondition"></el-input>
           </template>
@@ -111,11 +111,20 @@
             <el-input v-model="scope.row.remark"></el-input>
           </template>
         </el-table-column>
-        <el-table-column prop="none" label="H级记录表" width="100">
-          <template  #default="scope">
+        <el-table-column prop="none" label="H级记录表">
+<!--          <template  #default="scope">
             <el-button v-if="scope.row.type == 1" @click="clickH(scope.row)" type="primary" link>
               工作记录表
             </el-button>
+          </template>-->
+          <template  #default="scope">
+            <el-button
+                icon="el-icon-setting"
+                text
+                @click="formList(scope.row)"
+                type="primary"
+                size="small"
+            >表单列表</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -315,15 +324,41 @@
         <el-button type="primary" @click="handleExport1">导 出</el-button>
       </div>
     </el-dialog>
+
+    <el-dialog
+        v-model="dialog8.visible"
+        :title="dialog8.title"
+        width="950px"
+        @close="dialog8.visible = false"
+    >
+      <el-card
+          style="cursor: pointer; font-size: 20px"
+          shadow="always"
+          :key="index"
+          @click="toShowExcel(item)"
+          v-for="(item, index) in showProList"
+      >{{ item.formName }}-{{item.formCode}}({{item.seqs}})</el-card
+      >
+    </el-dialog>
+    <el-dialog
+        v-model="excelShow"
+        title="详情"
+        @close="excelShow = false"
+        width="1600"
+        destroy-on-close
+    >
+      <ExcelDataBbox :data="ExDataObj" @close="excelShow = false" />
+    </el-dialog>
   </div>
 </template>
 <script setup>
 import { ref, getCurrentInstance } from "vue";
 import { useCrud } from "@/hooks/userCrud";
-import { exportOperationRecord,exportOperationRecord1 ,addProRecord,queryProductHandover,updateHandoverList,queryHInfo,saveOpDetails} from "@/api/process";
+import { exportOperationRecord,exportOperationRecord1 ,queryFormList,addProRecord,queryProductHandover,updateHandoverList,queryHInfo,saveOpDetails} from "@/api/process";
 import { useCommonStoreHook } from "@/store";
 import dictDataUtil from "@/common/configs/dictDataUtil";
 const { isShowTable, tableType } = toRefs(useCommonStoreHook());
+import ExcelDataBbox from "@/views/base/apply/excelDataBbox.vue";
 const test = () => {
   isShowTable.value = true;
   tableType.value = tableType.value == 1 ? 2 : 1;
@@ -350,7 +385,28 @@ const dialog1 = reactive({
   title: "工作记录",
   visible: false,
 });
+const dialog8 = reactive({
+  title: "表单列表",
+  visible: false,
+});
+const showProList = ref([]);
+const formList = (row) => {
+  queryFormList({...search.value,workOrderId: row.workOrderId,operationId: row.operationId}).then((data)=>{
+    if(data.data.length > 0){
+      showProList.value = data.data;
+      dialog8.visible = true;
+    }else{
+      ElMessage.error("未关联到表单");
+    }
+  })
 
+};
+const excelShow = ref(false);
+const ExDataObj = ref({});
+const toShowExcel = (item) => {
+  ExDataObj.value = item;
+  excelShow.value = true;
+};
 const createRowSave = (row,done,loading) =>{
   form.value.type = "1"
   addProRecord(form.value).then((data) =>{