fix

src/views/sellOut/filing/cpns/baseDetail.vue

@@ -26,6 +26,13 @@
             <template slot="expect_service_proportion">
               <span>{{ sitem.expect_service_proportion }}%</span>
             </template>
+            <template slot="annex">
+              <div v-if="sitem" style="display: flex;align-items: center;">
+                {{ getAnnexName() }}
+                <el-button type="text" size="mini" style="margin-left:10px" @click="download">下载</el-button>
+              </div>
+            </template>
+
             <template slot="service_proportion">
               <span>{{ sitem.service_proportion }}%</span>
             </template>
@@ -138,14 +145,15 @@
                 "
               />
             </template>
+
             <template slot="noble">
               <span v-if="sitem.noble_name">
                 {{ sitem.noble_weight ? sitem.noble_weight : "0" }}g-{{
-                sitem.noble_name
+                  sitem.noble_name
                 }}-{{ sitem.gold_price ? sitem.gold_price : "0" }}元/g-{{
-                sitem.is_gold_price === "0" ? "不" : ""
+                  sitem.is_gold_price === "0" ? "不" : ""
                 }}启用实时金价-{{ sitem.is_diff === "1" ? "有" : "无" }}工差-{{
-                sitem.config
+                  sitem.config
                 }}-{{ sitem.other_config }}
               </span>
               <span v-else>--</span>
@@ -159,7 +167,7 @@
                 class="fl"
                 :src="si"
                 alt
-              />
+              >
             </template>
           </show-data-table>
         </el-collapse-item>
@@ -168,9 +176,9 @@
   </div>
 </template>
 <script>
-import asyncRequest from "@/apis/service/sellOut/filing";
-import resToken from "@/mixins/resToken";
-import { mapGetters } from "vuex";
+import asyncRequest from '@/apis/service/sellOut/filing'
+import resToken from '@/mixins/resToken'
+import { mapGetters } from 'vuex'
 
 import {
   costArr,
@@ -191,18 +199,18 @@ import {
   bargainingArr,
   statusOptions,
   is_determine_price_options
-} from "../config/columns";
+} from '../config/columns'
 
 export default {
-  name: "FilingDetail",
+  name: 'FilingDetail',
   mixins: [resToken],
   computed: {
-    ...mapGetters(["tablebtnSize", "searchSize", "size", "private_field"])
+    ...mapGetters(['tablebtnSize', 'searchSize', 'size', 'private_field'])
   },
 
   data() {
     return {
-      size: "small",
+      size: 'small',
       eaxmList: [],
       costArr,
       bargainingArr,
@@ -222,81 +230,102 @@ export default {
       statusOptions,
       is_determine_price_options,
       coveColumns,
-      projectTabs: "1",
-      activeNames: ["0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "20"],
-      newTime: "",
+      projectTabs: '1',
+      activeNames: ['0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '20'],
+      newTime: '',
       loading: false,
-      queryType: "",
-      queryId: "",
-      status: "",
+      queryType: '',
+      queryId: '',
+      status: '',
       sitem: null,
 
       orderItem: {},
       moneyDirItem: {},
       moneyItem: {},
       BossItem: {}
-    };
+    }
   },
   mounted() {
-    this.initForm();
+    this.initForm()
   },
   methods: {
     async initForm() {
-      const { id, type } = this.$route.query;
-      this.queryId = id;
-      this.queryType = type;
-      this.projectTabs = "1";
-      this.loading = true;
-      await this.initData();
-      this.loading = false;
+      const { id, type } = this.$route.query
+      this.queryId = id
+      this.queryType = type
+      this.projectTabs = '1'
+      this.loading = true
+      await this.initData()
+      this.loading = false
     },
 
     handleClick(row) {
-      console.log(row);
+      console.log(row)
     },
     async refresh() {
-      this.routeReGoto("filing", {});
+      this.routeReGoto('filing', {})
+    },
+    download() {
+      const { fill_url } = this.sitem
+      const a = document.createElement('a')
+      a.style.display = 'none'
+      a.href = fill_url
+      document.body.appendChild(a)
+      a.click()
+      document.body.removeChild(a)
+    },
+    getAnnexName() {
+      const { fill_url } = this.sitem
+      if (!fill_url) return ''
+      const chunks = fill_url.split('/')
+      const [name, suffix] = (chunks[chunks.length - 1] || '').split('.')
+
+      if (name.length > 10) {
+        return ([name[0], name[1], name[2], ' ... ', name[name.length - 2], name[name.length - 1]]).join('') + '.' + suffix
+      }
+
+      return name + '.' + suffix
     },
     async initData() {
-      this.loading = true;
+      this.loading = true
 
       const { code, message, data } = await asyncRequest.detail({
         id: this.queryId
-      });
+      })
 
       // return
-      this.eaxmList = [];
-      this.loading = false;
+      this.eaxmList = []
+      this.loading = false
       if (code === 0) {
-        this.sitem = JSON.parse(JSON.stringify(data));
-        const { cat_info } = this.sitem;
-        let cat = "";
+        this.sitem = JSON.parse(JSON.stringify(data))
+        const { cat_info } = this.sitem
+        let cat = ''
 
         if (cat_info && cat_info.length > 0) {
           cat_info.forEach((e, i) => {
-            cat += i === 0 ? e.name : "_" + e.name;
-          });
+            cat += i === 0 ? e.name : '_' + e.name
+          })
         }
-        this.sitem.cat = cat;
-        const { status, num, orderCode } = this.sitem;
-        this.status = status;
+        this.sitem.cat = cat
+        const { status, num, orderCode } = this.sitem
+        this.status = status
 
-        this.$emit("change-detail", data);
+        this.$emit('change-detail', data)
         // this.$emit('change-status', status)
-        this.$emit("change-num", num);
-        this.$emit("change-order-code", orderCode);
-        this.getNewTime();
+        this.$emit('change-num', num)
+        this.$emit('change-order-code', orderCode)
+        this.getNewTime()
       } else if (code >= 100 && code <= 104) {
-        await this.logout();
+        await this.logout()
       } else {
-        this.$message.warning(message);
+        this.$message.warning(message)
       }
     },
     getNewTime() {
-      this.newTime = new Date().valueOf();
+      this.newTime = new Date().valueOf()
     }
   }
-};
+}
 </script>
 <style lang="scss" scoped>
 .filingDetail {

src/views/sellOut/filing/cpns/baseForm.vue

@@ -803,6 +803,7 @@ export default {
       const { is_determine_price, type } = this.ruleForm;
       if(String(type) == "1" && key === "expect_service"){
         this.ruleForm.price = Number(add_sum(this.ruleForm.cgd_charge,this.ruleForm.expect_service) || 0).toFixed(2)
+
         this.ruleForm.expect_service_proportion = accMul(
             this.ruleForm.cgd_charge ? accDiv(this.ruleForm.expect_service, this.ruleForm.cgd_charge) : "0",
             "100"
@@ -812,7 +813,6 @@ export default {
           Number(this.ruleForm.price),
           Number(this.ruleForm.expect_service)
         );
-        // console.log(Sub, Number(Sub));
         this.ruleForm.cgd_charge = Number(Number(Sub) < 0 ? 0 : Sub).toFixed(2);
         const cgd_charge = Number(this.ruleForm.cgd_charge);
         this.ruleForm.expect_service_proportion = accMul(
@@ -853,7 +853,6 @@ export default {
       } else if (String(is_determine_price) == "1") {
         const c1 = accMul(expect_service_proportion, this.ruleForm.price);
         const c2 = add_sum(expect_service_proportion, "100");
-        // console.log(c1, c2);
         this.ruleForm.expect_service = accDiv(c1, c2).toFixed(2);
         this.ruleForm.cgd_charge = accSub(
           this.ruleForm.price,
@@ -1224,8 +1223,6 @@ export default {
               ...item,
               specid: item.spec_id
             }));
-
-            console.log(this.ruleForm);
           }
         }
       });

src/views/supplierSellOut/supplierFiling/cpns/baseDetail.vue

@@ -10,6 +10,13 @@
             :new-time="newTime"
             :columns="editColumns"
           >
+            <template slot="annex">
+              <div v-if="sitem" style="display: flex;align-items: center;">
+                {{ getAnnexName() }}
+                <el-button type="text" size="mini" style="margin-left:10px" @click="download">下载</el-button>
+              </div>
+            </template>
+
             <template slot="status">
               <el-tag
                 :size="tablebtnSize"
@@ -145,11 +152,11 @@
             <template slot="noble">
               <span v-if="sitem.noble_name">
                 {{ sitem.noble_weight ? sitem.noble_weight : "0" }}g-{{
-                sitem.noble_name
+                  sitem.noble_name
                 }}-{{ sitem.gold_price ? sitem.gold_price : "0" }}元/g-{{
-                sitem.is_gold_price === "0" ? "不" : ""
+                  sitem.is_gold_price === "0" ? "不" : ""
                 }}启用实时金价-{{ sitem.is_diff === "1" ? "有" : "无" }}工差-{{
-                sitem.config
+                  sitem.config
                 }}-{{ sitem.other_config }}
               </span>
               <span v-else>--</span>
@@ -163,7 +170,7 @@
                 class="fl"
                 :src="si"
                 alt
-              />
+              >
             </template>
           </show-data-table>
         </el-collapse-item>
@@ -172,9 +179,9 @@
   </div>
 </template>
 <script>
-import asyncRequest from "@/apis/service/sellOut/filing";
-import resToken from "@/mixins/resToken";
-import { mapGetters } from "vuex";
+import asyncRequest from '@/apis/service/sellOut/filing'
+import resToken from '@/mixins/resToken'
+import { mapGetters } from 'vuex'
 
 import {
   editColumns,
@@ -195,18 +202,18 @@ import {
   statusOptions,
   coveColumns,
   is_determine_price_options
-} from "../config/columns";
+} from '../config/columns'
 
 export default {
-  name: "FilingDetail",
+  name: 'FilingDetail',
   mixins: [resToken],
   computed: {
-    ...mapGetters(["tablebtnSize", "searchSize", "size", "private_field"])
+    ...mapGetters(['tablebtnSize', 'searchSize', 'size', 'private_field'])
   },
 
   data() {
     return {
-      size: "small",
+      size: 'small',
       eaxmList: [],
       costArr,
       bargainingArr,
@@ -226,78 +233,99 @@ export default {
       statusOptions,
       is_determine_price_options,
       coveColumns,
-      projectTabs: "1",
-      activeNames: ["0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "20"],
-      newTime: "",
+      projectTabs: '1',
+      activeNames: ['0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '20'],
+      newTime: '',
       loading: false,
-      queryType: "",
-      queryId: "",
-      status: "",
+      queryType: '',
+      queryId: '',
+      status: '',
       sitem: null,
 
       orderItem: {},
       moneyDirItem: {},
       moneyItem: {},
       BossItem: {}
-    };
+    }
   },
   mounted() {
-    this.initForm();
+    this.initForm()
   },
   methods: {
+    download() {
+      const { fill_url } = this.sitem
+      const a = document.createElement('a')
+      a.style.display = 'none'
+      a.href = fill_url
+      document.body.appendChild(a)
+      a.click()
+      document.body.removeChild(a)
+    },
+    getAnnexName() {
+      const { fill_url } = this.sitem
+      if (!fill_url) return ''
+      const chunks = fill_url.split('/')
+      const [name, suffix] = (chunks[chunks.length - 1] || '').split('.')
+
+      if (name.length > 10) {
+        return ([name[0], name[1], name[2], ' ... ', name[name.length - 2], name[name.length - 1]]).join('') + '.' + suffix
+      }
+
+      return name + '.' + suffix
+    },
     async initForm() {
-      const { id, type } = this.$route.query;
-      this.queryId = id;
-      this.queryType = type;
-      this.projectTabs = "1";
-      this.loading = true;
-      await this.initData();
-      this.loading = false;
+      const { id, type } = this.$route.query
+      this.queryId = id
+      this.queryType = type
+      this.projectTabs = '1'
+      this.loading = true
+      await this.initData()
+      this.loading = false
     },
 
     handleClick(row) {
-      console.log(row);
+      console.log(row)
     },
     async refresh() {
-      this.routeReGoto("supplierFiling", {});
+      this.routeReGoto('supplierFiling', {})
     },
     async initData() {
-      this.loading = true;
+      this.loading = true
       const { code, message, data } = await asyncRequest.detail({
         id: this.queryId
-      });
+      })
 
-      this.eaxmList = [];
-      this.loading = false;
+      this.eaxmList = []
+      this.loading = false
       if (code === 0) {
-        this.sitem = JSON.parse(JSON.stringify(data));
-        const { cat_info } = this.sitem;
-        let cat = "";
+        this.sitem = JSON.parse(JSON.stringify(data))
+        const { cat_info } = this.sitem
+        let cat = ''
         if (cat_info && cat_info.length > 0) {
           cat_info.forEach((e, i) => {
-            cat += i === 0 ? e.name : "_" + e.name;
-          });
+            cat += i === 0 ? e.name : '_' + e.name
+          })
         }
-        this.sitem.cat = cat;
-        const { status, wait_num, orderCode } = this.sitem;
-        this.status = status;
+        this.sitem.cat = cat
+        const { status, wait_num, orderCode } = this.sitem
+        this.status = status
 
-        this.$emit("change-detail", data);
-        this.$emit("change-status", status);
-        this.$emit("change-num", wait_num);
-        this.$emit("change-order-code", orderCode);
-        this.getNewTime();
+        this.$emit('change-detail', data)
+        this.$emit('change-status', status)
+        this.$emit('change-num', wait_num)
+        this.$emit('change-order-code', orderCode)
+        this.getNewTime()
       } else if (code >= 100 && code <= 104) {
-        await this.logout();
+        await this.logout()
       } else {
-        this.$message.warning(message);
+        this.$message.warning(message)
       }
     },
     getNewTime() {
-      this.newTime = new Date().valueOf();
+      this.newTime = new Date().valueOf()
     }
   }
-};
+}
 </script>
 <style lang="scss" scoped>
 .filingDetail {

src/views/supplierSellOut/supplierFiling/cpns/baseForm.vue

@@ -870,6 +870,7 @@ export default {
     },
     //计算总价
     getTotal() {
+      //  SELECT SUBSTRING_INDEX(profile,",",-1) AS gender,COUNT(gender) FROM user_profile GROUP BY gender;
       const { num, price } = this.ruleForm;
       this.ruleForm.total = accMul(num, price).toFixed(2);
     },