包装优化

mes-ui/mes-ui-admin-vue3/src/views/biz/Packaging/Previewdialog.vue

@@ -34,10 +34,10 @@ const formData: any = ref({
 
 /** 打开弹窗 */
 const minAmount = ref()
-const codes: any = ref()
+const Fdata: any = ref()
 const vals: any = ref()
-const open = async (code, val) => {
+const open = async (fdata, val) => {
-  codes.value = code
+  Fdata.value = fdata
   dialogVisible.value = true
   resetForm()
   minAmount.value = undefined
@@ -78,8 +78,8 @@ const ranges = ref([])
 const printref = ref()
 const rangeval = ref()
 const handleChangeRange = () => {
-  console.log(rangeval.value)
+  // console.log(Fdata.value, vals.value, rangeval.value,'preview')
-  printref.value.open(codes.value, vals.value, rangeval.value)
+  printref.value.open(Fdata.value, vals.value, rangeval.value)
   selectedRow.value = null
   rangeval.value = null
 }

mes-ui/mes-ui-admin-vue3/src/views/biz/Packaging/detail.vue

@@ -258,7 +258,7 @@
           <el-col>
             <el-card class="hl-incard">
               <el-col v-if="'update,create,alter'.indexOf(query.active) > -1">
-                <el-button class="hl-addbutton" type="primary" size="large" @click="onAddItem"
+                <el-button class="hl-addbutton" :disabled="formData.packageStatus == 1" type="primary" size="large" @click="onAddItem"
                   >新增</el-button
                 >
               </el-col>
@@ -288,7 +288,7 @@
                       >
                         <el-input
                           v-model="row.ruleName"
-                          :disabled="detailDisabled"
+                          :disabled="detailDisabled||formData.packageStatus == 1"
                           placeholder="请输入规则名称"
                         />
                       </el-form-item>
@@ -312,6 +312,7 @@
                     <template #default="scope">
                       <el-button
                         v-if="'update,create,alter'.indexOf(query.active) > -1"
+                        :disabled="formData.packageStatus == 1"
                         link
                         type="primary"
                         size="small"
@@ -341,13 +342,19 @@
     <div class="text-center hl-footer">
       <el-button @click="() => router.back()" size="large">取 消</el-button>
       <el-button
-        v-if="'update,create'.indexOf(query.active) > -1"
+        v-if="'update,create'.indexOf(query.active) > -1 && formData.packageStatus == 2"
         @click="submitForm()"
         type="primary"
         size="large"
         >保 存</el-button
       >
-      <el-button type="success" @click="submitFormpack" size="large">包装完成</el-button>
+      <el-button
+        type="success"
+        @click="submitFormpack"
+        size="large"
+        v-if="'update,create'.indexOf(query.active) > -1 && formData.packageStatus == 2"
+        >包装完成</el-button
+      >
     </div>
   </el-card>
   <!-- 表单弹窗：物料列表 -->
@@ -514,19 +521,19 @@ const packstatus = ref({
   packageStatus: undefined,
   isUrgency: formData.value.isUrgency,
   active: 1,
-  orderStatus:formData.value.orderStatus,
+  orderStatus: formData.value.orderStatus,
-  status:1,
+  status: 1,
-  customerId:1,
+  customerId: 1
 })
 //包装完成
 const submitFormpack = async () => {
-  try{
+  try {
     await ProjectOrderApi.saleOrderUpdatePackageStatus(packstatus.value)
-  }finally{
+  } finally {
     message.success(t('操作成功'))
     reload()
   }
-  }
+}
 
 /** 新增子项按钮操作 */
 const onAddItem = () => {
@@ -644,7 +651,9 @@ const selectedRow = ref<string | null>(null) // 新增，用于存储当前选
 const ranges = ref([])
 const previewref = ref()
 const handlePrint = (val) => {
-  previewref.value?.open(formData.value.code, val)
+  // console.log(formData.value,val,'detail');
+  
+  previewref.value?.open(formData.value, val)
 }
 </script>
 <style>

mes-ui/mes-ui-admin-vue3/src/views/biz/Packaging/printDialog.vue

@@ -126,8 +126,8 @@ const outopen = () => {
 const printCodeName = ref([])
 const datavals = ref([])
 /** 打开弹窗 */
-const open = async (code, vals, val) => {
+const open = async (Fdata, vals, val) => {
-  console.log(code, vals, val)
+  // console.log(Fdata, vals, val, 'print')
   datavals.value = []
   printCodeName.value = []
   vals.forEach((item) => {
@@ -148,7 +148,7 @@ const open = async (code, vals, val) => {
 
   for (let i = val[0] * 1; i <= val[1] * 1; i++) {
     // 构建新的字符串并添加到printCodeName数组
-    const newName = `${code}-${vals[0].clauseId}-${i}`
+    const newName = `${Fdata.id}-${vals[0].clauseId}-${i}`
     printCodeName.value.push(newName)
   }
   // console.log(printCodeName.value)
@@ -159,15 +159,29 @@ const open = async (code, vals, val) => {
       const qrCodeData = await QRCode.toDataURL(item)
       const qrCodeElement = document.getElementById('qrCodeContainer')
       if (qrCodeElement) {
-        var tempString = ""
+        var tempString = ''
-        datavals.value.forEach(e=>{tempString+='<span style="margin-left:30px;">'+e.projectSubName+' , '+e.spec+' , '+e.sort+' , '+e.amount+'</span>'})
+        datavals.value.forEach((e) => {
-        qrCodeElement.innerHTML += `<div class="page qr-page">
+          tempString +=
+            '<span style="margin-left:30px;">' +
+            e.projectSubName +
+            ' , ' +
+            e.spec +
+            ' , ' +
+            e.sort +
+            ' , ' +
+            e.amount +
+            '</span>'
+        })
+        qrCodeElement.innerHTML +=
+          `<div class="page qr-page">
          <div class="qr-code-container" style=" padding:0 5mm; border:1px #d3d3d3 solid;display:flex; justify-content: flex-start; font-size:16px;font-weight:700;"> 
            <img src="${qrCodeData}" width="30%"  alt="QR Code"/>
             <div style="margin-left:5mm;text-align:left;" >
-            <p>订单名称(Order name)：${code}</p>
+            <p>订单名称(Order name)：${Fdata.code}</p>
             <hr/>
-            <p>产品清单(Product list)：</p>`+tempString+`
+            <p>产品清单(Product list)：</p>` +
+          tempString +
+          `
              </div> 
         </div>
        
@@ -231,7 +245,6 @@ defineExpose({ open }) // 提供 open 方法，用于打开弹窗
 .qr-code-container-item {
   width: 100mm;
   height: 69mm;
-  
 }
 /*
 	A4的大小：21cm*29.7cm（width:794px;）。