ysy 2 年 前
コミット
33860a4935

+ 14 - 1
src/api/outsourcing/index.js

@@ -11,4 +11,17 @@ export async function getList (data) {
     return res.data.data;
   }
   return Promise.reject(new Error(res.data.message));
-}
+}
+
+
+/**
+ * 发布
+ */
+
+ export async function release (params) {
+  const res = await request.post('/mes/applyoutsource/release', params);
+  if (res.data.code == 0) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}

+ 19 - 8
src/views/outsourcing/components/release.vue

@@ -4,16 +4,29 @@
         <el-form ref="form" :model="form" :rules="rules" label-width="80px">
             <el-row>
                 <el-col :span="20">
-                    <el-form-item label="附件:" prop="bomArtFiles">
-                        <fileUpload v-model="form.bomArtFiles" module="main" :showLib="false" :limit="5" />
-                        <div v-if="form.bomArtFiles && form.bomArtFiles?.length">
-                            <el-link v-for="link in form.bomArtFiles" :key="link.id" type="primary" :underline="false"
+                    <el-form-item label=" 图纸附件:" prop="technicalDrawings">
+                        <fileUpload v-model="form.technicalDrawings" module="main" :showLib="false" :limit="5" />
+                        <div v-if="form.technicalDrawings && form.technicalDrawings?.length">
+                            <el-link v-for="link in form.technicalDrawings" :key="link.id" type="primary" :underline="false"
                                 @click="downloadFile(link)">
                                 {{ link.name }}</el-link>
                         </div>
                     </el-form-item>
                 </el-col>
 
+                <el-col :span="20">
+                    <el-form-item label=" 附件:" prop="files">
+                        <fileUpload v-model="form.files" module="main" :showLib="false" :limit="5" />
+                        <div v-if="form.files && form.files?.length">
+                            <el-link v-for="link in form.files" :key="link.id" type="primary" :underline="false"
+                                @click="downloadFile(link)">
+                                {{ link.name }}</el-link>
+                        </div>
+                    </el-form-item>
+                </el-col>
+
+
+
 
                 <el-col :span="20">
                     <el-form-item label="分批到货:" prop="">
@@ -29,7 +42,6 @@
 
 
 
-
         </el-form>
 
 
@@ -45,6 +57,7 @@
 </template>
 
 <script>
+import { release } from '@/api/outsourcing/index.js';
 import fileUpload from '@/components/upload/fileUpload';
 import { getFile } from "@/api/system/file";
 import timeDialog from './timeDialog'
@@ -58,9 +71,7 @@ export default {
             visible: false,
 
             form: {},
-
             rules: {},
-
             loading: false
         }
     },
@@ -70,7 +81,7 @@ export default {
         downloadFile(file) {
             getFile({ objectName: file.storePath }, file.name);
         },
-        open() {
+        open(row) {
             this.visible = true
         },
 

+ 0 - 2
src/views/outsourcing/components/search.vue

@@ -23,8 +23,6 @@
 
 
 
-
-
             <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
                 <el-form-item label-width="0px">
                     <el-button type="primary" icon="el-icon-search" class="ele-btn-icon" @click="search">

+ 1 - 1
src/views/outsourcing/components/timeDialog.vue

@@ -118,7 +118,7 @@ export default {
         },
 
         handleDel(index) {
-            this.timeList.splice(index, 1)
+            this.form.timeList.splice(index, 1)
         },
 
 

+ 28 - 12
src/views/outsourcing/index.vue

@@ -12,16 +12,27 @@
                 </template>
 
 
-                <template v-slot:bomArtFiles="{ row }">
+                <template v-slot:technicalDrawings="{ row }">
 
-                    <div v-if="row.bomArtFiles && row.bomArtFiles?.length">
-                        <el-link v-for="link in row.bomArtFiles" :key="link.id" type="primary" :underline="false"
+                    <div v-if="row.technicalDrawings && row.technicalDrawings?.length">
+                        <el-link v-for="link in row.technicalDrawings" :key="link.id" type="primary" :underline="false"
                             @click="downloadFile(link)">
                             {{ link.name }}</el-link>
                     </div>
 
                 </template>
 
+
+                <template v-slot:files="{ row }">
+                    <div v-if="row.files && row.technicalDrawings?.length">
+                        <el-link v-for="link in row.files" :key="link.id" type="primary" :underline="false"
+                            @click="downloadFile(link)">
+                            {{ link.name }}</el-link>
+                    </div>
+
+                </template>
+
+
                 <template v-slot:action="{ row }">
                     <el-link type="primary" :underline="false" @click="handleFlow(row)">
                         流程
@@ -98,7 +109,7 @@ export default {
                     align: 'center'
                 },
 
-         
+
                 {
                     prop: 'workOrderCode',
                     label: '工单编码',
@@ -108,7 +119,7 @@ export default {
 
 
                 {
-                    prop: '',
+                    prop: 'taskName',
                     label: '工序',
                     align: 'center'
                 },
@@ -127,7 +138,6 @@ export default {
                 },
 
 
-
                 {
                     prop: 'remark',
                     label: '备注',
@@ -156,14 +166,22 @@ export default {
                 },
 
 
+                {
+                    label: '图片附件',
+                    slot: 'technicalDrawings',
+                    action: 'technicalDrawings',
+                    minWidth: 100,
+                },
+
                 {
                     label: '附件',
-                    slot: 'bomArtFiles',
-                    action: 'bomArtFiles',
+                    slot: 'files',
+                    action: 'files',
                     minWidth: 100,
                 },
 
 
+
                 {
                     columnKey: 'action',
                     label: '操作',
@@ -216,8 +234,6 @@ export default {
         },
 
         handleDetails(row) {
-
-
             if (this.clientEnvironmentId == 3) {
                 this.$refs.detailsRef.open(row)
             }
@@ -225,8 +241,8 @@ export default {
         },
 
 
-        handleRelease() {
-            this.$refs.releaseRef.open()
+        handleRelease(row) {
+            this.$refs.releaseRef.open(row)
         },
 
 

+ 0 - 3
src/views/warehousing/components/tgDetails.vue

@@ -37,9 +37,6 @@
       </template>
 
 
-
-
-
     </ele-pro-table>