Merge branch 'company' into v3.0

dist/static/js/chunk-libs.js

@@ -16827,17 +16827,6 @@ eval("// style-loader: Adds some css to the DOM by adding a <style> tag\n\n// lo
 
 /***/ }),
 
-/***/ "./node_modules/os-browserify/browser.js":
-/*!***********************************************!*\
-  !*** ./node_modules/os-browserify/browser.js ***!
-  \***********************************************/
-/*! no static exports found */
-/***/ (function(module, exports) {
-
-eval("exports.endianness = function () { return 'LE' };\n\nexports.hostname = function () {\n    if (typeof location !== 'undefined') {\n        return location.hostname\n    }\n    else return '';\n};\n\nexports.loadavg = function () { return [] };\n\nexports.uptime = function () { return 0 };\n\nexports.freemem = function () {\n    return Number.MAX_VALUE;\n};\n\nexports.totalmem = function () {\n    return Number.MAX_VALUE;\n};\n\nexports.cpus = function () { return [] };\n\nexports.type = function () { return 'Browser' };\n\nexports.release = function () {\n    if (typeof navigator !== 'undefined') {\n        return navigator.appVersion;\n    }\n    return '';\n};\n\nexports.networkInterfaces\n= exports.getNetworkInterfaces\n= function () { return {} };\n\nexports.arch = function () { return 'javascript' };\n\nexports.platform = function () { return 'browser' };\n\nexports.tmpdir = exports.tmpDir = function () {\n    return '/tmp';\n};\n\nexports.EOL = '\\n';\n\nexports.homedir = function () {\n\treturn '/'\n};\n\n\n//# sourceURL=webpack:///./node_modules/os-browserify/browser.js?");
-
-/***/ }),
-
 /***/ "./node_modules/path-browserify/index.js":
 /*!***********************************************!*\
   !*** ./node_modules/path-browserify/index.js ***!

src/App.vue

@@ -6,7 +6,6 @@
 
 <script>
 import { mapGetters } from 'vuex'
-
 export default {
   name: 'App',
   data() {

src/config/env.company.js

@@ -22,7 +22,7 @@ module.exports = {
   // settlementPlatformUrl: 'http://127.0.0.1:8848',
   // 结算平台url
   settlementPlatformUrl: 'http://webcx.test241.wanyuhengtong.com/',
-   // 工单管理系统url
+  // 工单管理系统url
   GDUrl: 'http://http://bugweb.test241.wanyuhengtong.com/',
   // token加密key
   secretKey: 'key123',

src/config/env.development.js

@@ -3,10 +3,10 @@ module.exports = {
   title: '采销平台',
   baseUrl: 'http://wx.wxhr.sit.futurelab.tv',
   api: {
-    baseApi: 'http://stock.api.caixiao365.com/'
+    baseApi: 'http://stocknew.test241.wanyuhengtong.com/'
     // baseApi: 'http://stockwm.test241.wanyuhengtong.com/'
   },
-  webUrl: 'http://project.web.caixiao365.com/#/good-share?id=',
+  webUrl: 'http://project.web.caixiao365.com/#/test-good-share?id=',
   fileURL: `https://api2.edu.futurelab.tv`,
   shareWebUrl: 'http://post.web.caixiao365.com/?prod=1&outCode=',
   // 分仓
@@ -21,10 +21,9 @@ module.exports = {
   // 结算平台url
   // settlementPlatformUrl: 'http://127.0.0.1:8848',
   // 结算平台url
-  settlementPlatformUrl: 'http://fin.caixiao365.com/',
-  dashboardUrl: 'http://web.report.caixiao365.com/',
+  settlementPlatformUrl: 'http://webcx.test241.wanyuhengtong.com/',
   // 工单管理系统url
-  GDUrl: 'http://bug.caixiao365.com/',
+  GDUrl: 'http://http://bugweb.test241.wanyuhengtong.com/',
   // token加密key
   secretKey: 'key123',
   loginTitle: '',

src/layout/components/Navbar.vue

@@ -115,12 +115,6 @@
         </div>
 
         <el-dropdown-menu slot="dropdown">
-          <!-- <router-link to="/person/my-message">
-            <el-dropdown-item>我的信息</el-dropdown-item>
-          </router-link>
-          <router-link to="/person/change-phone">
-            <el-dropdown-item>更换手机号</el-dropdown-item>
-          </router-link> -->
           <el-dropdown-item @click.native="visible = true">
             <span style="display: block">修改密码</span>
           </el-dropdown-item>
@@ -247,7 +241,6 @@ import {
 import CryptoJS from 'crypto-js'
 import { userStoreActions } from '@/store/modules/user'
 import { accountLevels } from '@/assets/js/statusList'
-import { userInfo } from 'os'
 
 export default {
   computed: {

src/utils/validate.js

@@ -533,7 +533,7 @@ export function hasSpace(s) {
   //   \0  000   空字符(NUL)
   //   \ddd 三位八进制  1到3位八进制数所代表的任意字符 会把数字过滤掉
   //   \xhh 十六进制  十六进制所代表的任意字符 会把部分字母过滤掉
-  // 
+  //
   const str2 = s.replace(/[\b\f\n\r\t\v\\\'\"\?\0]/g, "");
   console.log(s);
   console.log(str2);
@@ -596,3 +596,9 @@ export function invTime(s) {
     return `${arr1 + "-" + arr2 + "-" + arr3}`;
   }
 }
+// /[\u4e00-\u9fa5]|[^\u3002\u4e00-\u9fa5]*/g
+
+// 要匹配汉字或者汉字加标点符号的字符串，但不匹配标点符号 (中文段落)
+export function ChineseParagraph(s) {
+  return !s == s.replace(/[\u4e00-\u9fa5]|[^\u3002\u4e00-\u9fa5]*/g, "");
+}

src/views/netOrderEntry/netOrderEnter/addEdit-c.vue

@@ -33,7 +33,9 @@
             <el-row>
               <el-col :span="12">
                 <el-form-item label="销售方公司:" label-width="100px" prop="companyNo">
-                  <p style="font-size:14px;color:#606266;font-weight:700">{{ getCompanyWithCode(ruleForm.companyNo).name }}</p>
+                  <p style="font-size: 14px; color: #606266; font-weight: 700">
+                    {{ getCompanyWithCode(ruleForm.companyNo).name }}
+                  </p>
                   <!-- <search-work-company
                     disabled
                     :value="ruleForm.companyNo"
@@ -115,7 +117,7 @@
               <el-col :span="12">
                 <el-form-item label="其他单号" prop="workCode">
                   <template #label>
-                    <p style="margin-left:10px">其他单号</p>
+                    <p style="margin-left: 10px">其他单号</p>
                   </template>
                   <el-input
                     v-model="ruleForm.workCode"
@@ -349,11 +351,9 @@
           </el-form>
         </el-col>
         <el-col :span="24" style="text-align: right">
-          <el-button
-            v-if="id !== '007'"
-            type="primary"
-            @click="submitForm"
-          >保 存</el-button>
+          <el-button v-if="id !== '007'" type="primary" @click="submitForm"
+            >保 存</el-button
+          >
           <el-button @click="showModelThis = false">
             {{ id == "007" ? "关 闭" : "取 消" }}
           </el-button>
@@ -363,77 +363,77 @@
   </el-dialog>
 </template>
 <script>
-import asyncRequest from '@/apis/service/netOrderEntry/netOrderEnter'
-import companyHelper from '@/mixins/companyHelper'
-import { accMul, accDiv, accSub, isPhone, isMobile } from '@/utils/validate'
-import resToken from '@/mixins/resToken'
+import asyncRequest from "@/apis/service/netOrderEntry/netOrderEnter";
+import companyHelper from "@/mixins/companyHelper";
+import { accMul, accDiv, accSub, isPhone, isMobile } from "@/utils/validate";
+import resToken from "@/mixins/resToken";
 
 const defaultData = {
   addr_code: [],
-  cgd_total: '',
-  cgdPrice: '',
+  cgd_total: "",
+  cgdPrice: "",
   // buyerid: "",
   // buyer_name: "",
-  platform_id: '',
-  cgd_tax: '',
-  workCode: '',
-  poCode: '',
-  khNo: '',
-  companyNo: '',
-  contactor: '',
-  mobile: '',
-  addr: '',
-  sendtime: '',
-  supplierNo: '',
-  cat_id: '',
-  goodName: '',
-  goodNum: '',
-  goodPrice: '',
-  sale_total: '',
-  goodUnit: '',
-  tax: ''
-}
+  platform_id: "",
+  cgd_tax: "",
+  workCode: "",
+  poCode: "",
+  khNo: "",
+  companyNo: "",
+  contactor: "",
+  mobile: "",
+  addr: "",
+  sendtime: "",
+  supplierNo: "",
+  cat_id: "",
+  goodName: "",
+  goodNum: "",
+  goodPrice: "",
+  sale_total: "",
+  goodUnit: "",
+  tax: "",
+};
 
 export default {
-  name: 'Terrace',
+  name: "Terrace",
   mixins: [resToken, companyHelper],
-  props: ['showModel', 'id', 'sitem'],
+  props: ["showModel", "id", "sitem"],
   data() {
     const validatemobile = (rule, value, callback) => {
-      if (value !== '') {
+      if (value !== "") {
         if (isPhone(value) || isMobile(value)) {
-          callback()
+          callback();
         } else {
-          callback(new Error('联系电话格式不正确！'))
+          callback(new Error("联系电话格式不正确！"));
         }
       } else {
-        callback(new Error('请输入联系电话！'))
+        callback(new Error("请输入联系电话！"));
       }
-    }
+    };
 
     return {
       loading: false,
       detailLoading: false,
-      title: '添加销售订单信息',
-      khName: '',
+      title: "添加销售订单信息",
+      khName: "",
       accounts: [],
-      cat_id_name: '',
+      cat_id_name: "",
       showModelThis: this.showModel,
       pickerOptions: {
-        disabledDate: (time) => time.getTime() > new Date()
+        disabledDate: (time) => time.getTime() > new Date(),
       },
       names: [],
-      unit_name: '',
-      companyName: '',
+      unit_name: "",
+      companyName: "",
       ruleForm: { ...defaultData },
       rulesThis: this.rules,
       rules: {
         goodUnit: [
           {
             required: true,
-            message: '请选择单位',
-            trigger: 'blur'
-          }
+            message: "请选择单位",
+            trigger: "blur",
+          },
         ],
         // addr_code: [
         //   {
@@ -446,46 +446,46 @@ export default {
         platform_id: [
           {
             required: true,
-            message: '请输入所属平台',
-            trigger: 'blur'
-          }
+            message: "请输入所属平台",
+            trigger: "blur",
+          },
         ],
 
         cgd_tax: [
           {
             required: true,
-            message: '请输入采购毛利率',
-            trigger: 'blur'
-          }
+            message: "请输入采购毛利率",
+            trigger: "blur",
+          },
         ],
         cat_id: [
           {
             required: true,
-            message: '请选择商品分类',
-            trigger: 'change'
-          }
+            message: "请选择商品分类",
+            trigger: "change",
+          },
         ],
         supplierNo: [
           {
-            type: 'array',
+            type: "array",
             required: true,
-            message: '请选择供应商公司',
-            trigger: 'change'
-          }
+            message: "请选择供应商公司",
+            trigger: "change",
+          },
         ],
         qrdType: [
           {
             required: true,
-            message: '请输入订单来源',
-            trigger: 'blur'
-          }
+            message: "请输入订单来源",
+            trigger: "blur",
+          },
         ],
         sale_total: [
           {
             required: true,
-            message: '请输入销售总额',
-            trigger: 'blur'
-          }
+            message: "请输入销售总额",
+            trigger: "blur",
+          },
         ],
         // workCode: [
         //   {
@@ -497,176 +497,176 @@ export default {
         poCode: [
           {
             required: true,
-            message: '请输入PO编号',
-            trigger: 'blur'
-          }
+            message: "请输入PO编号",
+            trigger: "blur",
+          },
         ],
         khNo: [
           {
-            type: 'array',
+            type: "array",
             required: true,
-            message: '请选择购买方公司',
-            trigger: 'change'
-          }
+            message: "请选择购买方公司",
+            trigger: "change",
+          },
         ],
         tax: [
           {
             required: true,
-            message: '请选择税率',
-            trigger: 'change'
-          }
+            message: "请选择税率",
+            trigger: "change",
+          },
         ],
         companyNo: [
           {
             required: true,
-            message: '请选择销售方公司',
-            trigger: 'change'
-          }
+            message: "请选择销售方公司",
+            trigger: "change",
+          },
         ],
         contactor: [
           {
             required: true,
-            message: '请输入收货人',
-            trigger: 'blur'
-          }
+            message: "请输入收货人",
+            trigger: "blur",
+          },
         ],
         mobile: [
           {
             required: true,
             validator: validatemobile,
-            trigger: 'blur'
-          }
+            trigger: "blur",
+          },
         ],
         addr: [
           {
             required: true,
-            message: '请输入联系地址',
-            trigger: 'blur'
-          }
+            message: "请输入联系地址",
+            trigger: "blur",
+          },
         ],
 
         sendtime: [
           {
             required: true,
-            message: '请输入发货时间',
-            trigger: 'change'
-          }
+            message: "请输入发货时间",
+            trigger: "change",
+          },
         ],
 
         goodName: [
           {
             required: true,
-            message: '请输入商品名称',
-            trigger: 'blur'
-          }
+            message: "请输入商品名称",
+            trigger: "blur",
+          },
         ],
         goodPrice: [
           {
             required: true,
-            message: '请输入销售单价',
-            trigger: 'blur'
-          }
+            message: "请输入销售单价",
+            trigger: "blur",
+          },
         ],
         cgdPrice: [
           {
             required: true,
-            message: '请选择采购单价',
-            trigger: 'blur'
-          }
+            message: "请选择采购单价",
+            trigger: "blur",
+          },
         ],
         goodNum: [
           {
             required: true,
-            message: '请输入数量',
-            trigger: 'blur'
-          }
+            message: "请输入数量",
+            trigger: "blur",
+          },
         ],
         cgd_total: [
           {
             required: true,
-            message: '请输入采购总额',
-            trigger: 'blur'
-          }
-        ]
-      }
-    }
+            message: "请输入采购总额",
+            trigger: "blur",
+          },
+        ],
+      },
+    };
   },
   computed: {
     disabledField() {
-      const { goodNum } = this.ruleForm
-      return !goodNum || Number(goodNum) <= 0
+      const { goodNum } = this.ruleForm;
+      return !goodNum || Number(goodNum) <= 0;
     },
     totalWatchSource() {
-      const { goodNum, goodPrice } = this.ruleForm
-      return { goodNum, goodPrice }
+      const { goodNum, goodPrice } = this.ruleForm;
+      return { goodNum, goodPrice };
     },
     cgdTotalWatchSource() {
-      const { goodNum, cgdPrice } = this.ruleForm
-      return { goodNum, cgdPrice }
-    }
+      const { goodNum, cgdPrice } = this.ruleForm;
+      return { goodNum, cgdPrice };
+    },
   },
   watch: {
-    showModel: function(val) {
-      this.showModelThis = val
+    showModel: function (val) {
+      this.showModelThis = val;
       if (val) {
-        this.initForm()
+        this.initForm();
       }
     },
     showModelThis(val) {
       if (!val) {
-        this.$emit('cancel')
+        this.$emit("cancel");
       }
     },
     totalWatchSource: {
       handler({ goodPrice, goodNum }) {
         if (goodPrice === 0 || goodNum === 0) {
-          this.ruleForm.sale_total = 0
-          return
+          this.ruleForm.sale_total = 0;
+          return;
         }
 
-        this.ruleForm.sale_total = accMul(goodPrice, goodNum)
+        this.ruleForm.sale_total = accMul(goodPrice, goodNum);
       },
-      deep: true
+      deep: true,
     },
     cgdTotalWatchSource: {
       handler({ cgdPrice, goodNum }) {
         if (cgdPrice === 0 || goodNum === 0) {
-          this.ruleForm.cgd_total = 0
-          return
+          this.ruleForm.cgd_total = 0;
+          return;
         }
 
-        this.ruleForm.cgd_total = accMul(cgdPrice, goodNum)
+        this.ruleForm.cgd_total = accMul(cgdPrice, goodNum);
       },
-      deep: true
-    }
+      deep: true,
+    },
   },
   methods: {
     async handleHandoverName(e) {
-      this.ruleForm.buyerid = e && e.id ? [e.id] : ''
-      this.ruleForm.buyer_name = e && e.label ? e.label : ''
-      this.$refs.ruleForm.validateField('buyerid')
+      this.ruleForm.buyerid = e && e.id ? [e.id] : "";
+      this.ruleForm.buyer_name = e && e.label ? e.label : "";
+      this.$refs.ruleForm.validateField("buyerid");
     },
     async select_area_change(e) {
-      this.ruleForm.addr_code = e
-      this.$refs.ruleForm.validateField('addr_code')
+      this.ruleForm.addr_code = e;
+      this.$refs.ruleForm.validateField("addr_code");
     },
     number_change(e, type) {
-      this.ruleForm.cgd_tax = e
-      const { cgdPrice, goodPrice, cgd_tax } = this.ruleForm
-      let tax = 0
-      let cgd_price = 0
+      this.ruleForm.cgd_tax = e;
+      const { cgdPrice, goodPrice, cgd_tax } = this.ruleForm;
+      let tax = 0;
+      let cgd_price = 0;
 
       if (type === 1) {
         // tax = (1 - cgdPrice / goodPrice)*100
-        tax = accMul(accSub(1, accDiv(cgdPrice, goodPrice)), 100)
-        this.ruleForm.cgd_tax = tax
-        this.$refs.ruleForm.validateField('cgd_tax')
+        tax = accMul(accSub(1, accDiv(cgdPrice, goodPrice)), 100);
+        this.ruleForm.cgd_tax = tax;
+        this.$refs.ruleForm.validateField("cgd_tax");
       }
       if (type === 2) {
         // cgd_price = ((100 - cgd_tax) / 100) * goodPrice;
-        cgd_price = accMul(accDiv(accSub(100, cgd_tax), 100), goodPrice) || 0
-        this.ruleForm.cgdPrice = cgd_price
-        this.$refs.ruleForm.validateField('cgdPrice')
+        cgd_price = accMul(accDiv(accSub(100, cgd_tax), 100), goodPrice) || 0;
+        this.ruleForm.cgdPrice = cgd_price;
+        this.$refs.ruleForm.validateField("cgdPrice");
       }
 
       // if (this.ruleForm.cgdPrice && this.ruleForm.goodPrice) {
@@ -674,88 +674,91 @@ export default {
       // }
     },
     handleClose() {
-      this.showModelThis = false
-      this.companyName = ''
-      this.khName = ''
-      this.supplierName = ''
-      this.ruleForm = { ...defaultData }
+      this.showModelThis = false;
+      this.companyName = "";
+      this.khName = "";
+      this.supplierName = "";
+      this.ruleForm = { ...defaultData };
     },
     async initForm() {
-      this.loading = true
+      this.loading = true;
       // await this.getAccounts();
 
-      if (this.id === '003') {
-        this.title = '添加销售订单信息'
-        this.rulesThis = this.rules
-      } else if (this.id === '005') {
-        this.title = '修改销售订单信息'
-        this.rulesThis = this.rules
+      if (this.id === "003") {
+        this.title = "添加销售订单信息";
+        this.rulesThis = this.rules;
+      } else if (this.id === "005") {
+        this.title = "修改销售订单信息";
+        this.rulesThis = this.rules;
       } else {
-        this.title = '销售订单信息详情'
-        this.rulesThis = {}
+        this.title = "销售订单信息详情";
+        this.rulesThis = {};
       }
-      await this.resetForm()
-      this.loading = false
+      await this.resetForm();
+      this.loading = false;
     },
 
     handleCompanyChange(e) {
-      this.ruleForm.companyNo = e.code || ''
-      this.$refs.ruleForm.validateField('companyNo')
+      this.ruleForm.companyNo = e.code || "";
+      this.$refs.ruleForm.validateField("companyNo");
     },
     handleCustomerChange(e) {
-      this.ruleForm.khNo = e.code ? [e.code] : ''
-      this.$refs.ruleForm.validateField('khNo')
+      this.ruleForm.khNo = e.code ? [e.code] : "";
+      this.$refs.ruleForm.validateField("khNo");
     },
     handleSupplierChange(e) {
-      this.ruleForm.supplierNo = e.code ? [e.code] : ''
-      this.$refs.ruleForm.validateField('supplierNo')
+      this.ruleForm.supplierNo = e.code ? [e.code] : "";
+      this.$refs.ruleForm.validateField("supplierNo");
     },
     handleGoodClassChange(e) {
-      this.ruleForm.cat_id = e
-      this.$refs.ruleForm.validateField('cat_id')
+      this.ruleForm.cat_id = e;
+      this.$refs.ruleForm.validateField("cat_id");
     },
     handleTaxChange(e) {
-      this.ruleForm.tax = e
-      this.$refs.ruleForm.validateField('tax')
+      this.ruleForm.tax = e;
+      this.$refs.ruleForm.validateField("tax");
     },
     unitsearchChange(e) {
-      const { id, code, label } = e
-      this.ruleForm.goodUnit = code ? [code] : []
-      this.$refs.ruleForm.validateField('goodUnit')
+      const { id, code, label } = e;
+      this.ruleForm.goodUnit = code ? [code] : [];
+      this.$refs.ruleForm.validateField("goodUnit");
     },
     async resetForm() {
       // 重置
       await this.$nextTick(() => {
         if (this.$refs.ruleForm) {
-          this.$refs.ruleForm.resetFields()
-          this.$refs.ruleForm.clearValidate()
+          this.$refs.ruleForm.resetFields();
+          this.$refs.ruleForm.clearValidate();
         }
-      })
+      });
 
-      if (this.id === '003') {
-        this.ruleForm.companyNo = this.currentCompany
-        return
+      if (this.id === "003") {
+        this.ruleForm.companyNo = this.currentCompany;
+        return;
       }
 
-      if (this.id !== '003') this.getDetail()
+      if (this.id !== "003") this.getDetail();
     },
     number_change_total(current, prop) {
-      const isCgdTotal = prop === 'cgd_total'
-      const { goodNum } = this.ruleForm
-      this.ruleForm[isCgdTotal ? 'cgdPrice' : 'goodPrice'] = accDiv(current, goodNum)
-      this.ruleForm[prop] = current
-
-      let tax = 0
-      tax = accMul(accSub(1, accDiv(this.ruleForm.cgd_total, this.ruleForm.sale_total)), 100)
-      this.ruleForm.cgd_tax = tax
+      const isCgdTotal = prop === "cgd_total";
+      const { goodNum } = this.ruleForm;
+      this.ruleForm[isCgdTotal ? "cgdPrice" : "goodPrice"] = accDiv(current, goodNum);
+      this.ruleForm[prop] = current;
+
+      let tax = 0;
+      tax = accMul(
+        accSub(1, accDiv(this.ruleForm.cgd_total, this.ruleForm.sale_total)),
+        100
+      );
+      this.ruleForm.cgd_tax = tax;
       // if (this.ruleForm.cgd_total && this.ruleForm.sale_total) {
       //   this.ruleForm['cgd_tax'] = accMul(accDiv(this.ruleForm.cgd_total, this.ruleForm.sale_total), 100) || 0
       // }
     },
     async getDetail() {
-      this.detailLoading = true
-      const { orderCode } = this.sitem
-      const { data } = await asyncRequest.detail({ orderCode })
+      this.detailLoading = true;
+      const { orderCode } = this.sitem;
+      const { data } = await asyncRequest.detail({ orderCode });
 
       const {
         cat_id,
@@ -769,7 +772,7 @@ export default {
         addr_code,
         unitName,
         ...rest
-      } = data
+      } = data;
 
       this.ruleForm = {
         ...rest,
@@ -778,23 +781,23 @@ export default {
         cat_id: cat_id && cat_id.length === 3 ? [cat_id[cat_id.length - 1]] : [],
         supplierNo: supplierNo ? [supplierNo] : [],
         khNo: khNo ? [khNo] : [],
-        tax: tax ? tax + '%' : '',
-        goodUnit: goodUnit ? [goodUnit] : ''
-      }
+        tax: tax ? tax + "%" : "",
+        goodUnit: goodUnit ? [goodUnit] : "",
+      };
 
       this.cat_id_name = cat_id && cat_id.length === 3 ?cat_id.map(({ name }) => name).join('_'):""
       console.log(this.cat_id_name)
       this.unit_name = unitName
 
-      this.khName = khName
-      this.supplierName = supplierNanme
-      this.detailLoading = false
+      this.khName = khName;
+      this.supplierName = supplierNanme;
+      this.detailLoading = false;
     },
     platform_codesearchChange(e) {
-      const { id, label, pay_name } = e
-      this.ruleForm.platform_id = id || ''
-      this.pay_name = pay_name || ''
-      this.$refs.ruleForm.validateField('platform_id')
+      const { id, label, pay_name } = e;
+      this.ruleForm.platform_id = id || "";
+      this.pay_name = pay_name || "";
+      this.$refs.ruleForm.validateField("platform_id");
     },
     // async getAccounts() {
     //   const res = await asyncRequest.accountall(this.dataForm);
@@ -807,60 +810,60 @@ export default {
     //   }
     // },
     async goods_class_change(e) {
-      const { id } = e
-      this.ruleForm.cat_id = id ? [id] : []
-      this.$refs.ruleForm.validateField('cat_id')
+      const { id } = e;
+      this.ruleForm.cat_id = id ? [id] : [];
+      this.$refs.ruleForm.validateField("cat_id");
     },
     async submitForm() {
-      await this.$refs.ruleForm.validate(async(valid) => {
+      await this.$refs.ruleForm.validate(async (valid) => {
         if (valid) {
           if (this.loading) {
-            return
+            return;
           }
 
-          this.loading = true
-          const model = JSON.parse(JSON.stringify(this.ruleForm))
-          model.supplierNo = model.supplierNo[0]
-          model.khNo = model.khNo[0]
-          model.buyerid = Array.isArray(model.buyerid) ? model.buyerid[0] : model.buyerid
-          model.cat_id = model.cat_id ? model.cat_id[model.cat_id.length - 1] : ''
-          model.addr_code = model.addr_code.join(',')
-          model.tax = model.tax.split('%')[0]
-          model.pay_name = this.pay_name
+          this.loading = true;
+          const model = JSON.parse(JSON.stringify(this.ruleForm));
+          model.supplierNo = model.supplierNo[0];
+          model.khNo = model.khNo[0];
+          model.buyerid = Array.isArray(model.buyerid) ? model.buyerid[0] : model.buyerid;
+          model.cat_id = model.cat_id ? model.cat_id[model.cat_id.length - 1] : "";
+          model.addr_code = model.addr_code.join(",");
+          model.tax = model.tax.split("%")[0];
+          model.pay_name = this.pay_name;
           model.goodUnit = Array.isArray(model.goodUnit)
             ? model.goodUnit[0]
-            : model.goodUnit
+            : model.goodUnit;
 
-          let res = {}
-          if (this.id === '003') {
-            delete model['id']
-            res = await asyncRequest.add(model)
+          let res = {};
+          if (this.id === "003") {
+            delete model["id"];
+            res = await asyncRequest.add(model);
           } else {
-            res = await asyncRequest.update(model)
+            res = await asyncRequest.update(model);
           }
-          this.loading = false
+          this.loading = false;
           if (res && res.code === 0) {
-            const title = this.id === '003' ? '添加成功!' : '修改成功!'
+            const title = this.id === "003" ? "添加成功!" : "修改成功!";
             this.$notify.success({
               title,
-              message: ''
-            })
-            this.showModelThis = false
+              message: "",
+            });
+            this.showModelThis = false;
             // 刷新
-            this.$emit('refresh')
+            this.$emit("refresh");
           } else if (res && res.code >= 100 && res.code <= 104) {
-            await this.logout()
+            await this.logout();
           } else {
-            this.$message.warning(res.message)
+            this.$message.warning(res.message);
           }
         } else {
-          console.log('error submit!!')
-          return false
+          console.log("error submit!!");
+          return false;
         }
-      })
-    }
-  }
-}
+      });
+    },
+  },
+};
 </script>
 
 <style lang="scss" scoped>

src/views/netOrderEntry/netOrderEnter/template.js

@@ -4,8 +4,8 @@ const mapTemplateToTable = {
   '供应商公司编码': 'supplierNo',
   '销售方公司编码': 'companyNo',
   '购买方公司编码': 'customerNo',
-  '一级品类ID': 'cat_id1',
-  '二级品类ID': 'cat_id2',
+  // '一级品类ID': 'cat_id1',
+  // '二级品类ID': 'cat_id2',
   '三级品类ID': 'cat_id',
   '商品单位ID': 'good_unit',
   '税率': 'good_tax',
@@ -100,18 +100,18 @@ export const columns = [
     required: true
   },
 
-  {
-    prop: getTableProperty('一级品类ID'),
-    label: '一级品类ID',
-    width: '150px',
-    required: true
-  },
-  {
-    prop: getTableProperty('二级品类ID'),
-    label: '二级品类ID',
-    width: '150px',
-    required: true
-  },
+  // {
+  //   prop: getTableProperty('一级品类ID'),
+  //   label: '一级品类ID',
+  //   width: '150px',
+  //   required: true
+  // },
+  // {
+  //   prop: getTableProperty('二级品类ID'),
+  //   label: '二级品类ID',
+  //   width: '150px',
+  //   required: true
+  // },
   {
     prop: getTableProperty('三级品类ID'),
     label: '三级品类ID',

src/views/netOrderEntry/prestoreRecordingOrders/addEdit.vue

@@ -771,9 +771,6 @@ export default {
       this.cat_id_name =
         cat_id && cat_id.length === 3 ? cat_id.map(({ name }) => name).join("_") : "";
       this.unit_name = unitName;
-
-      this.khName = khName;
-      this.supplierName = supplierNanme;
       this.detailLoading = false;
     },
     platform_codesearchChange(e) {

src/views/netOrderEntry/prestoreRecordingOrders/template-c.js

@@ -4,8 +4,8 @@ const mapTemplateToTable = {
   '供应商公司编码': 'supplierNo',
   '销售方公司编码': 'companyNo',
   '购买方公司编码': 'customerNo',
-  '一级品类ID': 'cat_id1',
-  '二级品类ID': 'cat_id2',
+  // '一级品类ID': 'cat_id1',
+  // '二级品类ID': 'cat_id2',
   '三级品类ID': 'cat_id',
   '商品单位ID': 'good_unit',
   '商品名称': 'good_name',
@@ -64,8 +64,8 @@ export const template = [
     '供应商公司编码': 'QS2206011407522117',
     '销售方公司编码': 'GS2302231323386950',
     '购买方公司编码': 'KH2203271822232121',
-    '一级品类ID': '871',
-    '二级品类ID': '871',
+    // '一级品类ID': '871',
+    // '二级品类ID': '871',
     '三级品类ID': '871',
     '商品单位ID': '7',
     '商品名称': '测试商品名称',
@@ -115,18 +115,18 @@ export const columns = [
     required: true
   },
 
-  {
-    prop: getTableProperty('一级品类ID'),
-    label: '一级品类ID',
-    width: '150px',
-    required: true
-  },
-  {
-    prop: getTableProperty('二级品类ID'),
-    label: '二级品类ID',
-    width: '150px',
-    required: true
-  },
+  // {
+  //   prop: getTableProperty('一级品类ID'),
+  //   label: '一级品类ID',
+  //   width: '150px',
+  //   required: true
+  // },
+  // {
+  //   prop: getTableProperty('二级品类ID'),
+  //   label: '二级品类ID',
+  //   width: '150px',
+  //   required: true
+  // },
   {
     prop: getTableProperty('三级品类ID'),
     label: '三级品类ID',

src/views/netOrderEntry/prestoreRecordingOrders/template.js

@@ -4,8 +4,8 @@ const mapTemplateToTable = {
   '供应商公司编码': 'supplierNo',
   '销售方公司编码': 'companyNo',
   '购买方公司编码': 'customerNo',
-  '一级品类ID': 'cat_id1',
-  '二级品类ID': 'cat_id2',
+  // '一级品类ID': 'cat_id1',
+  // '二级品类ID': 'cat_id2',
   '三级品类ID': 'cat_id',
   '商品单位ID': 'good_unit',
   '商品名称': 'good_name',
@@ -89,8 +89,8 @@ export const template = Array(1).fill(1).map(() => ({
   '供应商公司编码': 'QS2206011407522117',
   '销售方公司编码': 'GS2302231323386950',
   '购买方公司编码': 'KH2203271822232121',
-  '一级品类ID': '871',
-  '二级品类ID': '871',
+  // '一级品类ID': '871',
+  // '二级品类ID': '871',
   '三级品类ID': '871',
   '商品单位ID': '7',
   '商品名称': '测试商品名称',
@@ -139,18 +139,18 @@ export const columns = [
     required: true
   },
 
-  {
-    prop: getTableProperty('一级品类ID'),
-    label: '一级品类ID',
-    width: '150px',
-    required: true
-  },
-  {
-    prop: getTableProperty('二级品类ID'),
-    label: '二级品类ID',
-    width: '150px',
-    required: true
-  },
+  // {
+  //   prop: getTableProperty('一级品类ID'),
+  //   label: '一级品类ID',
+  //   width: '150px',
+  //   required: true
+  // },
+  // {
+  //   prop: getTableProperty('二级品类ID'),
+  //   label: '二级品类ID',
+  //   width: '150px',
+  //   required: true
+  // },
   {
     prop: getTableProperty('三级品类ID'),
     label: '三级品类ID',

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

@@ -60,6 +60,10 @@
             />
           </el-form-item>
 
+          <el-form-item label="供应商订单号" prop="plat_orderCode" label-width="120px">
+            <el-input placeholder="供应商订单号" v-model="ruleForm.plat_orderCode" />
+          </el-form-item>
+
           <el-form-item label="附件" prop="fill_url">
             <div v-if="ruleForm.fill_url" class="clearfix">
               <a :href="ruleForm.fill_url" download="凭证文件">点击下载</a>
@@ -801,16 +805,19 @@ export default {
     //计算单价
     getPrice(key) {
       const { is_determine_price, type } = this.ruleForm;
-      if (
-        (key === "price" && String(is_determine_price) == "1") ||
-        (String(type) == "1" && key === "expect_service")
-      ) {
+      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"
+        ).toFixed(2);
+      } else if ((key === "price" && String(is_determine_price) == "1")) {
         const Sub = accSub(
           Number(this.ruleForm.price),
           Number(this.ruleForm.expect_service)
         );
-        // console.log(Sub, Number(Sub));
-        this.ruleForm.cgd_charge = (Number(Sub) < 0 ? 0 : Sub).toFixed(2);
+        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(
           cgd_charge ? accDiv(this.ruleForm.expect_service, cgd_charge) : "0",
@@ -850,12 +857,11 @@ 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,
-          this.ruleForm.expect_service
-        ).toFixed(2);
+        this.ruleForm.cgd_charge = Number(accSub(
+            this.ruleForm.price,
+            this.ruleForm.expect_service
+        )).toFixed(2);
       }
       this.getTotal();
     },
@@ -974,18 +980,18 @@ export default {
             return;
           }
 
-          //没有服务费存在服务费比例 重新计算服务费
-          if (!Number(expect_service) && Number(expect_service_proportion)) {
-            this.handleProportionrChange(expect_service_proportion);
-          }
-
-          //没有服务费存在服务费比例或者两个都存在 以服务费计算服务费比例
-          if (
-            (!Number(expect_service_proportion) && Number(expect_service)) ||
-            (Number(expect_service_proportion) && Number(expect_service))
-          ) {
-            this.handleExpectChange(expect_service);
-          }
+          // //没有服务费存在服务费比例 重新计算服务费
+          // if (!Number(expect_service) && Number(expect_service_proportion)) {
+          //   this.handleProportionrChange(expect_service_proportion);
+          // }
+          //
+          // //没有服务费存在服务费比例或者两个都存在 以服务费计算服务费比例
+          // if (
+          //   (!Number(expect_service_proportion) && Number(expect_service)) ||
+          //   (Number(expect_service_proportion) && Number(expect_service))
+          // ) {
+          //   this.handleExpectChange(expect_service);
+          // }
           let model = Object.assign(
             other_ruleForm,
             JSON.parse(JSON.stringify(this.ruleForm))
@@ -1011,9 +1017,6 @@ export default {
             model.spec_list.push(am);
           });
 
-          console.log(model)
-          return
-
           let res = {};
           if (this.type === "add") {
             res = await asyncRequest.add({
@@ -1162,6 +1165,7 @@ export default {
               config,
               gold_weight,
               other_config,
+              plat_orderCode
             } = data;
 
             if (Number(gold_weight) !== 0) {
@@ -1170,6 +1174,7 @@ export default {
 
             this.ruleForm = {
               ...ruleForm1,
+              plat_orderCode:plat_orderCode || "",
               other_config: other_config || "",
               gold_weight: gold_weight || "",
               noble_metal: noble_metal || "",
@@ -1224,8 +1229,6 @@ export default {
               ...item,
               specid: item.spec_id
             }));
-
-            console.log(this.ruleForm);
           }
         }
       });

src/views/sellOut/filing/detail.vue

@@ -14,8 +14,8 @@
             @change-num="handleChangeNum"
             @change-status="handleChangeStatus"
             @change-order-code="handleChangeOrderCode"
-            @change-detail="(detail) => 
-              {sitem = detail;
+            @change-detail="(detail) => {
+              sitem = detail;
               status = detail.status}
             "
           />
@@ -29,8 +29,7 @@
           </el-collapse-item>
 
           <tempalte
-            v-if="((String(status) == '2' || String(status) == '3') && !isSupertube && (
-            _process.includes('2') || _process.includes('3')) && Number(sitem.wsm_has_account) === 0
+            v-if="((String(status) == '2' || String(status) == '3') && !isSupertube && (_process.includes('2') || _process.includes('3'))
           )"
           >
             <el-collapse-item name="3" title="待转单">
@@ -38,9 +37,9 @@
             </el-collapse-item>
           </tempalte>
 
-          <el-collapse-item v-if="status === '3'" name="4" title="发货单">
-            <shipment-request :order-code="orderCode" />
-          </el-collapse-item>
+<!--          <el-collapse-item v-if="status === '3'" name="4" title="发货单">-->
+<!--            <shipment-request :order-code="orderCode" />-->
+<!--          </el-collapse-item>-->
         </el-collapse>
       </el-tab-pane>
 
@@ -54,7 +53,7 @@
       </el-tab-pane>
 
       <el-tab-pane label="流程图" name="3">
-        <flow-chart process_id="22" type="BBD" :orderCode="id" />
+        <flow-chart process_id="28" type="BBD" :orderCode="id" />
       </el-tab-pane>
     </el-tabs>
   </div>

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

@@ -59,6 +59,11 @@
             />
           </el-form-item>
 
+          <el-form-item label="供应商订单号" prop="plat_orderCode" label-width="120px">
+            <el-input placeholder="供应商订单号" v-model="ruleForm.plat_orderCode" />
+          </el-form-item>
+
+
           <el-form-item label="附件" prop="fill_url">
             <div v-if="ruleForm.fill_url" class="clearfix">
               <a :href="ruleForm.fill_url" download="凭证文件">点击下载</a>
@@ -806,16 +811,20 @@ export default {
     //计算单价
     getPrice(key) {
       const { is_determine_price, type } = this.ruleForm;
-      if (
-        (key === "price" && String(is_determine_price) == "1") ||
-        (String(type) == "1" && key === "expect_service")
-      ) {
+
+      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"
+        ).toFixed(2);
+      }else if ((key === "price" && String(is_determine_price) == "1")) {
         const Sub = accSub(
           Number(this.ruleForm.price),
           Number(this.ruleForm.expect_service)
         );
         // console.log(Sub, Number(Sub));
-        this.ruleForm.cgd_charge = (Number(Sub) < 0 ? 0 : Sub).toFixed(2);
+        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(
           cgd_charge ? accDiv(this.ruleForm.expect_service, cgd_charge) : "0",
@@ -855,17 +864,18 @@ 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.cgd_charge = Number(accSub(
           this.ruleForm.price,
           this.ruleForm.expect_service
-        ).toFixed(2);
+        ) || 0).toFixed(2);
       }
       this.getTotal();
     },
     //计算总价
     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);
     },
@@ -979,18 +989,18 @@ export default {
             return;
           }
 
-          //没有服务费存在服务费比例 重新计算服务费
-          if (!Number(expect_service) && Number(expect_service_proportion)) {
-            this.handleProportionrChange(expect_service_proportion);
-          }
-
-          //没有服务费存在服务费比例或者两个都存在 以服务费计算服务费比例
-          if (
-            (!Number(expect_service_proportion) && Number(expect_service)) ||
-            (Number(expect_service_proportion) && Number(expect_service))
-          ) {
-            this.handleExpectChange(expect_service);
-          }
+          // //没有服务费存在服务费比例 重新计算服务费
+          // if (!Number(expect_service) && Number(expect_service_proportion)) {
+          //   this.handleProportionrChange(expect_service_proportion);
+          // }
+          //
+          // //没有服务费存在服务费比例或者两个都存在 以服务费计算服务费比例
+          // if (
+          //   (!Number(expect_service_proportion) && Number(expect_service)) ||
+          //   (Number(expect_service_proportion) && Number(expect_service))
+          // ) {
+          //   this.handleExpectChange(expect_service);
+          // }
           let model = Object.assign(
             other_ruleForm,
             JSON.parse(JSON.stringify(this.ruleForm))
@@ -1005,7 +1015,6 @@ export default {
           model.tax = parseInt(model.tax + "") + "";
           model.spec_list = [];
           model.supplierNo = model.supplierNo.toString();
-
           delete model.originPlace;
           let list = JSON.parse(JSON.stringify(this.spec_tableData));
           list.forEach(a => {
@@ -1169,6 +1178,7 @@ export default {
               config,
               gold_weight,
               other_config,
+              plat_orderCode
             } = data;
 
 
@@ -1178,6 +1188,7 @@ export default {
 
             this.ruleForm = {
               ...ruleForm1,
+              plat_orderCode:plat_orderCode || "",
               other_config: other_config || "",
               gold_weight: gold_weight || "",
               noble_metal: noble_metal || "",

src/views/supplierSellOut/supplierFiling/detail.vue

@@ -39,7 +39,7 @@
       </el-tab-pane>
 
       <el-tab-pane label="流程图" name="3" v-if="type === 'view'">
-        <flow-chart process_id="22" type="BBD" :orderCode="id" />
+        <flow-chart process_id="28" type="BBD" :orderCode="id" />
       </el-tab-pane>
     </el-tabs>
   </div>