From 9252ac63bade4c0e155b2c5a2882fdfda863ee96 Mon Sep 17 00:00:00 2001
From: zhangzeli <123456>
Date: 星期一, 10 一月 2022 11:26:09 +0800
Subject: [PATCH] bug

---
 src/views/your/addOil-manage/addOilManage.vue |  106 ++++++++++++++++++++++++++++++++++------------------
 1 files changed, 69 insertions(+), 37 deletions(-)

diff --git a/src/views/your/addOil-manage/addOilManage.vue b/src/views/your/addOil-manage/addOilManage.vue
index e96119f..6637912 100644
--- a/src/views/your/addOil-manage/addOilManage.vue
+++ b/src/views/your/addOil-manage/addOilManage.vue
@@ -8,7 +8,6 @@
     <Card>
       <Row class="operation">
         <Button @click="addOil" type="primary" icon="md-add">娣诲姞鍔犳补璁板綍</Button>
-        <Button @click="delAll" icon="md-trash">鎵归噺鍒犻櫎</Button>
         <Button @click="init" icon="md-refresh">鍒锋柊</Button>
         <Button type="dashed" @click="openTip = !openTip">{{
           openTip ? "鍏抽棴鎻愮ず" : "寮�鍚彁绀�"
@@ -66,29 +65,54 @@
               :label-width="80"
               :rules="addOilFormValidate"
       >
-        <FormItem label="杞﹁締" prop="carId">
-            <Select v-model="addOilForm.carId" filterable>
-              <Option v-for="item in carList" :value="item.id">{{ item.carNo }}</Option>
-            </Select>
-        </FormItem>
-        <Form-item label="鍔犳补鏃ユ湡" prop="addDate">
-          <Row>
-            <Col span="11">
+        <Row :gutter="0">
+          <Col span="12">
+            <FormItem label="杞﹁締" prop="carId">
+              <Select v-model="addOilForm.carId" filterable>
+                <Option v-for="item in carList" :value="item.id">{{ item.carNo }}</Option>
+              </Select>
+            </FormItem>
+          </Col>
+          <Col span="12">
+            <Form-item label="鍔犳补鏃ユ湡" prop="addDate">
               <Date-picker @on-change="change1" type="date" value="yyyy-MM-dd" placeholder="閫夋嫨鏃ユ湡" v-model="addOilForm.addDate"></Date-picker>
-            </Col>
-          </Row>
-        </Form-item>
-        <FormItem label="鍔犳补閲�" prop="amount">
-          <Input v-model="addOilForm.amount" type="number"/>
-        </FormItem>
-        <FormItem label="鍗曚环" prop="unitPrice">
-          <Input v-model="addOilForm.unitPrice" type="number"/>
-        </FormItem>
-        <FormItem label="鍔犳补閲戦" prop="money">
-          <Input v-model="addOilForm.money" type="number"/>
-        </FormItem>
-        <FormItem label="鍔犳补鏃堕噷绋�" prop="mileage">
-          <Input v-model="addOilForm.mileage" type="number"/>
+            </Form-item>
+          </Col>
+        </Row>
+        <Row :gutter="0">
+          <Col span="12">
+            <FormItem label="鍔犳补閲�" prop="amount">
+              <Input v-model="addOilForm.amount" type="number">
+                <span slot="append">鍗�</span>
+              </Input>
+            </FormItem>
+          </Col>
+          <Col span="12">
+            <FormItem label="鍗曚环" prop="unitPrice">
+              <Input v-model="addOilForm.unitPrice" type="number">
+                <span slot="append">鍏�</span>
+              </Input>
+            </FormItem>
+          </Col>
+        </Row>
+        <Row :gutter="0">
+          <Col span="12">
+            <FormItem label="鍔犳补閲戦" prop="money">
+              <Input v-model="addOilForm.money" type="number">
+                <span slot="append">鍏�</span>
+              </Input>
+            </FormItem>
+          </Col>
+          <Col span="12">
+            <FormItem label="閲岀▼" prop="mileage">
+              <Input v-model="addOilForm.mileage" type="number">
+                <span slot="append">鍏噷</span>
+              </Input>
+            </FormItem>
+          </Col>
+        </Row>
+        <FormItem label="鍔犳补鍗″彿" prop="addOilCode">
+          <Input v-model="addOilForm.addOilCode" />
         </FormItem>
         <FormItem label="澶囨敞" prop="remarks">
           <Input v-model="addOilForm.remarks" />
@@ -258,13 +282,18 @@
           {
             title: "杞︾墝鍙�",
             key: "carNo",
-            width: 100,
+            width: 120,
             sortable: true,
+          },
+          {
+            title: "鍔犳补鍗″彿",
+            key: "addOilCode",
+            width: 140,
           },
           {
             title: "鍔犳补鏃ユ湡",
             key: "addDate",
-            width: 150,
+            width: 120,
             sortable: true,
           },
           {
@@ -282,19 +311,22 @@
           {
             title: "鍔犳补閲戦",
             key: "money",
-            minWidth: 100,
+            minWidth: 120,
             sortable: true,
           },
           {
             title: "鍔犳补鏃堕噷绋�",
             key: "mileage",
-            minWidth: 100,
+            minWidth: 130,
             sortable: true,
           },
           {
             title: "澶囨敞",
             key: "remarks",
-            minWidth: 150,
+            width: 150,
+            render: (h, params) => {
+              return h("div",params.row.remarks=="undefined" ? '':params.row.remarks);
+            }
           },
           {
             title: "鎿嶄綔",
@@ -304,15 +336,15 @@
             render: (h, params) => {
               return h("div", [
                 h(
-                        "a",
-                        {
-                          on: {
-                            click: () => {
-                              this.edit(params.row);
-                            },
-                          },
-                        },
-                        "缂栬緫"
+                  "a",
+                  {
+                    on: {
+                      click: () => {
+                        this.edit(params.row);
+                      },
+                    },
+                  },
+                  "缂栬緫"
                 ),
                 h("Divider", {
                   props: {

--
Gitblit v1.9.1