yusheng před 1 rokem
rodič
revize
a906081a97

+ 1 - 1
src/enum/dict.js

@@ -38,7 +38,7 @@ export default {
   生产类型: 'productionType',
   生产类型: 'productionType',
   计量单位: 'measuring_uint',
   计量单位: 'measuring_uint',
   工种类型: 'work_type',
   工种类型: 'work_type',
-
+  文档类型: 'doc_type',
   工作流任务分配规则的类型: 'bpm_task_assign_rule_type',
   工作流任务分配规则的类型: 'bpm_task_assign_rule_type',
   工作流任务分配自定义脚本: 'bpm_task_assign_script',
   工作流任务分配自定义脚本: 'bpm_task_assign_script',
 };
 };

+ 71 - 90
src/views/ledgerAssets/components/documentInformation.vue

@@ -7,65 +7,44 @@
       <div class="file-list">
       <div class="file-list">
         <div>
         <div>
           <el-form-item prop="image" label="使用说明书">
           <el-form-item prop="image" label="使用说明书">
-            <fileUpload
+            <!-- <fileUpload
               v-model="attUrl.operatingManual.value"
               v-model="attUrl.operatingManual.value"
               module="main"
               module="main"
               :showLib="true"
               :showLib="true"
-            />
+            /> -->
+            <fileMain v-model="attUrl.operatingManual.value"></fileMain>
           </el-form-item>
           </el-form-item>
         </div>
         </div>
         <div>
         <div>
           <el-form-item prop="image" label="生产许可证书">
           <el-form-item prop="image" label="生产许可证书">
-            <fileUpload
-              v-model="attUrl.productionLicence.value"
-              module="main"
-              :showLib="true"
-            />
+            <fileMain v-model="attUrl.productionLicence.value"></fileMain>
           </el-form-item>
           </el-form-item>
         </div>
         </div>
         <div>
         <div>
           <el-form-item prop="image" label="防爆合格证书">
           <el-form-item prop="image" label="防爆合格证书">
-            <fileUpload
+            <fileMain
               v-model="attUrl.explosionProofCertificate.value"
               v-model="attUrl.explosionProofCertificate.value"
-              module="main"
-              :showLib="true"
-            />
+            ></fileMain>
           </el-form-item>
           </el-form-item>
         </div>
         </div>
         <div>
         <div>
           <el-form-item prop="image" label="检验报告">
           <el-form-item prop="image" label="检验报告">
-            <fileUpload
-              v-model="attUrl.surveyReport.value"
-              module="main"
-              :showLib="true"
-            />
+            <fileMain v-model="attUrl.surveyReport.value"></fileMain>
           </el-form-item>
           </el-form-item>
         </div>
         </div>
         <div>
         <div>
           <el-form-item prop="image" label="检验周期说明">
           <el-form-item prop="image" label="检验周期说明">
-            <fileUpload
-              v-model="attUrl.inspectionCycleManual.value"
-              module="main"
-              :showLib="true"
-            />
+            <fileMain v-model="attUrl.inspectionCycleManual.value"></fileMain>
           </el-form-item>
           </el-form-item>
         </div>
         </div>
         <div>
         <div>
           <el-form-item prop="image" label="图纸资料">
           <el-form-item prop="image" label="图纸资料">
-            <fileUpload
-              v-model="attUrl.informationDrawing.value"
-              module="main"
-              :showLib="true"
-            />
+            <fileMain v-model="attUrl.informationDrawing.value"></fileMain>
           </el-form-item>
           </el-form-item>
         </div>
         </div>
         <div>
         <div>
           <el-form-item prop="image" label="产品合格证">
           <el-form-item prop="image" label="产品合格证">
-            <fileUpload
-              v-model="attUrl.productCertificate.value"
-              module="main"
-              :showLib="true"
-            />
+            <fileMain v-model="attUrl.productCertificate.value"></fileMain>
           </el-form-item>
           </el-form-item>
         </div>
         </div>
       </div>
       </div>
@@ -73,70 +52,72 @@
   </div>
   </div>
 </template>
 </template>
 <script>
 <script>
-import fileUpload from '@/components/upload/fileUpload';
-import WithView from '@/components/upload/WithView';
-export default {
-  components: {
-    WithView,
-    fileUpload
-  },
-  props: ['type'],
-  data() {
-    return {
-      // 图片
-      imageUrl: null,
-      // 文档信息
-      attUrl: {
-        operatingManual: {
-          value: [],
-          sort: 1
-        },
-        productionLicence: {
-          value: [],
-          sort: 2
-        },
-        explosionProofCertificate: {
-          value: [],
-          sort: 3
-        },
-        surveyReport: {
-          value: [],
-          sort: 4
-        },
-        inspectionCycleManual: {
-          value: [],
-          sort: 5
-        },
-        informationDrawing: {
-          value: [],
-          sort: 6
-        },
-        productCertificate: {
-          value: [],
-          sort: 7
+  import fileUpload from '@/components/upload/fileUpload';
+  import fileMain from '@/components/addDoc/index.vue';
+  import WithView from '@/components/upload/WithView';
+  export default {
+    components: {
+      WithView,
+      fileMain,
+      fileUpload
+    },
+    props: ['type'],
+    data() {
+      return {
+        // 图片
+        imageUrl: null,
+        // 文档信息
+        attUrl: {
+          operatingManual: {
+            value: [],
+            sort: 1
+          },
+          productionLicence: {
+            value: [],
+            sort: 2
+          },
+          explosionProofCertificate: {
+            value: [],
+            sort: 3
+          },
+          surveyReport: {
+            value: [],
+            sort: 4
+          },
+          inspectionCycleManual: {
+            value: [],
+            sort: 5
+          },
+          informationDrawing: {
+            value: [],
+            sort: 6
+          },
+          productCertificate: {
+            value: [],
+            sort: 7
+          }
         }
         }
+      };
+    },
+    methods: {
+      async getDetailInfoAugr(data) {
+        this.attUrl = data;
       }
       }
-    };
-  },
-  methods: {
-    async getDetailInfoAugr(data) {
-      this.attUrl = data;
     }
     }
-  }
-};
+  };
 </script>
 </script>
 
 
 <style lang="scss" scoped>
 <style lang="scss" scoped>
-.upload-container {
-  display: flex;
-  justify-content: flex-start;
-  .file-list {
-    margin-left: 50px;
-    flex: 1;
+  .upload-container {
+    display: flex;
+    justify-content: flex-start;
+    .file-list {
+      margin-left: 50px;
+      flex: 1;
+    }
+  }
+  .basic-details-title {
+    font-size: 16px;
+    margin: 15px 0;
   }
   }
-}
-.basic-details-title {
-  font-size: 16px;
-  margin: 15px 0;
-}
 </style>
 </style>

+ 9 - 9
src/views/ledgerAssets/turnoverCar/edit.vue

@@ -411,6 +411,7 @@
             }
             }
             this.btnLoading = true;
             this.btnLoading = true;
             console.log('sasasasa', par);
             console.log('sasasasa', par);
+            // return;
             saveOrEdit(par)
             saveOrEdit(par)
               .then((res) => {
               .then((res) => {
                 this.$message.success('操作成功');
                 this.$message.success('操作成功');
@@ -431,10 +432,13 @@
       },
       },
       // 处理文档信息
       // 处理文档信息
       setWd() {
       setWd() {
-        return Object.values(this.attUrl).map((item) => ({
-          ...(item.value[0] || {}),
-          sort: item.sort
-        }));
+        return Object.values(this.attUrl).map((item) => {
+          console.log(item, 'item');
+          return {
+            value: item.value || [],
+            sort: item.sort
+          };
+        });
       },
       },
       // 获取周转车详情
       // 获取周转车详情
       async getInfo() {
       async getInfo() {
@@ -491,11 +495,7 @@
         // 文档信息
         // 文档信息
         if (this.form.attUrl && this.form.attUrl.length > 0) {
         if (this.form.attUrl && this.form.attUrl.length > 0) {
           Object.keys(this.attUrl).forEach((n, index) => {
           Object.keys(this.attUrl).forEach((n, index) => {
-            this.attUrl[n].value =
-              (this.form.attUrl[index]?.storePath && [
-                this.form.attUrl[index]
-              ]) ||
-              [];
+            this.attUrl[n].value = this.form.attUrl[index].value || [];
           });
           });
           this.$refs.documentInformationRef.getDetailInfoAugr(this.attUrl);
           this.$refs.documentInformationRef.getDetailInfoAugr(this.attUrl);
         }
         }