BUG:解决单位平方米两种输入差异

app/Http/Controllers/TestController.php

@@ -135,7 +135,8 @@ class TestController extends Controller
     }
 
     public function zzd(){
-        return app("OrderService")->freezeRemoveWave("'','SO190628000688'",true);
+        $order = Order::query()->where("code","SO210202003353")->first();
+        return app(OrderService::class)->createInstantBill($order);
     }
 
     public function syncWeight()

database/migrations/2021_01_29_161734_add_units_data.php

@@ -17,10 +17,7 @@ class AddUnitsData extends Migration
     public function up()
     {
         foreach ($this->units as $unit){
-            \App\Unit::query()->firstOrCreate(["name"=>$unit],[
-               "name" => $unit,
-               "code" => $unit
-            ]);
+            \App\Unit::query()->firstOrCreate(["name"=>$unit]);
         }
     }
 

resources/views/customer/project/area.blade.php

@@ -53,19 +53,19 @@
                     <td>@{{ area.ownerStoragePriceModel }}</td>
                     <td>@{{ area.unitName }}</td>
                     <td>
-                        <label><input :readonly="editIndex==i && area.unitName=='m²' ? false : true" @change="thisArea.area_on_tray = $event.target.value"
+                        <label><input :readonly="editIndex==i && (area.unitName=='m²' || area.unitName=='㎡') ? false : true" @change="thisArea.area_on_tray = $event.target.value"
                                       type="number" min="0" class="form-control form-control-sm" :value="area.areaOnTray"></label>
                     </td>
                     <td>
-                        <label><input :readonly="editIndex==i && area.unitName=='m²' ? false : true" @change="thisArea.area_on_half_tray = $event.target.value"
+                        <label><input :readonly="editIndex==i && (area.unitName=='m²' || area.unitName=='㎡') ? false : true" @change="thisArea.area_on_half_tray = $event.target.value"
                                       type="number" min="0" class="form-control form-control-sm" :value=area.areaOnHalfTray></label>
                     </td>
                     <td>
-                        <label><input :readonly="editIndex==i && area.unitName=='m²' ? false : true" @change="thisArea.area_on_flat = $event.target.value"
+                        <label><input :readonly="editIndex==i && (area.unitName=='m²' || area.unitName=='㎡') ? false : true" @change="thisArea.area_on_flat = $event.target.value"
                                       type="number" min="0" class="form-control form-control-sm" :value="area.areaOnFlat"></label>
                     </td>
                     <td>
-                        <label class="form-inline"><input :readonly="editIndex==i && area.unitName!='m²' ? false : true" @change="thisArea.accounting_area = $event.target.value"
+                        <label class="form-inline"><input :readonly="editIndex==i && (area.unitName!='m²' || area.unitName!='㎡') ? false : true" @change="thisArea.accounting_area = $event.target.value"
                                       type="number" min="0" class="form-control form-control-sm" :value="area.accountingArea">
                             <label> / @{{ area.unitName }}</label>
                         </label>

resources/views/customer/project/part/_storage.blade.php

@@ -46,7 +46,7 @@
         <label for="unit_id" class="col-5 offset-1 text-info">单位</label>
         <select id="unit_id" class="col-6 form-control"
                 :class="errors.unit_id ? 'is-invalid' : ''" v-model="model.storage.unit_id">
-            <option v-for="unit in pool.units" :value="unit.id" v-if="unit.name == 'm²' || unit.name == 'm³' || unit.name == '件' || unit.name == '托'">
+            <option v-for="unit in pool.units" :value="unit.id" v-if="unit.name == 'm²' || unit.name=='㎡' || unit.name == 'm³' || unit.name == '件' || unit.name == '托'">
                 @{{ unit.name }}</option>
         </select>
         <span class="invalid-feedback mt-0 offset-2" role="alert" v-if="errors.unit_id">

resources/views/maintenance/priceModel/storage/create.blade.php

@@ -72,7 +72,7 @@
                     <label for="unit_id" class="col-4 text-info">单位</label>
                     <select id="unit_id" name="unit_id" class="col-8 form-control" required
                             :class="errors.unit_id ? 'is-invalid' : ''" v-model="model.unit_id">
-                        <option v-for="unit in units" :value="unit.id" v-if="unit.name == 'm²' || unit.name == 'm³'">@{{ unit.name }}</option>
+                        <option v-for="unit in units" :value="unit.id" v-if="unit.name == 'm²' || unit.name == '㎡' || unit.name == 'm³'">@{{ unit.name }}</option>
                     </select>
                     <span class="invalid-feedback mt-0 offset-2" role="alert" v-if="errors.unit_id">
                         <strong>@{{ errors.unit_id[0] }}</strong>