From 039cc3db712a81d674b3686e482de2b277a9809d Mon Sep 17 00:00:00 2001
From: tengxi <971623072@qq.com>
Date: Mon, 9 Jan 2023 17:05:38 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jnpf/supplier/entity/SupplierEntity.java  |   4 +-
 .../scm/basicInformation/vehicle/Detail.vue   | 216 +++++++++---------
 2 files changed, 110 insertions(+), 110 deletions(-)

diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/supplier/entity/SupplierEntity.java b/SC-boot/linkage-scm/src/main/java/jnpf/supplier/entity/SupplierEntity.java
index af469829..863402cb 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/supplier/entity/SupplierEntity.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/supplier/entity/SupplierEntity.java
@@ -76,8 +76,8 @@ public class SupplierEntity  {
     @TableField("VAT_REGISTRATION_NUM")
     private String vatRegistrationNum;
 
-    @TableField("ORG_ID")
-    private String orgId;
+    @TableField("ORGNIZE_ID")
+    private String orgnizeId;
 
     @TableField("DEPARTMENT_ID")
     private String departmentId;
diff --git a/SC-web/src/views/scm/basicInformation/vehicle/Detail.vue b/SC-web/src/views/scm/basicInformation/vehicle/Detail.vue
index 0eb748c4..de09c860 100644
--- a/SC-web/src/views/scm/basicInformation/vehicle/Detail.vue
+++ b/SC-web/src/views/scm/basicInformation/vehicle/Detail.vue
@@ -1,121 +1,121 @@
 <template>
-<el-dialog title="详情"
-           :close-on-click-modal="false" append-to-body
-           :visible.sync="visible" class="JNPF-dialog JNPF-dialog_center" lock-scroll
-           width="600px">
-<el-row :gutter="15" class="">
-<el-form ref="elForm" :model="dataForm" size="small" label-width="100px" label-position="right" >
-    <template v-if="!loading">
-	    <el-col :span="24" >
-		<el-form-item  label-width="0">
-		<JNPF-Text  :style='{"width":"100%"}'
- :textStyle='{"color":"#000000","font-weight":"normal","text-decoration":"none","font-size":18,"line-height":32,"font-style":"normal","text-align":"left"}' value="车辆信息">
-		</JNPF-Text>
-	</el-form-item>
-	</el-col>
-            <el-col :span="24" >
-                <el-form-item  label="车牌号"  
- prop="ticketno" >
-                        <p>{{dataForm.ticketno}}</p>
-                </el-form-item>
-            </el-col>
-            <el-col :span="24" >
-                <el-form-item  label="司机名称"  
- prop="drivername" >
-                        <p>{{dataForm.drivername}}</p>
-                </el-form-item>
-            </el-col>
-            <el-col :span="24" >
-                <el-form-item  label="手机号"  
- prop="contact" >
-                        <p>{{dataForm.contact}}</p>
-                </el-form-item>
-            </el-col>
-            <el-col :span="24" >
-                <el-form-item  label="车辆照片"  
- prop="vehiclephotos" >
-                    <JNPF-UploadImg    v-model="dataForm.vehiclephotos"
- disabled
- detailed  :fileSize="5"  sizeUnit="MB"  :limit="9"  >
-                </JNPF-UploadImg>
-                </el-form-item>
-            </el-col>
-            <el-col :span="12" >
-                <el-form-item  label="录入人"  
- prop="creatorusername" >
-                        <p>{{dataForm.creatorusername}}</p>
-                </el-form-item>
-            </el-col>
-            <el-col :span="12" >
-                <el-form-item  label="创建时间"  
- prop="creatortime" >
-                        <p>{{dataForm.creatortime}}</p>
-                </el-form-item>
-            </el-col>
-    </template>
-</el-form>
+  <el-dialog title="详情"
+             :close-on-click-modal="false" append-to-body
+             :visible.sync="visible" class="JNPF-dialog JNPF-dialog_center" lock-scroll
+             width="600px">
+    <el-row :gutter="15" class="">
+      <el-form ref="elForm" :model="dataForm" size="small" label-width="100px" label-position="right" >
+        <template v-if="!loading">
+          <el-col :span="24" >
+            <el-form-item  label-width="0">
+              <JNPF-Text  :style='{"width":"100%"}'
+                          :textStyle='{"color":"#000000","font-weight":"normal","text-decoration":"none","font-size":18,"line-height":32,"font-style":"normal","text-align":"left"}' value="车辆信息">
+              </JNPF-Text>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24" >
+            <el-form-item  label="车牌号"
+                           prop="ticketno" >
+              <p>{{dataForm.ticketno}}</p>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24" >
+            <el-form-item  label="司机名称"
+                           prop="drivername" >
+              <p>{{dataForm.drivername}}</p>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24" >
+            <el-form-item  label="手机号"
+                           prop="contact" >
+              <p>{{dataForm.contact}}</p>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24" >
+            <el-form-item  label="车辆照片"
+                           prop="vehiclephotos" >
+              <JNPF-UploadImg    v-model="dataForm.vehiclephotos"
+                                 disabled
+                                 detailed  :fileSize="5"  sizeUnit="MB"  :limit="9"  >
+              </JNPF-UploadImg>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12" >
+            <el-form-item  label="录入人"
+                           prop="creatorusername" >
+              <p>{{dataForm.creatorusername}}</p>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12" >
+            <el-form-item  label="创建时间"
+                           prop="creatortime" >
+              <p>{{dataForm.creatortime}}</p>
+            </el-form-item>
+          </el-col>
+        </template>
+      </el-form>
     </el-row>
     <span slot="footer" class="dialog-footer">
         <el-button @click="visible = false"> 取 消</el-button>
     </span>
-    </el-dialog>
+  </el-dialog>
 </template>
 <script>
-    import request from '@/utils/request'
-    import PrintBrowse from '@/components/PrintBrowse'
-    import jnpf from '@/utils/jnpf'
-    export default {
-        components: {PrintBrowse},
-        props: [],
-        data() {
-            return {
-                visible: false,
-                loading: false,
-                printBrowseVisible: false,
-                printId: '',
-            dataForm: {
-                id :'',
-                            ticketno : '',
-                            drivername : '',
-                            contact : '',
-                            vehiclephotos : [{"name":"006-1 (3).jpg","url":"/api/file/Image/annex/20230105_380637081082287813.jpg","fileId":"20230105_380637081082287813.jpg"},{"name":"微信图片_20220617141029.jpg","url":"/api/file/Image/annex/20230105_380637561959241413.jpg","fileId":"20230105_380637561959241413.jpg"}],
-                            creatorusername : '',
-                            creatortime : "",
-            },
-
-        }
+  import request from '@/utils/request'
+  import PrintBrowse from '@/components/PrintBrowse'
+  import jnpf from '@/utils/jnpf'
+  export default {
+    components: {PrintBrowse},
+    props: [],
+    data() {
+      return {
+        visible: false,
+        loading: false,
+        printBrowseVisible: false,
+        printId: '',
+        dataForm: {
+          id :'',
+          ticketno : '',
+          drivername : '',
+          contact : '',
+          vehiclephotos : [{"name":"006-1 (3).jpg","url":"/api/file/Image/annex/20230105_380637081082287813.jpg","fileId":"20230105_380637081082287813.jpg"},{"name":"微信图片_20220617141029.jpg","url":"/api/file/Image/annex/20230105_380637561959241413.jpg","fileId":"20230105_380637561959241413.jpg"}],
+          creatorusername : '',
+          creatortime : "",
         },
-        computed: {},
-        watch: {},
-        created() {
 
-        },
-        mounted() {},
-        methods: {
-            dataInfo(dataAll){
-                let _dataAll =dataAll
-                        _dataAll.vehiclephotos = _dataAll.vehiclephotos ? JSON.parse( _dataAll.vehiclephotos):[]
-                this.dataForm = _dataAll
-            },
+      }
+    },
+    computed: {},
+    watch: {},
+    created() {
 
-            init(id) {
-                this.dataForm.id = id || 0;
-                this.visible = true;
-                this.$nextTick(() => {
-                    if(this.dataForm.id){
-                        this.loading = true
-                        request({
-                            url: '/api/example/Vehicle/detail/'+this.dataForm.id,
-                            method: 'get'
-                        }).then(res => {
-                            this.dataInfo(res.data)
-                            this.loading = false
-                        })
-                    }
+    },
+    mounted() {},
+    methods: {
+      dataInfo(dataAll){
+        let _dataAll =dataAll
+        _dataAll.vehiclephotos = _dataAll.vehiclephotos ? JSON.parse( _dataAll.vehiclephotos):[]
+        this.dataForm = _dataAll
+      },
 
-                })
-            },
-        },
-    }
+      init(id) {
+        this.dataForm.id = id || 0;
+        this.visible = true;
+        this.$nextTick(() => {
+          if(this.dataForm.id){
+            this.loading = true
+            request({
+              url: '/api/example/Vehicle/detail/'+this.dataForm.id,
+              method: 'get'
+            }).then(res => {
+              this.dataInfo(res.data)
+              this.loading = false
+            })
+          }
+
+        })
+      },
+    },
+  }
 
 </script>