Browse Source

fix:修改

lupeng 5 months ago
parent
commit
21189c74ce

+ 40 - 1
src/views/plan/workOrder/components/work-order-seq.vue

@@ -69,8 +69,13 @@
         @close="dialog.visible = false"
     >
       <div style="display: flex;flex-wrap: wrap;" ref="toPrintRef">
-        <div v-for="item of clickObjs" style="width: 238px;height:325px;font-size:10px;">
+        <div v-for="item of clickObjs" style="width: 238px;overflow: hidden;font-size:10px;">
+          <div style="float: left;padding-bottom: 30px">
+          <div style="padding-left: 70px">
+            <el-text style="margin: 0 auto">mes专用</el-text>
+          </div>
           <vue-qrcode  :value="item.seqNo"  size="45" error-level="H"></vue-qrcode>
+
           <div>
             <el-text>{{item.seqNo}}</el-text>
           </div>
@@ -89,8 +94,38 @@
           <div>
             <el-text>物料型号:</el-text><el-text>{{info.materialModel}}</el-text>
           </div>
+          </div>
+
+        </div>
+        <div v-for="item of clickObjs" style="width: 238px;overflow: hidden;font-size:10px;">
+          <div style="float: left">
+            <div style="padding-left: 50px" >
+              <el-text style="margin: 0 auto">TDM及其他</el-text>
+            </div>
+            <vue-qrcode  :value="item.seqNo.replace('_','-')"  size="45" error-level="H"></vue-qrcode>
+
+            <div>
+              <el-text>{{tdmSeqNo(item.seqNo)}}</el-text>
+            </div>
+            <div>
+              <el-text>工单号:</el-text><el-text>{{info.workOrderCode}}</el-text>
+            </div>
+            <div>
+              <el-text>订单编号:</el-text><el-text>{{info.orderCode}}</el-text>
+            </div>
+            <div>
+              <el-text>物料号:</el-text><el-text>{{info.materialCode}}</el-text>
+            </div>
+            <div>
+              <el-text>物料名称:</el-text><el-text>{{info.materialName}}</el-text>
+            </div>
+            <div>
+              <el-text>物料型号:</el-text><el-text>{{info.materialModel}}</el-text>
+            </div>
+          </div>
         </div>
       </div>
+
       <div class="dialog-footer" align="center">
         <el-button @click="dialog.visible = false">取消</el-button>
         <el-button type="primary" @click="printPage">打印</el-button>
@@ -149,6 +184,10 @@ watch(
       dataList();
     }
 );
+
+const tdmSeqNo=(seqNo)=>{
+  return seqNo.replace("_","-");
+}
 // 传入一个url,后面不带/
 const { form, data, option, search, page, toDeleteIds, Methords, Utils } =
   useCrud({

+ 6 - 2
src/views/quality/outsource/index.vue

@@ -183,6 +183,7 @@
     <el-dialog  v-model="dialogTBom.visible"
                 :title="dialogTBom.title"
                 width="950px"
+                :destroy-on-close="true"
                 @close="dialog.visible = false">
       <el-form>
       <el-form-item label="附件上传">
@@ -220,6 +221,7 @@ import {
 const fileUrl = ref();
 const fileNameList = ref([]);
 const tBom=ref({});
+import {ElMessageBox} from "element-plus";
 const testFiles = () => {
   tBom.value.filePath = fileUrl.value;
   tBom.value.fileName = fileNameList.value[0];
@@ -251,12 +253,14 @@ const dialog = reactive({
   type: 0,
 });
 const tdmUpload =()=>{
+  if(tBom||tBom.value){
+    ELMessage.error("没有上传文件!");
+  }
   isLoading.value=true;
   sendTdmTBom(tBom.value).then(
    (data)=>{
      if(data.code==='200'){
        dialogTBom.visible=false;
-       tBom.value= {}
      }
    }
   ).finally(
@@ -284,7 +288,7 @@ const openDialog = (type, id) => {
 const rowId =ref(null);
 const sendTBom =(id)=>{
   rowId.value=id;
-  tBom.value={};
+  tBom.value.id=id;
   fileUrl.value = {};
   fileNameList.value =[];
   dialogTBom.visible=true;