代码更新

src/HDrpManagement/contractManage/components/addContract.vue

@@ -524,7 +524,7 @@ export default {
       callback()
     }
     var NumberSize = (rule, value, callback) => {
-      if (+value > 100 || +value < 0 && value) {
+      if (+value > 100 || +value < 0 ) {
         return callback(new Error('折扣范围(0-100%)'));
       }
       callback()
@@ -947,9 +947,12 @@ export default {
       this.form.enterprisename = data[0].enterprisename
       this.form.sys_enterpriseid = data[0].sys_enterpriseid
       this.accountVisible = false
-      this.salsemanParam.content.type = 3
-      this.salsemanParam.content.sys_enterpriseid = this.form.sys_enterpriseid
-      this.querySalse()
+      if (this.$route.query.type == '工具借用'){
+        this.salsemanParam.content.type = 3
+        this.salsemanParam.content.sys_enterpriseid = this.form.sys_enterpriseid
+        this.querySalse()
+      }
+
     },
     centerChange (data) {
       this.form.enterprisename = data[0].enterprisename

src/HDrpManagement/orderManage/details/tabs/logistics.vue

@@ -22,6 +22,26 @@
         prop="createdate"
         label="单据日期">
       </el-table-column>
+      <el-table-column
+          prop="carnum"
+          label="车牌号">
+      </el-table-column>
+      <el-table-column
+          prop="logiscontact"
+          label="物流联系人">
+      </el-table-column>
+      <el-table-column
+          prop="logisphone"
+          label="物流电话">
+      </el-table-column>
+      <el-table-column
+          prop="name"
+          label="收货人">
+      </el-table-column>
+      <el-table-column
+          prop="paytype"
+          label="寄件方式">
+      </el-table-column>
       <el-table-column
         prop="address"
         label="备注">

src/SDrpManagement/agentOrder/details/tabs/logistics.vue

@@ -22,6 +22,26 @@
         prop="createdate"
         label="单据日期">
       </el-table-column>
+      <el-table-column
+          prop="carnum"
+          label="车牌号">
+      </el-table-column>
+      <el-table-column
+          prop="logiscontact"
+          label="物流联系人">
+      </el-table-column>
+      <el-table-column
+          prop="logisphone"
+          label="物流电话">
+      </el-table-column>
+      <el-table-column
+          prop="name"
+          label="收货人">
+      </el-table-column>
+      <el-table-column
+          prop="paytype"
+          label="寄件方式">
+      </el-table-column>
       <el-table-column
         prop="address"
         label="备注">

src/SDrpManagement/salerOrder/details/tabs/logistics.vue

@@ -22,6 +22,26 @@
         prop="createdate"
         label="单据日期">
       </el-table-column>
+      <el-table-column
+          prop="carnum"
+          label="车牌号">
+      </el-table-column>
+      <el-table-column
+          prop="logiscontact"
+          label="物流联系人">
+      </el-table-column>
+      <el-table-column
+          prop="logisphone"
+          label="物流电话">
+      </el-table-column>
+      <el-table-column
+          prop="name"
+          label="收货人">
+      </el-table-column>
+      <el-table-column
+          prop="paytype"
+          label="寄件方式">
+      </el-table-column>
       <el-table-column
         prop="address"
         label="备注">

src/SDrpManagement/shopCart/modules/list.vue

@@ -68,7 +68,7 @@
         label="单价"
         width="90">
         <template slot-scope="scope">
-          <p style="color:red;font-weight:500">¥&nbsp;{{tool.formatAmount(scope.row.gradeprice,2)}}</p>
+          <p style="color:red;font-weight:500">¥&nbsp;{{tool.formatAmount(scope.row.oldprice,2)}}</p>
         </template>
       </el-table-column>
       <el-table-column
@@ -89,7 +89,7 @@
         label="金额"
         width="80">
         <template slot-scope="scope">
-          <p style="color:red;font-weight:500">¥&nbsp;{{tool.formatAmount(scope.row.gradeprice * scope.row.qty,2)}}</p>
+          <p style="color:red;font-weight:500">¥&nbsp;{{tool.formatAmount(scope.row.oldprice * scope.row.qty,2)}}</p>
         </template>
       </el-table-column>
       <el-table-column width="90" label="操作">

vue.config.js

@@ -14,8 +14,8 @@ module.exports = {
       port: 8000,
       proxy: {
         '/apis': {
-          target: 'http://61.164.207.46:8000',  // target host*/
-          // target: 'https://oms.idcgroup.com.cn:8079/',  // target host
+          // target: 'http://61.164.207.46:8000',  // target host*/
+          target: 'https://oms.idcgroup.com.cn:8079/',  // target host
           // target: 'localhost:8080',  // target host
           ws: true,  // proxy websockets 
           changeOrigin: true,  // needed for virtual hosted sites