在哪存

src/Form/EnterpriseArchives/add.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-button size="mini" type="primary" @click="onShow">新 建</el-button>
+    <el-button size="small" type="primary" @click="onShow">新 建</el-button>
     <el-drawer title="新建档案" direction="rtl" append-to-body :visible.sync="dialogFormVisible" :show-close="false" size="600px">
       <div class="drawer__panel">
         <el-row :gutter="20">
@@ -71,12 +71,21 @@
                 <el-input v-model="form.taxno" placeholder="输入税号"></el-input>
               </el-form-item>
             </el-col>
-            <el-col :span="12">
+            <el-col :span="24">
+              <el-form-item label="是否免运费">
+                <el-radio-group v-model="radio" @change="radioChange">
+                  <el-radio :label="-1">不免费运费</el-radio>
+                  <el-radio :label="0">免运费</el-radio>
+                  <el-radio :label="1">其他</el-radio>
+                </el-radio-group>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12" v-if="radio === 1">
               <el-form-item label="免运费额度" prop="freefreightamount">
                 <el-input v-model.number="form.freefreightamount" placeholder="请输入免运费额度"></el-input>
               </el-form-item>
             </el-col>
-            <el-col :span="12">
+            <el-col :span="radio === 1?12:24">
               <el-form-item label="可退货天数" prop="limitreturnday">
                 <el-input v-model.number="form.limitreturnday" placeholder="请输入订单可退货天数"></el-input>
               </el-form-item>
@@ -134,6 +143,7 @@ import {mapGetters} from 'vuex'
 export default {
   data () {
     return {
+      radio:-1,
       dialogFormVisible:false,
       businessData:[],
       businessParam:{
@@ -263,6 +273,19 @@ export default {
         });
       })
     },
+    radioChange (val) {
+      switch (val) {
+        case -1:
+          this.form.freefreightamount = -1
+          break;
+        case 0:
+          this.form.freefreightamount = 0
+          break;
+        default:
+          this.form.freefreightamount = ''
+          break;
+      }
+    }
   },
   mounted () {
   }

src/Form/EnterpriseArchives/edit.vue

@@ -71,12 +71,21 @@
                 <el-input v-model="form.taxno" placeholder="输入税号"></el-input>
               </el-form-item>
             </el-col>
-            <el-col :span="12">
+            <el-col :span="24">
+              <el-form-item label="是否免运费" prop="freefreightamount">
+                <el-radio-group v-model="radio" @change="radioChange">
+                  <el-radio :label="-1">不免费运费</el-radio>
+                  <el-radio :label="0">免运费</el-radio>
+                  <el-radio :label="1">其他</el-radio>
+                </el-radio-group>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12" v-if="radio === 1">
               <el-form-item label="免运费额度" prop="freefreightamount">
                 <el-input v-model.number="form.freefreightamount" placeholder="请输入免运费额度"></el-input>
               </el-form-item>
             </el-col>
-            <el-col :span="12">
+            <el-col :span="radio === 1?12:24">
               <el-form-item label="可退货天数" prop="limitreturnday">
                 <el-input v-model.number="form.limitreturnday" placeholder="请输入订单可退货天数"></el-input>
               </el-form-item>
@@ -135,6 +144,7 @@ export default {
   props:['data'],
   data () {
     return {
+      radio:-1,
       dialogFormVisible:false,
       businessData:[],
       businessParam:{
@@ -206,6 +216,17 @@ export default {
       if (this.form.province) {
         this.form.province = [this.form.province,this.form.city,this.form.county]
       }
+      switch (this.form.freefreightamount) {
+        case -1:
+          this.radio = -1
+          break;
+        case 0:
+          this.radio = 0
+          break;
+        default:
+          this.radio = 1
+          break;
+      }
       this.dialogFormVisible = true
       this.query_sysoptions()
     },
@@ -268,6 +289,19 @@ export default {
         });
       })
     },
+    radioChange (val) {
+      switch (val) {
+        case -1:
+          this.form.freefreightamount = -1
+          break;
+        case 0:
+          this.form.freefreightamount = 0
+          break;
+        default:
+          this.form.freefreightamount = ''
+          break;
+      }
+    }
   },
   mounted () {
   }

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

@@ -6,7 +6,7 @@
         <el-button style="margin:0 0 10px 10px" size="small" type="primary" :disabled="data.status !== '新建'" v-if="type !== 'confirmdate'" @click="drawer = true">{{setcol === 24?'添 加':'取 消'}}</el-button>
         <excel style="margin:0 0 10px 10px" :tablecols="columnTitle" :param="param" :total="total" :excelTitle="excelTitle"></excel>
       </div>
-      <p class="normal-margin" style="font-size: 13px !important;color:red;font-weight: normal">{{data.amount > freefreightamount?'当前订单免运费':`订单满${tool.formatAmount(freefreightamount,2)}元免运费,当前还差${tool.formatAmount(freefreightamount - data.amount,2)}元`}}</p>
+      <p class="normal-margin" style="font-size: 13px !important;color:red;font-weight: normal" v-if="data.status === '新建'">{{checkFreefreightamount}}</p>
       <el-table
         ref="multipleTable"
         :data="tableData"
@@ -346,6 +346,21 @@ export default {
       } else {
         return false
       }
+    },
+    checkFreefreightamount () {
+      let result = ''
+      switch (this.freefreightamount) {
+        case -1:
+          result = '不免运费'
+          break;
+        case 0:
+          result = '免运费'
+          break;
+        default:
+          result = this.data.amount >= this.freefreightamount?'当前订单免运费':`订单满${this.tool.formatAmount(this.freefreightamount,2)}元免运费,当前还差${this.tool.formatAmount(this.freefreightamount - this.data.amount,2)}元`
+          break;
+      }
+      return result
     }
   },
   data () {

src/HDrpManagement/orderManage/modules/edit.vue

@@ -13,7 +13,7 @@
         <p><span style="font-size:14px">订单合计:</span><span style="color:red;font-size:16px;"><b>¥&nbsp;{{tool.formatAmount(data.defaultamount,2)}}</b></span></p>
       </div>
         <div class="flex-align-center">
-        <p v-if="freefreightamount" style="font-size: 13px !important;color: #8888;font-weight: normal">{{data.amount >= freefreightamount?'当前订单免运费':`订单满${tool.formatAmount(freefreightamount,2)}元免运费,当前还差${tool.formatAmount(freefreightamount - data.amount,2)}元`}}</p>
+        <p v-if="freefreightamount" style="font-size: 13px !important;color: #8888;font-weight: normal">{{checkFreefreightamount}}</p>
       </div>
     </div>
     <div class="drawer__panel">
@@ -266,6 +266,23 @@ export default {
     addAddressInfo
   },
   inject:['thisDetail'],
+  computed:{
+    checkFreefreightamount () {
+      let result = ''
+      switch (this.freefreightamount) {
+        case -1:
+          result = '不免运费'
+          break;
+        case 0:
+          result = '免运费'
+          break;
+        default:
+          result = this.data.amount >= this.freefreightamount?'当前订单免运费':`订单满${this.tool.formatAmount(this.freefreightamount,2)}元免运费,当前还差${this.tool.formatAmount(this.freefreightamount - this.data.amount,2)}元`
+          break;
+      }
+      return result
+    }
+  },
   data () {
     return {
       freefreightamount:'',

src/SDrpManagement/agentOrder/modules/edit.vue

@@ -18,7 +18,7 @@
 <!--        <p ><span style="font-size:14px">订单合计:</span><span style="color:red;font-size:16px;"><b>¥&nbsp;{{tool.formatAmount(data.amount,2)}}</b></span></p>-->
         <!-- <label style="font-size:14px;margin-left:10px" for="">备注:</label>
         <input class="order__note__input" v-model="defaultData.remarks" type="text" placeholder="请输入订单备注"> -->
-        <p v-if="freefreightamount" style="font-size: 13px !important;color: #8888;font-weight: normal">{{data.amount > freefreightamount?'当前订单免运费':`订单满${tool.formatAmount(freefreightamount,2)}元免运费,当前还差${tool.formatAmount(freefreightamount - data.amount,2)}元`}}</p>
+        <p v-if="freefreightamount" style="font-size: 13px !important;color: #8888;font-weight: normal">{{checkFreefreightamount}}</p>
       </div>
     </div>
     <div class="drawer__panel">
@@ -245,6 +245,23 @@ export default {
     addAddressInfo
   },
   inject:['thisDetail'],
+  computed:{
+    checkFreefreightamount () {
+      let result = ''
+      switch (this.freefreightamount) {
+        case -1:
+          result = '不免运费'
+          break;
+        case 0:
+          result = '免运费'
+          break;
+        default:
+          result = this.data.amount >= this.freefreightamount?'当前订单免运费':`订单满${this.tool.formatAmount(this.freefreightamount,2)}元免运费,当前还差${this.tool.formatAmount(this.freefreightamount - this.data.amount,2)}元`
+          break;
+      }
+      return result
+    },
+  },
   data () {
     return {
       checked:0,

src/SDrpManagement/agentOrder/modules/productlist.vue

@@ -6,7 +6,7 @@
       <el-button v-if="data.status === '新建'" class="inline-16" :disabled="data.type === '特殊订单'" size="small" type="primary"  @click="drawer = true">{{setcol === 24?'添 加':'取 消'}}</el-button>
       <excel class="inline-16" :tablecols="columnTitle" :param="param" :total="total" :excelTitle="excelTitle"></excel>
     </div>
-    <p class="normal-margin" style="font-size: 13px !important;color:red;font-weight: normal">{{data.amount >= freefreightamount?'当前订单免运费':`订单满${tool.formatAmount(freefreightamount,2)}元免运费,当前还差${tool.formatAmount(freefreightamount - data.amount,2)}元`}}</p>
+    <p v-if="data.status === '新建'" class="normal-margin" style="font-size: 13px !important;color:red;font-weight: normal">{{checkFreefreightamount}}</p>
     <el-table
       ref="multipleTable"
       :data="tableData"
@@ -270,6 +270,23 @@ export default {
       value2:''
     }
   },
+  computed:{
+    checkFreefreightamount () {
+      let result = ''
+      switch (this.freefreightamount) {
+        case -1:
+          result = '不免运费'
+          break;
+        case 0:
+          result = '免运费'
+          break;
+        default:
+          result = this.data.amount >= this.freefreightamount?'当前订单免运费':`订单满${this.tool.formatAmount(this.freefreightamount,2)}元免运费,当前还差${this.tool.formatAmount(this.freefreightamount - this.data.amount,2)}元`
+          break;
+      }
+      return result
+    },
+  },
   components:{
     /*excel:() =>  import('../export_excel'),*/
     excel:() => import('../details/export_excel'),

src/SDrpManagement/salerOrder/modules/edit.vue

@@ -12,7 +12,7 @@
         <p><span style="font-size:14px">订单合计:</span><span style="color:red;font-size:16px;"><b>¥&nbsp;{{tool.formatAmount(data.defaultamount,2)}}</b></span></p>
       </div>
       <div class="flex-align-center">
-        <p v-if="freefreightamount" style="font-size: 13px !important;color: #8888;font-weight: normal">{{data.amount > freefreightamount?'当前订单免运费':`订单满${tool.formatAmount(freefreightamount,2)}元免运费,当前还差${tool.formatAmount(freefreightamount - data.amount,2)}元`}}</p>
+        <p v-if="freefreightamount" style="font-size: 13px !important;color: #8888;font-weight: normal">{{checkFreefreightamount}}</p>
       </div>
     </div>
     <div class="drawer__panel">
@@ -233,6 +233,23 @@ export default {
     addAddressInfo
   },
   inject:['thisDetail'],
+  computed:{
+    checkFreefreightamount () {
+      let result = ''
+      switch (this.freefreightamount) {
+        case -1:
+          result = '不免运费'
+          break;
+        case 0:
+          result = '免运费'
+          break;
+        default:
+          result = this.data.amount >= this.freefreightamount?'当前订单免运费':`订单满${this.tool.formatAmount(this.freefreightamount,2)}元免运费,当前还差${this.tool.formatAmount(this.freefreightamount - this.data.amount,2)}元`
+          break;
+      }
+      return result
+    },
+  },
   data () {
     return {
       freefreightamount:'',

src/SDrpManagement/salerOrder/modules/productlist.vue

@@ -6,7 +6,7 @@
       <el-button :disabled="data.type === '特殊订单'"  v-if="data.status === '新建'" class="inline-16" size="small" type="primary" @click="drawer = true">{{setcol === 24?'添 加':'取 消'}}</el-button>
       <excel class="inline-16" :tablecols="columnTitle" :param="param" :total="total" :excelTitle="excelTitle"></excel>
     </div>
-    <p class="normal-margin" style="font-size: 13px !important;color:red;font-weight: normal">{{data.amount >= freefreightamount?'当前订单免运费':`订单满${tool.formatAmount(freefreightamount,2)}元免运费,当前还差${tool.formatAmount(freefreightamount - data.amount,2)}元`}}</p>
+    <p v-if="data.status === '新建'" class="normal-margin" style="font-size: 13px !important;color:red;font-weight: normal">{{checkFreefreightamount}}</p>
     <el-table
       ref="multipleTable"
       :data="tableData"
@@ -295,7 +295,22 @@ export default {
       } else {
         return false
       }
-    }
+    },
+    checkFreefreightamount () {
+      let result = ''
+      switch (this.freefreightamount) {
+        case -1:
+          result = '不免运费'
+          break;
+        case 0:
+          result = '免运费'
+          break;
+        default:
+          result = this.data.amount >= this.freefreightamount?'当前订单免运费':`订单满${this.tool.formatAmount(this.freefreightamount,2)}元免运费,当前还差${this.tool.formatAmount(this.freefreightamount - this.data.amount,2)}元`
+          break;
+      }
+      return result
+    },
   },
   components:{
     excel:() =>  import('../details/export_excel'),