修改禅道bug

src/views/system/freight/freight_list/templateFreight.vue

@@ -15,10 +15,10 @@
     <el-card style="margin: 20px;">
       <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="80px" class="demo-ruleForm" style="width: 80%;">
         <el-form-item label="排序" prop="sort" style="width: 400px;">
-          <el-input v-model="ruleForm.sort" @input="onClickInputKeyBoard3('ruleForm', 'sort')"></el-input>
+          <el-input v-model="ruleForm.sort" placeholder="请输入排序序号" @input="onClickInputKeyBoard3('ruleForm', 'sort')"></el-input>
         </el-form-item>
         <el-form-item label="模板名称" prop="name" style="width: 400px;">
-          <el-input v-model="ruleForm.name"></el-input>
+          <el-input v-model="ruleForm.name" placeholder="请输入模板名称"></el-input>
         </el-form-item>
         <el-form-item label="是否默认">
           <el-radio-group v-model="ruleForm.is_default">
@@ -28,8 +28,8 @@
         </el-form-item>
         <el-form-item label="计费方式">
           <el-radio-group v-model="ruleForm.charge_type">
-            <el-radio :label="1">按数量</el-radio>
-            <el-radio :label="2">按重量</el-radio>
+            <el-radio :label="1">按重量</el-radio>
+            <el-radio :label="2">按数量</el-radio>
             <el-radio :label="3">按体积</el-radio>
           </el-radio-group>
         </el-form-item>
@@ -76,8 +76,8 @@
                   width="150"
                   >
                   <template slot="header" slot-scope="scope">
-                    <span v-if="ruleForm.charge_type == 1">首件（个）</span>
-                    <span v-if="ruleForm.charge_type == 2">首重（克）</span>
+                    <span v-if="ruleForm.charge_type == 2">首件（个）</span>
+                    <span v-if="ruleForm.charge_type == 1">首重（克）</span>
                     <span v-if="ruleForm.charge_type == 3">首件（立方米）</span>
                   </template>
                   <template slot-scope="scope">
@@ -99,8 +99,8 @@
                   width="150"
                   >
                   <template slot="header" slot-scope="scope">
-                    <span v-if="ruleForm.charge_type == 1">续件（个）</span>
-                    <span v-if="ruleForm.charge_type == 2">续重（克）</span>
+                    <span v-if="ruleForm.charge_type == 2">续件（个）</span>
+                    <span v-if="ruleForm.charge_type == 1">续重（克）</span>
                     <span v-if="ruleForm.charge_type == 3">续件（立方米）</span>
                   </template>
                   <template slot-scope="scope">

src/views/system/goods/add/components/goodsaftersale.vue

@@ -231,7 +231,10 @@
       },
       // 运费模板
       getFreightData() {
-        GetFreight().then(res => {
+        let params = {
+          is_status: 1
+        }
+        GetFreight(params).then(res => {
           if(res.data) {
             this.freightOptions = res.data;
           }else {

src/views/system/goodsimport/goodsgement.vue

@@ -404,7 +404,10 @@
     methods: {
       // 运费模板
       getFreightData() {
-        GetFreight().then(res => {
+        let params = {
+          is_status: 1
+        }
+        GetFreight(params).then(res => {
           if(res.data) {
             this.freightOptions = res.data;
           }else {