Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev

src/views/Pricesystem/Price/PriceBill.vue

@@ -270,11 +270,7 @@
     v-model="details.popUpShow.addVsitied"
   >
     <el-form inline :model="details.form" ref="lineFormRef" label-width="130px">
-      <el-form-item
-        label="始发地"
-        prop="startCity"
-        :rules="[{ required: true, message: '请选择始发地', trigger: ['blur', 'change'] }]"
-      >
+      <el-form-item label="始发地" prop="startCity">
         <el-cascader
           pleceholder="请选择始发地"
           :options="details.regionOptione"
@@ -291,11 +287,7 @@
         </el-cascader>
       </el-form-item>
 
-      <el-form-item
-        label="目的地"
-        prop="endCity"
-        :rules="[{ required: true, message: '请选择目的地', trigger: ['blur', 'change'] }]"
-      >
+      <el-form-item label="目的地" prop="endCity">
         <el-cascader
           pleceholder="请选择目的地"
           :options="details.regionOptione"

src/views/Pricesystem/Price/PriceTrunkLine.vue

@@ -219,7 +219,7 @@
     <!-- 提货路径 -->
     <template v-else>
       <div class="flex-c-sb">
-        <el-divider content-position="left">提货路径</el-divider>
+        <el-divider content-position="left">干线路径</el-divider>
 
         <el-button icon="CirclePlus" class="ml10" type="primary" @click="handleAdd">
           新 增
@@ -270,17 +270,13 @@
   </div>
 
   <el-dialog
-    :title="details.lineType === 'add' ? '新增提货路径' : '编辑提货路径'"
+    :title="details.lineType === 'add' ? '新增干线路径' : '编辑干线路径'"
     :visible.sync="details.popUpShow.addVsitied"
     width="70%"
     v-model="details.popUpShow.addVsitied"
   >
     <el-form inline :model="details.form" ref="lineFormRef" label-width="130px">
-      <el-form-item
-        label="始发地"
-        prop="startCity"
-        :rules="[{ required: true, message: '请选择始发地', trigger: ['blur', 'change'] }]"
-      >
+      <el-form-item label="始发地" prop="startCity">
         <el-cascader
           pleceholder="请选择始发地"
           :options="details.regionOptione"
@@ -297,11 +293,7 @@
         </el-cascader>
       </el-form-item>
 
-      <el-form-item
-        label="目的地"
-        prop="endCity"
-        :rules="[{ required: true, message: '请选择目的地', trigger: ['blur', 'change'] }]"
-      >
+      <el-form-item label="目的地" prop="endCity">
         <el-cascader
           pleceholder="请选择目的地"
           :options="details.regionOptione"