1

src/components/byForm/index.vue

@@ -10,9 +10,6 @@
       :disabled="formOption.disabled || false"
     >
       <template v-for="i in formConfig" :key="i.model">
-        <div v-if="i.type == 'title'" class="form-title">
-          {{ i.title }}
-        </div>
         <el-form-item
           :label="i.label"
           :prop="i.prop"
@@ -36,6 +33,9 @@
               : ''
           "
         >
+          <div v-if="i.type == 'title'" class="form-title">
+            {{ i.title }}
+          </div>
           <template #label>
             <el-popover
               placement="top"

src/views/JXSK/production/forward/index.vue

@@ -64,6 +64,11 @@
             </div>
           </div>
         </template>
+        <template #productRemark>
+          <div style="width: 100%">
+            {{ formData.data.productRemark }}
+          </div>
+        </template>
         <template #file>
           <div style="width: 100%">
             <el-upload
@@ -314,9 +319,8 @@ const formConfig = computed(() => {
       },
     },
     {
-      type: "input",
-      itemType: "textarea",
-      prop: "productRemark",
+      type: "slot",
+      slotName: "productRemark",
       label: "产品备注",
       disabled: true,
       style: {
@@ -336,12 +340,12 @@ const formConfig = computed(() => {
     {
       type: "slot",
       slotName: "fileOne",
-      label: "上一个工序图纸",
+      label: "前道工序完工拍摄",
     },
     {
       type: "slot",
       slotName: "fileTwo",
-      label: "工序附件",
+      label: "生产工序资料",
     },
     {
       type: "slot",
@@ -351,7 +355,7 @@ const formConfig = computed(() => {
     {
       type: "slot",
       slotName: "file",
-      label: "工序图纸",
+      label: "完工拍摄",
     },
     {
       type: "title",

src/views/JXSK/production/qrDetails/index.vue

@@ -28,7 +28,7 @@
           <img src="@/assets/images/phone-btn2.png" alt="" class="img" />
           <span> 工单详情</span>
         </div>
-        <div class="btn" @click="handleAdd" style="margin-top: 30px">
+        <div class="btn" @click="handleAdd" style="margin-top: 50px">
           <img src="@/assets/images/phone-btn1.png" alt="" class="img" />
           <span> 售后申请 </span>
         </div>
@@ -194,10 +194,16 @@
                 :data="uploadData"
                 multiple
                 :before-upload="uploadFile"
-                :on-preview="onPreviewFile"
               >
                 <el-button>选择</el-button>
               </el-upload>
+              <!-- <input
+                type="file"
+                accept="image/*"
+                capture="camera"
+                multiple
+                @change="handleFileChange"
+              /> -->
             </div>
           </el-form-item>
         </div>
@@ -219,6 +225,7 @@
 import TitleInfo from "@/components/TitleInfo/index.vue";
 import useUserStore from "@/store/modules/user";
 import request from "@/utils/request";
+import { async } from "@antv/x6/lib/registry/marker/async";
 import { ElMessage, ElMessageBox } from "element-plus";
 import QRCode from "qrcodejs2-fix";
 
@@ -370,8 +377,40 @@ onMounted(() => {
     }
   });
 });
+
+const handleFileChange = (e) => {
+  const file = e.target.files[0];
+  request({
+    url: "/open/afterSales/fileInfo/getSing",
+    headers: {
+      isToken: false,
+    },
+    method: "post",
+    data: { fileName: file.name },
+  }).then((res) => {
+    request({
+      url: "https://winfaster.obs.cn-south-1.myhuaweicloud.com",
+      headers: {
+        isToken: false,
+      },
+      method: "post",
+      data: { ...res.data.uploadBody, file },
+    }).then(() => {
+      file.id = res.data.id;
+      file.fileUrl = res.data.fileUrl;
+      file.fileName = res.data.fileName;
+      afterSalesForm.value.fileList.push({
+        id: res.data.id,
+        fileName: res.data.fileName,
+        fileUrl: res.data.fileUrl,
+      });
+    });
+  });
+};
 </script>
 
+
+
 <style lang="scss" scoped>
 .bg {
   height: 100vh;
@@ -387,13 +426,13 @@ onMounted(() => {
 .top {
   background-color: rgba(255, 255, 255, 0.7);
   border-radius: 5px;
-  padding: 10px;
+  padding: 20px 10px;
   .t {
     .title1 {
       font-size: 20px;
       font-weight: 700;
       color: #fff;
-      margin-bottom: 10px;
+      margin-bottom: 20px;
       text-align: left;
     }
   }
@@ -418,13 +457,13 @@ onMounted(() => {
 .bottom {
   background-color: rgba(255, 255, 255, 0.7);
   border-radius: 5px;
-  padding: 30px;
+  padding: 50px 30px;
   margin-top: 20px;
   .btn {
-    height: 13vh;
+    height: 17vh;
     text-align: center;
     cursor: pointer;
-    line-height: 13vh;
+    line-height: 17vh;
     color: #fff;
     background-color: rgba(21, 73, 121, 1);
     font-size: 25px;

src/views/JXSK/production/receive/index.vue

@@ -28,6 +28,11 @@
         :rules="rules"
         ref="byform"
       >
+        <template #productRemark>
+          <div style="width: 100%">
+            {{ formData.data.productRemark }}
+          </div>
+        </template>
         <template #file>
           <div style="width: 100%">
             <el-upload
@@ -252,9 +257,8 @@ const formConfig = computed(() => {
       },
     },
     {
-      type: "input",
-      itemType: "textarea",
-      prop: "productRemark",
+      type: "slot",
+      slotName: "productRemark",
       label: "产品备注",
       disabled: true,
       style: {
@@ -273,13 +277,8 @@ const formConfig = computed(() => {
     },
     {
       type: "slot",
-      slotName: "file",
-      label: "工序图纸",
-    },
-    {
-      type: "slot",
       slotName: "fileTwo",
-      label: "工序附件",
+      label: "生产工序资料",
     },
     {
       type: "slot",
@@ -287,6 +286,11 @@ const formConfig = computed(() => {
       label: "工单附件",
     },
     {
+      type: "slot",
+      slotName: "file",
+      label: "完工拍摄",
+    },
+    {
       type: "input",
       itemType: "text",
       prop: "previousProcessesName",

src/views/JXSK/production/workOrder/index.vue

@@ -108,7 +108,7 @@
                   type="primary"
                   @click="handleUploadFile(item, false)"
                   >{{
-                    item.researchStatus ? "修改" : "上传"
+                    item.researchStatus ? "查看" : "上传"
                   }}设计资料</el-button
                 >
               </span>
@@ -192,6 +192,7 @@
               <el-table :data="formData.data.workOrderBomList">
                 <el-table-column prop="productCode" label="物料编码" />
                 <el-table-column prop="productName" label="物料名称" />
+                <el-table-column prop="productSpec" label="规格型号" />
                 <el-table-column
                   prop="productUnit"
                   label="单位"
@@ -1164,6 +1165,7 @@ const handleSelect = (row) => {
     productId: row.id,
     productCode: row.code,
     productName: row.name,
+    productSpec: row.spec,
     productUnit: row.unit,
     quantity: null,
   });

src/views/JXSK/salesMange/contract/index.vue

@@ -318,9 +318,9 @@ const rules = ref({
   shroffAccountId: [
     { required: true, message: "请选择收款账户", trigger: "change" },
   ],
-  // deliveryDate: [
-  //   { required: true, message: "请选择交货期限", trigger: "change" },
-  // ],
+  deliveryDate: [
+    { required: true, message: "请选择交货期限", trigger: "change" },
+  ],
   payMethod: [{ required: true, message: "请选择付款方式", trigger: "change" }],
   freightPayer: [
     { required: true, message: "请选择运费支付方", trigger: "change" },

src/views/product/material/index.vue

@@ -222,7 +222,7 @@ const config = computed(() => {
     },
     {
       attrs: {
-        label: "库存阀值",
+        label: "安全库存",
         prop: "stockThreshold",
       },
     },
@@ -376,7 +376,7 @@ const formConfig = computed(() => {
     {
       type: "number",
       prop: "stockThreshold",
-      label: "库存阀值",
+      label: "安全库存",
       precision: 0,
       min: 1,
       controls: false,