Merge branch 'pre-production'

src/views/Pricesystem/Price/PriceBill.vue

@@ -1111,8 +1111,8 @@ const handleAdd = () => {
     },
   ];
   details.form = deepClone(details.initForm);
-    console.log(details.initForm,'details.form');
-    
+  console.log(details.initForm, 'details.form');
+
   for (let i = 0; i < details.form.billTemplateDetail.length; i++) {
     const value = details.form.billTemplateDetail[i];
 
@@ -1131,10 +1131,9 @@ const handleAdd = () => {
 
 /** 给form赋值 */
 const initAssignmentForm = (data, isLine = true) => {
+  details.form.startCity = [];
+  details.form.endCity = [];
   if (isLine) {
-    details.form.startCity = [];
-    details.form.endCity = [];
-
     data.startProvinceId && (details.form.startCity[0] = data.startProvinceId + '');
     data.startCityId && (details.form.startCity[1] = data.startCityId + '');
     data.startCountyId && (details.form.startCity[2] = data.startCountyId + '');
@@ -1147,8 +1146,8 @@ const initAssignmentForm = (data, isLine = true) => {
     details.form.sendOrg = data.sendOrgName;
     details.form.priceId = data.priceId;
   }
-  details.form.startCity = [];
-  details.form.endCity = [];
+  // details.form.startCity = [];
+  // details.form.endCity = [];
   details.form.minCost = data.minCost || 0;
   details.form.additionalCost = data.additionalCost || 0;
 

src/views/Pricesystem/Price/PriceTrunkLine.vue

@@ -141,7 +141,7 @@
 
                     <tbody>
                       <tr v-for="(item, index) in value.categories">
-                        <td class="index">{{ index +1 }}</td>
+                        <td class="index">{{ index + 1 }}</td>
                         <!-- 品类名称 -->
                         <td>{{ item.name }}</td>
                         <!-- 费用 -->
@@ -476,7 +476,7 @@
 
                   <tbody>
                     <tr v-for="(item, index) in value.categories">
-                      <td class="index">{{ index  +1}}</td>
+                      <td class="index">{{ index + 1 }}</td>
                       <!-- 品类名称 -->
                       <td>{{ item.name }}</td>
                       <!-- 费用 -->
@@ -1121,10 +1121,9 @@ const handleAdd = () => {
 
 /** 给form赋值 */
 const initAssignmentForm = (data, isLine = true) => {
+  details.form.startCity = [];
+  details.form.endCity = [];
   if (isLine) {
-    details.form.startCity = [];
-    details.form.endCity = [];
-
     data.startProvinceId && (details.form.startCity[0] = data.startProvinceId + '');
     data.startCityId && (details.form.startCity[1] = data.startCityId + '');
     data.startCountyId && (details.form.startCity[2] = data.startCountyId + '');