diff --git a/SC-web/src/views/scm/basicInformation/supplier/Detail.vue b/SC-web/src/views/scm/basicInformation/supplier/Detail.vue
index 0b8308eb..cd637521 100644
--- a/SC-web/src/views/scm/basicInformation/supplier/Detail.vue
+++ b/SC-web/src/views/scm/basicInformation/supplier/Detail.vue
@@ -1,225 +1,202 @@
 <template>
-<el-dialog title="详情"
-           :close-on-click-modal="false" append-to-body
-           :visible.sync="visible" class="JNPF-dialog JNPF-dialog_center" lock-scroll
-           width="1000px">
-<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="12" >
-                <el-form-item  label="供应商编码"  
- prop="supplierCode" >
-                        <p>{{dataForm.supplierCode}}</p>
-                </el-form-item>
-            </el-col>
-            <el-col :span="12" >
-                <el-form-item  label="所属公司"  
- prop="companyId" >
-                        <p>{{dataForm.companyId}}</p>
-                </el-form-item>
-            </el-col>
-            <el-col :span="12" >
-                <el-form-item  label="供应商名称"  
- prop="supplierName" >
-                        <p>{{dataForm.supplierName}}</p>
-                </el-form-item>
-            </el-col>
-            <el-col :span="12" >
-                <el-form-item  label="国家"  
- prop="country" >
-                        <p>{{dataForm.country}}</p>
-                </el-form-item>
-            </el-col>
-            <el-col :span="12" >
-                <el-form-item  label="供货指标"  
- prop="supply" >
-                        <p>{{dataForm.supply}}</p>
-                </el-form-item>
-            </el-col>
-            <el-col :span="12" >
-                <el-form-item  label="省"  
- prop="province" >
-                        <p>{{dataForm.province}}</p>
-                </el-form-item>
-            </el-col>
-            <el-col :span="12" >
-                <el-form-item  label="联系人"  
- prop="contactName" >
-                        <p>{{dataForm.contactName}}</p>
-                </el-form-item>
-            </el-col>
-            <el-col :span="12" >
-                <el-form-item  label="供应商等级"  
- prop="supplierLevel" >
-                         <p>{{ dataForm.supplierLevel | dynamicText(supplierLevelOptions) }} </p>
-                </el-form-item>
-            </el-col>
-            <el-col :span="12" >
-                <el-form-item  label="联系电话"  
- prop="contactPhone" >
-                        <p>{{dataForm.contactPhone}}</p>
-                </el-form-item>
-            </el-col>
-            <el-col :span="12" >
-                <el-form-item  label="供应商性质"  
- prop="enterprise" >
-                         <p>{{ dataForm.enterprise | dynamicText(enterpriseOptions) }} </p>
-                </el-form-item>
-            </el-col>
-            <el-col :span="12" >
-                <el-form-item  label="地址"  
- prop="address" >
-                        <p>{{dataForm.address}}</p>
-                </el-form-item>
-            </el-col>
-            <el-col :span="12" >
-                <el-form-item  label="供应商类型"  
- prop="classification" >
-                         <p>{{ dataForm.classification | dynamicText(classificationOptions) }} </p>
-                </el-form-item>
-            </el-col>
-            <el-col :span="12" >
-                <el-form-item  label="开户行"  
- prop="bank" >
-                        <p>{{dataForm.bank}}</p>
-                </el-form-item>
-            </el-col>
-            <el-col :span="12" >
-                <el-form-item  label="默认税码"  
- prop="taxCode" >
-                         <p>{{ dataForm.taxCode | dynamicText(taxCodeOptions) }} </p>
-                </el-form-item>
-            </el-col>
-            <el-col :span="12" >
-                <el-form-item  label="纳税编号"  
- prop="vatRegistrationNum" >
-                        <p>{{dataForm.vatRegistrationNum}}</p>
-                </el-form-item>
-            </el-col>
-            <el-col :span="12" >
-                <el-form-item  label="是否采购"  
- prop="isPurchase" >
-                         <p>{{ dataForm.isPurchase | dynamicText(isPurchaseOptions) }} </p>
-                </el-form-item>
-            </el-col>
-            <el-col :span="12" >
-                <el-form-item  label="银行账户"  
- prop="bankAccount" >
-                        <p>{{dataForm.bankAccount}}</p>
-                </el-form-item>
-            </el-col>
-            <el-col :span="12" >
-                <el-form-item  label="是否付款"  
- prop="isPayment" >
-                         <p>{{ dataForm.isPayment | dynamicText(isPaymentOptions) }} </p>
-                </el-form-item>
-            </el-col>
-            <el-col :span="12" >
-                <el-form-item  label="应付科目"  
- prop="payable" >
-                        <p>{{dataForm.payable}}</p>
-                </el-form-item>
-            </el-col>
-            <el-col :span="12" >
-                <el-form-item  label="是否启用"  
- prop="status" >
-                         <p>{{ dataForm.status | dynamicText(statusOptions) }} </p>
-                </el-form-item>
-            </el-col>
-            <el-col :span="12" >
-                <el-form-item  label="预付科目"  
- prop="prepaid" >
-                        <p>{{dataForm.prepaid}}</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 title="详情" :close-on-click-modal="false" append-to-body :visible.sync="visible"
+        class="JNPF-dialog JNPF-dialog_center" lock-scroll width="1000px">
+        <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="12">
+                        <el-form-item label="供应商编码" prop="supplierCode">
+                            <p>{{ dataForm.supplierCode }}</p>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="所属公司" prop="companyId">
+                            <p>{{ dataForm.companyId }}</p>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="供应商名称" prop="supplierName">
+                            <p>{{ dataForm.supplierName }}</p>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="国家" prop="country">
+                            <p>{{ dataForm.country }}</p>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="供货指标" prop="supply">
+                            <p>{{ dataForm.supply }}</p>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="省" prop="province">
+                            <p>{{ dataForm.province }}</p>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="联系人" prop="contactName">
+                            <p>{{ dataForm.contactName }}</p>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="供应商等级" prop="supplierLevel">
+                            <p>{{ dataForm.supplierLevel | dynamicText(supplierLevelOptions) }} </p>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="联系电话" prop="contactPhone">
+                            <p>{{ dataForm.contactPhone }}</p>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="供应商性质" prop="enterprise">
+                            <p>{{ dataForm.enterprise | dynamicText(enterpriseOptions) }} </p>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="地址" prop="address">
+                            <p>{{ dataForm.address }}</p>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="供应商类型" prop="classification">
+                            <p>{{ dataForm.classification | dynamicText(classificationOptions) }} </p>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="开户行" prop="bank">
+                            <p>{{ dataForm.bank }}</p>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="默认税码" prop="taxCode">
+                            <p>{{ dataForm.taxCode | dynamicText(taxCodeOptions) }} </p>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="纳税编号" prop="vatRegistrationNum">
+                            <p>{{ dataForm.vatRegistrationNum }}</p>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="是否采购" prop="isPurchase">
+                            <p>{{ dataForm.isPurchase | dynamicText(isPurchaseOptions) }} </p>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="银行账户" prop="bankAccount">
+                            <p>{{ dataForm.bankAccount }}</p>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="是否付款" prop="isPayment">
+                            <p>{{ dataForm.isPayment | dynamicText(isPaymentOptions) }} </p>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="应付科目" prop="payable">
+                            <p>{{ dataForm.payable }}</p>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="是否启用" prop="status">
+                            <p>{{ dataForm.status | dynamicText(statusOptions) }} </p>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="预付科目" prop="prepaid">
+                            <p>{{ dataForm.prepaid }}</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>
 </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: '',
+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 :'',
-                            supplierCode : '',
-                            companyId : "",
-                            supplierName : '',
-                            country : "CHINA",
-                            supply : '',
-                            province : [],
-                            contactName : '',
-                            supplierLevel : "1",
-                            contactPhone : '',
-                            enterprise : "0",
-                            address : '',
-                            classification : "0",
-                            bank : '',
-                            taxCode : "0",
-                            vatRegistrationNum : '',
-                            isPurchase : "0",
-                            bankAccount : '',
-                            isPayment : "0",
-                            payable : '',
-                            status : "1",
-                            prepaid : '',
-                            supplierSiteCode : '',
-                            creatorTime : "",
-                            lastModifyTime : "",
+                id: '',
+                supplierCode: '',
+                companyId: "",
+                supplierName: '',
+                country: "CHINA",
+                supply: '',
+                province: [],
+                contactName: '',
+                supplierLevel: "1",
+                contactPhone: '',
+                enterprise: "0",
+                address: '',
+                classification: "0",
+                bank: '',
+                taxCode: "0",
+                vatRegistrationNum: '',
+                isPurchase: "0",
+                bankAccount: '',
+                isPayment: "0",
+                payable: '',
+                status: "1",
+                prepaid: '',
+                supplierSiteCode: '',
+                creatorTime: "",
+                lastModifyTime: "",
             },
-                                supplierLevelOptions:[{"fullName":"一级","id":"1"},{"fullName":"二级","id":"2"},{"fullName":"三级","id":"3"},{"fullName":"四级","id":"4"}],
-                                enterpriseOptions:[{"fullName":"民营","id":"0"},{"fullName":"私营","id":"1"}],
-                                classificationOptions:[{"fullName":"国内","id":"0"},{"fullName":"国外","id":"1"}],
-                                taxCodeOptions:[{"fullName":"13个点","id":"0"},{"fullName":"9个点","id":"1"},{"fullName":"6个点","id":"2"},{"fullName":"5个点","id":"3"}],
-                                isPurchaseOptions:[{"fullName":"否","id":"0"},{"fullName":"是","id":"1"}],
-                                isPaymentOptions:[{"fullName":"否","id":"0"},{"fullName":"是","id":"1"}],
-                                statusOptions:[{"fullName":"启用","id":"1"},{"fullName":"停用","id":"2"}],
+            supplierLevelOptions: [{ "fullName": "一级", "id": "1" }, { "fullName": "二级", "id": "2" }, { "fullName": "三级", "id": "3" }, { "fullName": "四级", "id": "4" }],
+            enterpriseOptions: [{ 'fullName': '民营', 'id': '0' }, { 'fullName': '国有', 'id': '1' }, { 'fullName': '其它', 'id': '2' }],
+            classificationOptions: [{ "fullName": "国内", "id": "0" }, { "fullName": "国外", "id": "1" }],
+            taxCodeOptions: [{ "fullName": "13", "id": "0" }, { "fullName": "9", "id": "1" }, { "fullName": "6", "id": "2" }, { "fullName": "5", "id": "3" }, { "fullName": "3", "id": "4" }, { "fullName": "0", "id": "5" }],
+            isPurchaseOptions: [{ "fullName": "否", "id": "0" }, { "fullName": "是", "id": "1" }],
+            isPaymentOptions: [{ "fullName": "否", "id": "0" }, { "fullName": "是", "id": "1" }],
+            statusOptions: [{ "fullName": "启用", "id": "1" }, { "fullName": "停用", "id": "2" }],
 
         }
-        },
-        computed: {},
-        watch: {},
-        created() {
+    },
+    computed: {},
+    watch: {},
+    created() {
 
+    },
+    mounted() { },
+    methods: {
+        dataInfo(dataAll) {
+            let _dataAll = dataAll
+            this.dataForm = _dataAll
         },
-        mounted() {},
-        methods: {
-            dataInfo(dataAll){
-                let _dataAll =dataAll
-                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/Supplier/detail/'+this.dataForm.id,
-                            method: 'get'
-                        }).then(res => {
-                            this.dataInfo(res.data)
-                            this.loading = false
-                        })
-                    }
+        init(id) {
+            this.dataForm.id = id || 0;
+            this.visible = true;
+            this.$nextTick(() => {
+                if (this.dataForm.id) {
+                    this.loading = true
+                    request({
+                        url: '/api/example/Supplier/detail/' + this.dataForm.id,
+                        method: 'get'
+                    }).then(res => {
+                        this.dataInfo(res.data)
+                        this.loading = false
+                    })
+                }
 
-                })
-            },
+            })
         },
-    }
+    },
+}
 
 </script>
diff --git a/SC-web/src/views/scm/basicInformation/supplier/Form.vue b/SC-web/src/views/scm/basicInformation/supplier/Form.vue
index 0666e829..b3c48b57 100644
--- a/SC-web/src/views/scm/basicInformation/supplier/Form.vue
+++ b/SC-web/src/views/scm/basicInformation/supplier/Form.vue
@@ -1,393 +1,363 @@
 <template>
-<el-dialog :title="!dataForm.id ? '新建' :  isDetail ? '详情':'编辑'"
-           :close-on-click-modal="false" append-to-body
-           :visible.sync="visible" class="JNPF-dialog JNPF-dialog_center" lock-scroll
-           width="1000px">
-<el-row :gutter="15" class="">
-<el-form ref="elForm" :model="dataForm" :rules="rules" size="small" label-width="100px" label-position="right" >
-    <template v-if="!loading">
-            <el-col :span="12" >
-                <el-form-item  label="供应商编码"  
- prop="supplierCode" >
-                    <el-input    v-model="dataForm.supplierCode"
- placeholder="请输入供应商编码"  clearable  :style='{"width":"100%"}'>
+    <el-dialog :title="!dataForm.id ? '新建' : isDetail ? '详情' : '编辑'" :close-on-click-modal="false" append-to-body
+        :visible.sync="visible" class="JNPF-dialog JNPF-dialog_center" lock-scroll width="1000px">
+        <el-row :gutter="15" class="">
+            <el-form ref="elForm" :model="dataForm" :rules="rules" size="small" label-width="100px" label-position="right">
+                <template v-if="!loading">
+                    <el-col :span="12">
+                        <el-form-item label="供应商编码" prop="supplierCode">
+                            <el-input v-model="dataForm.supplierCode" placeholder="请输入供应商编码" clearable
+                                :style='{ "width": "100%" }'>
 
-                </el-input>
-                </el-form-item>
-            </el-col>
-            <el-col :span="12" >
-                <el-form-item  label="所属公司"  
- prop="companyId" >
-                    <popupSelect    v-model="dataForm.companyId"
- placeholder="请选择"  clearable  field="companyId" interfaceId="394016341591396805" :columnOptions="companyIdcolumnOptions" propsValue="F_Id" relationField="F_FullName" popupType="dialog"
- popupTitle="选择数据"  popupWidth="800px"
-  >
+                            </el-input>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="所属公司" prop="companyId">
+                            <popupSelect v-model="dataForm.companyId" placeholder="请选择" clearable field="companyId"
+                                interfaceId="394016341591396805" :columnOptions="companyIdcolumnOptions" propsValue="F_Id"
+                                relationField="F_FullName" popupType="dialog" popupTitle="选择数据" popupWidth="800px">
 
-                </popupSelect>
-                </el-form-item>
-            </el-col>
-            <el-col :span="12" >
-                <el-form-item  label="供应商名称"  
- prop="supplierName" >
-                    <el-input    v-model="dataForm.supplierName"
- placeholder="请输入供应商名称"  clearable  :style='{"width":"100%"}'>
+                            </popupSelect>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="供应商名称" prop="supplierName">
+                            <el-input v-model="dataForm.supplierName" placeholder="请输入供应商名称" clearable
+                                :style='{ "width": "100%" }'>
 
-                </el-input>
-                </el-form-item>
-            </el-col>
-            <el-col :span="12" >
-                <el-form-item  label="国家"  
- prop="country" >
-                    <el-input    v-model="dataForm.country"
- placeholder="请输入国家"  clearable  :style='{"width":"100%"}'>
+                            </el-input>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="国家" prop="country">
+                            <el-input v-model="dataForm.country" placeholder="请输入国家" clearable :style='{ "width": "100%" }'>
 
-                </el-input>
-                </el-form-item>
-            </el-col>
-            <el-col :span="12" >
-                <el-form-item  label="供货指标"  
- prop="supply" >
-                    <el-input    v-model="dataForm.supply"
- placeholder="请输入供货指标"  clearable  :style='{"width":"100%"}'>
+                            </el-input>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="供货指标" prop="supply">
+                            <el-input v-model="dataForm.supply" placeholder="请输入供货指标" clearable :style='{ "width": "100%" }'>
 
-                </el-input>
-                </el-form-item>
-            </el-col>
-            <el-col :span="12" >
-                <el-form-item  label="省"  
- prop="province" >
-                    <JNPF-Address    v-model="dataForm.province"
- placeholder="请选择省市区"  clearable  :level=2 >
+                            </el-input>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="省" prop="province">
+                            <JNPF-Address v-model="dataForm.province" placeholder="请选择省市区" clearable :level=2>
 
-                </JNPF-Address>
-                </el-form-item>
-            </el-col>
-            <el-col :span="12" >
-                <el-form-item  label="联系人"  
- prop="contactName" >
-                    <el-input    v-model="dataForm.contactName"
- placeholder="请输入联系人"  clearable  :style='{"width":"100%"}'>
+                            </JNPF-Address>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="联系人" prop="contactName">
+                            <el-input v-model="dataForm.contactName" placeholder="请输入联系人" clearable
+                                :style='{ "width": "100%" }'>
 
-                </el-input>
-                </el-form-item>
-            </el-col>
-            <el-col :span="12" >
-                <el-form-item  label="供应商等级"  
- prop="supplierLevel" >
-                    <el-select    v-model="dataForm.supplierLevel"
- placeholder="请选择"  clearable  :style='{"width":"100%"}'>
-                            <el-option v-for="(item, index) in supplierLevelOptions" :key="index" :label="item.fullName" :value="item.id" :disabled="item.disabled" ></el-option>
+                            </el-input>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="供应商等级" prop="supplierLevel">
+                            <el-select v-model="dataForm.supplierLevel" placeholder="请选择" clearable
+                                :style='{ "width": "100%" }'>
+                                <el-option v-for="(item, index) in supplierLevelOptions" :key="index" :label="item.fullName"
+                                    :value="item.id" :disabled="item.disabled"></el-option>
 
-                </el-select>
-                </el-form-item>
-            </el-col>
-            <el-col :span="12" >
-                <el-form-item  label="联系电话"  
- prop="contactPhone" >
-                    <el-input    v-model="dataForm.contactPhone"
- placeholder="请输入联系电话"  clearable  :style='{"width":"100%"}'>
+                            </el-select>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="联系电话" prop="contactPhone">
+                            <el-input v-model="dataForm.contactPhone" placeholder="请输入联系电话" clearable
+                                :style='{ "width": "100%" }'>
 
-                </el-input>
-                </el-form-item>
-            </el-col>
-            <el-col :span="12" >
-                <el-form-item  label="供应商性质"  
- prop="enterprise" >
-                    <el-radio-group    v-model="dataForm.enterprise"
- size="small" >
-                            <el-radio v-for="(item, index) in enterpriseOptions" :key="index" :label="item.id" :disabled="item.disabled" >
-                                {{item.fullName}}
-                            </el-radio>
+                            </el-input>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="供应商性质" prop="enterprise">
+                            <el-radio-group v-model="dataForm.enterprise" size="small">
+                                <el-radio v-for="(item, index) in enterpriseOptions" :key="index" :label="item.id"
+                                    :disabled="item.disabled">
+                                    {{ item.fullName }}
+                                </el-radio>
 
-                </el-radio-group>
-                </el-form-item>
-            </el-col>
-            <el-col :span="12" >
-                <el-form-item  label="地址"  
- prop="address" >
-                    <el-input    v-model="dataForm.address"
- placeholder="请输入地址"  clearable  :style='{"width":"100%"}'>
+                            </el-radio-group>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="地址" prop="address">
+                            <el-input v-model="dataForm.address" placeholder="请输入地址" clearable :style='{ "width": "100%" }'>
 
-                </el-input>
-                </el-form-item>
-            </el-col>
-            <el-col :span="12" >
-                <el-form-item  label="供应商类型"  
- prop="classification" >
-                    <el-radio-group    v-model="dataForm.classification"
- size="small" >
-                            <el-radio v-for="(item, index) in classificationOptions" :key="index" :label="item.id" :disabled="item.disabled" >
-                                {{item.fullName}}
-                            </el-radio>
+                            </el-input>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="供应商类型" prop="classification">
+                            <el-radio-group v-model="dataForm.classification" size="small">
+                                <el-radio v-for="(item, index) in classificationOptions" :key="index" :label="item.id"
+                                    :disabled="item.disabled">
+                                    {{ item.fullName }}
+                                </el-radio>
 
-                </el-radio-group>
-                </el-form-item>
-            </el-col>
-            <el-col :span="12" >
-                <el-form-item  label="开户行"  
- prop="bank" >
-                    <el-input    v-model="dataForm.bank"
- placeholder="请输入开户行"  clearable  :style='{"width":"100%"}'>
+                            </el-radio-group>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="开户行" prop="bank">
+                            <el-input v-model="dataForm.bank" placeholder="请输入开户行" clearable :style='{ "width": "100%" }'>
 
-                </el-input>
-                </el-form-item>
-            </el-col>
-            <el-col :span="12" >
-                <el-form-item  label="默认税码"  
- prop="taxCode" >
-                    <el-select    v-model="dataForm.taxCode"
- placeholder="请选择税码"  clearable  :style='{"width":"100%"}'>
-                            <el-option v-for="(item, index) in taxCodeOptions" :key="index" :label="item.fullName" :value="item.id" :disabled="item.disabled" ></el-option>
+                            </el-input>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="默认税码" prop="taxCode">
+                            <el-select v-model="dataForm.taxCode" placeholder="请选择税码" clearable :style='{ "width": "100%" }'>
+                                <el-option v-for="(item, index) in taxCodeOptions" :key="index" :label="item.fullName"
+                                    :value="item.id" :disabled="item.disabled"></el-option>
 
-                </el-select>
-                </el-form-item>
-            </el-col>
-            <el-col :span="12" >
-                <el-form-item  label="纳税编号"  
- prop="vatRegistrationNum" >
-                    <el-input    v-model="dataForm.vatRegistrationNum"
- placeholder="请输入纳税编号"  clearable  :style='{"width":"100%"}'>
+                            </el-select>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="纳税编号" prop="vatRegistrationNum">
+                            <el-input v-model="dataForm.vatRegistrationNum" placeholder="请输入纳税编号" clearable
+                                :style='{ "width": "100%" }'>
 
-                </el-input>
-                </el-form-item>
-            </el-col>
-            <el-col :span="12" >
-                <el-form-item  label="是否采购"  
- prop="isPurchase" >
-                    <el-radio-group    v-model="dataForm.isPurchase"
- size="small" >
-                            <el-radio v-for="(item, index) in isPurchaseOptions" :key="index" :label="item.id" :disabled="item.disabled" >
-                                {{item.fullName}}
-                            </el-radio>
+                            </el-input>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="是否采购" prop="isPurchase">
+                            <el-radio-group v-model="dataForm.isPurchase" size="small">
+                                <el-radio v-for="(item, index) in isPurchaseOptions" :key="index" :label="item.id"
+                                    :disabled="item.disabled">
+                                    {{ item.fullName }}
+                                </el-radio>
 
-                </el-radio-group>
-                </el-form-item>
-            </el-col>
-            <el-col :span="12" >
-                <el-form-item  label="银行账户"  
- prop="bankAccount" >
-                    <el-input    v-model="dataForm.bankAccount"
- placeholder="请输入银行账户"  clearable  :style='{"width":"100%"}'>
+                            </el-radio-group>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="银行账户" prop="bankAccount">
+                            <el-input v-model="dataForm.bankAccount" placeholder="请输入银行账户" clearable
+                                :style='{ "width": "100%" }'>
 
-                </el-input>
-                </el-form-item>
-            </el-col>
-            <el-col :span="12" >
-                <el-form-item  label="是否付款"  
- prop="isPayment" >
-                    <el-radio-group    v-model="dataForm.isPayment"
- size="small" >
-                            <el-radio v-for="(item, index) in isPaymentOptions" :key="index" :label="item.id" :disabled="item.disabled" >
-                                {{item.fullName}}
-                            </el-radio>
+                            </el-input>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="是否付款" prop="isPayment">
+                            <el-radio-group v-model="dataForm.isPayment" size="small">
+                                <el-radio v-for="(item, index) in isPaymentOptions" :key="index" :label="item.id"
+                                    :disabled="item.disabled">
+                                    {{ item.fullName }}
+                                </el-radio>
 
-                </el-radio-group>
-                </el-form-item>
-            </el-col>
-            <el-col :span="12" >
-                <el-form-item  label="应付科目"  
- prop="payable" >
-                    <el-input    v-model="dataForm.payable"
- placeholder="请输入应付科目"  clearable  :style='{"width":"100%"}'>
+                            </el-radio-group>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="应付科目" prop="payable">
+                            <el-input v-model="dataForm.payable" placeholder="请输入应付科目" clearable :style='{ "width": "100%" }'>
 
-                </el-input>
-                </el-form-item>
-            </el-col>
-            <el-col :span="12" >
-                <el-form-item  label="是否启用"  
- prop="status" >
-                    <el-radio-group    v-model="dataForm.status"
- size="small" >
-                            <el-radio v-for="(item, index) in statusOptions" :key="index" :label="item.id" :disabled="item.disabled" >
-                                {{item.fullName}}
-                            </el-radio>
+                            </el-input>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="是否启用" prop="status">
+                            <el-radio-group v-model="dataForm.status" size="small">
+                                <el-radio v-for="(item, index) in statusOptions" :key="index" :label="item.id"
+                                    :disabled="item.disabled">
+                                    {{ item.fullName }}
+                                </el-radio>
 
-                </el-radio-group>
-                </el-form-item>
-            </el-col>
-            <el-col :span="12" >
-                <el-form-item  label="预付科目"  
- prop="prepaid" >
-                    <el-input    v-model="dataForm.prepaid"
- placeholder="请输入预付科目"  clearable  :style='{"width":"100%"}'>
+                            </el-radio-group>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="预付科目" prop="prepaid">
+                            <el-input v-model="dataForm.prepaid" placeholder="请输入预付科目" clearable :style='{ "width": "100%" }'>
 
-                </el-input>
-                </el-form-item>
-            </el-col>
-    </template>
-</el-form>
-    </el-row>
-    <span slot="footer" class="dialog-footer">
-        <el-button @click="visible = false"> 取 消</el-button>
-        <el-button type="primary" @click="dataFormSubmit()" v-if="!isDetail"> 确 定</el-button>
-    </span>
+                            </el-input>
+                        </el-form-item>
+                    </el-col>
+                </template>
+            </el-form>
+        </el-row>
+        <span slot="footer" class="dialog-footer">
+            <el-button @click="visible = false"> 取 消</el-button>
+            <el-button type="primary" @click="dataFormSubmit()" v-if="!isDetail"> 确 定</el-button>
+        </span>
     </el-dialog>
 </template>
 <script>
-    import request from '@/utils/request'
-    import { getDataInterfaceRes } from '@/api/systemData/dataInterface'
-    import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
-    export default {
-        components: {},
-        props: [],
-        data() {
-            return {
-                visible: false,
-                loading: false,
-                isDetail: false,
+import request from '@/utils/request'
+import { getDataInterfaceRes } from '@/api/systemData/dataInterface'
+import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
+export default {
+    components: {},
+    props: [],
+    data() {
+        return {
+            visible: false,
+            loading: false,
+            isDetail: false,
             dataForm: {
-                            supplierCode : '',
-                            companyId : "",
-                            supplierName : '',
-                            country : "CHINA",
-                            supply : '',
-                            province : [],
-                            contactName : '',
-                            supplierLevel : "1",
-                            contactPhone : '',
-                            enterprise : "0",
-                            address : '',
-                            classification : "0",
-                            bank : '',
-                            taxCode : "0",
-                            vatRegistrationNum : '',
-                            isPurchase : "0",
-                            bankAccount : '',
-                            isPayment : "0",
-                            payable : '',
-                            status : "1",
-                            prepaid : '',
-                            supplierSiteCode : '',
-                            creatorTime : "",
-                            lastModifyTime : "",
+                supplierCode: '',
+                companyId: "",
+                supplierName: '',
+                country: "CHINA",
+                supply: '',
+                province: [],
+                contactName: '',
+                supplierLevel: "1",
+                contactPhone: '',
+                enterprise: "0",
+                address: '',
+                classification: "0",
+                bank: '',
+                taxCode: "0",
+                vatRegistrationNum: '',
+                isPurchase: "0",
+                bankAccount: '',
+                isPayment: "0",
+                payable: '',
+                status: "1",
+                prepaid: '',
+                supplierSiteCode: '',
+                creatorTime: "",
+                lastModifyTime: "",
             },
             rules:
             {
-                            supplierCode: [
-                                {
-                                    required: true,
-                                    message: '请输入供应商编码',
-                                    trigger: 'blur'
-                                },
-                        ],
-                            supplierName: [
-                                {
-                                    required: true,
-                                    message: '请输入供应商名称',
-                                    trigger: 'blur'
-                                },
-                        ],
-                            supply: [
-                        ],
-                            contactPhone: [
-                        ],
-                            bankAccount: [
-                        ],
+                supplierCode: [
+                    {
+                        required: true,
+                        message: '请输入供应商编码',
+                        trigger: 'blur'
+                    },
+                ],
+                supplierName: [
+                    {
+                        required: true,
+                        message: '请输入供应商名称',
+                        trigger: 'blur'
+                    },
+                ],
+                supply: [
+                ],
+                contactPhone: [
+                ],
+                bankAccount: [
+                ],
             },
-                    companyIdcolumnOptions:[ {"label":"公司编码","value":"F_EnCode"}, {"label":"公司名称","value":"F_FullName"},],
-                        supplierLevelOptions:[{"fullName":"一级","id":"1"},{"fullName":"二级","id":"2"},{"fullName":"三级","id":"3"},{"fullName":"四级","id":"4"}],
-                        enterpriseOptions:[{"fullName":"民营","id":"0"},{"fullName":"私营","id":"1"}],
-                        classificationOptions:[{"fullName":"国内","id":"0"},{"fullName":"国外","id":"1"}],
-                        taxCodeOptions:[{"fullName":"13个点","id":"0"},{"fullName":"9个点","id":"1"},{"fullName":"6个点","id":"2"},{"fullName":"5个点","id":"3"}],
-                        isPurchaseOptions:[{"fullName":"否","id":"0"},{"fullName":"是","id":"1"}],
-                        isPaymentOptions:[{"fullName":"否","id":"0"},{"fullName":"是","id":"1"}],
-                        statusOptions:[{"fullName":"启用","id":"1"},{"fullName":"停用","id":"2"}],
+            companyIdcolumnOptions: [{ "label": "公司编码", "value": "F_EnCode" }, { "label": "公司名称", "value": "F_FullName" },],
+            supplierLevelOptions: [{ "fullName": "一级", "id": "1" }, { "fullName": "二级", "id": "2" }, { "fullName": "三级", "id": "3" }, { "fullName": "四级", "id": "4" }],
+            enterpriseOptions: [{ 'fullName': '民营', 'id': '0' }, { 'fullName': '国有', 'id': '1' }, { 'fullName': '其它', 'id': '2' }],
+            classificationOptions: [{ "fullName": "国内", "id": "0" }, { "fullName": "国外", "id": "1" }],
+            taxCodeOptions: [{ "fullName": "13", "id": "0" }, { "fullName": "9", "id": "1" }, { "fullName": "6", "id": "2" }, { "fullName": "5", "id": "3" }, { "fullName": "3", "id": "4" }, { "fullName": "0", "id": "5" }],
+            isPurchaseOptions: [{ "fullName": "否", "id": "0" }, { "fullName": "是", "id": "1" }],
+            isPaymentOptions: [{ "fullName": "否", "id": "0" }, { "fullName": "是", "id": "1" }],
+            statusOptions: [{ "fullName": "启用", "id": "1" }, { "fullName": "停用", "id": "2" }],
 
         }
+    },
+    computed: {},
+    watch: {},
+    created() {
+    },
+    mounted() { },
+    methods: {
+        clearData(data) {
+            for (let key in data) {
+                if (data[key] instanceof Array) {
+                    data[key] = [];
+                } else if (data[key] instanceof Object) {
+                    this.clearData(data[key]);
+                } else {
+                    data[key] = "";
+                }
+            }
         },
-        computed: {},
-        watch: {},
-        created() {
+        init(id, isDetail) {
+            this.dataForm.id = id || 0;
+            this.visible = true;
+            this.isDetail = isDetail || false;
+            this.$nextTick(() => {
+                this.$refs['elForm'].resetFields();
+                if (this.dataForm.id) {
+                    this.loading = true
+                    request({
+                        url: '/api/example/Supplier/' + this.dataForm.id,
+                        method: 'get'
+                    }).then(res => {
+                        this.dataInfo(res.data)
+                        this.loading = false
+                    });
+                } else {
+                    this.clearData(this.dataForm)
+                }
+            });
+            this.$store.commit('generator/UPDATE_RELATION_DATA', {})
         },
-        mounted() {},
-        methods: {
-            clearData(data){
-                for (let key in data) {
-                    if (data[key] instanceof Array) {
-                        data[key] = [];
-                    } else if (data[key] instanceof Object) {
-                        this.clearData(data[key]);
-                    } else {
-                        data[key] = "";
-                    }
+        // 表单提交
+        dataFormSubmit() {
+            this.$refs['elForm'].validate((valid) => {
+                if (valid) {
+                    this.request()
                 }
-            },
-            init(id, isDetail) {
-                this.dataForm.id = id || 0;
-                this.visible = true;
-                this.isDetail = isDetail || false;
-                this.$nextTick(() => {
-                    this.$refs['elForm'].resetFields();
-                    if(this.dataForm.id){
-                        this.loading = true
-                        request({
-                            url: '/api/example/Supplier/'+this.dataForm.id,
-                            method: 'get'
-                        }).then(res => {
-                            this.dataInfo(res.data)
-                            this.loading = false
-                        });
-                    }else{
-                       this.clearData(this.dataForm)
-                    }
-                });
-                this.$store.commit('generator/UPDATE_RELATION_DATA', {})
-            },
-            // 表单提交
-            dataFormSubmit() {
-                this.$refs['elForm'].validate((valid) => {
-                    if (valid) {
-                            this.request()
-                    }
-                })
-            },
-            request() {
-                var _data =this.dataList()
-                if (!this.dataForm.id) {
-                    request({
-                        url: '/api/example/Supplier',
-                        method: 'post',
-                        data: _data
-                    }).then((res) => {
-                        this.$message({
-                            message: res.msg,
-                            type: 'success',
-                            duration: 1000,
-                            onClose: () => {
-                                this.visible = false
-                                this.$emit('refresh', true)
-                            }
-                        })
+            })
+        },
+        request() {
+            var _data = this.dataList()
+            if (!this.dataForm.id) {
+                request({
+                    url: '/api/example/Supplier',
+                    method: 'post',
+                    data: _data
+                }).then((res) => {
+                    this.$message({
+                        message: res.msg,
+                        type: 'success',
+                        duration: 1000,
+                        onClose: () => {
+                            this.visible = false
+                            this.$emit('refresh', true)
+                        }
                     })
-                }else{
-                    request({
-                        url: '/api/example/Supplier/'+this.dataForm.id,
-                        method: 'PUT',
-                        data: _data
-                    }).then((res) => {
-                        this.$message({
-                            message: res.msg,
-                            type: 'success',
-                            duration: 1000,
-                            onClose: () => {
-                                this.visible = false
-                                this.$emit('refresh', true)
-                            }
-                        })
+                })
+            } else {
+                request({
+                    url: '/api/example/Supplier/' + this.dataForm.id,
+                    method: 'PUT',
+                    data: _data
+                }).then((res) => {
+                    this.$message({
+                        message: res.msg,
+                        type: 'success',
+                        duration: 1000,
+                        onClose: () => {
+                            this.visible = false
+                            this.$emit('refresh', true)
+                        }
                     })
-                }
-            },
-            dataList(){
-                var _data = JSON.parse(JSON.stringify(this.dataForm));
-                        _data.province = JSON.stringify(_data.province)
-                return _data;
-            },
-            dataInfo(dataAll){
-                let _dataAll =dataAll
-                        _dataAll.province = JSON.parse( _dataAll.province)
-                this.dataForm = _dataAll
-            },
+                })
+            }
+        },
+        dataList() {
+            var _data = JSON.parse(JSON.stringify(this.dataForm));
+            _data.province = JSON.stringify(_data.province)
+            return _data;
+        },
+        dataInfo(dataAll) {
+            let _dataAll = dataAll
+            _dataAll.province = JSON.parse(_dataAll.province)
+            this.dataForm = _dataAll
         },
-    }
+    },
+}
 
 </script>
diff --git a/SC-web/src/views/scm/basicInformation/supplier/index.vue b/SC-web/src/views/scm/basicInformation/supplier/index.vue
index 7049a125..da1669b7 100644
--- a/SC-web/src/views/scm/basicInformation/supplier/index.vue
+++ b/SC-web/src/views/scm/basicInformation/supplier/index.vue
@@ -35,10 +35,10 @@
             <el-form-item>
               <el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>
               <el-button icon="el-icon-refresh-right" @click="reset()">重置</el-button>
-              <el-button type="text" icon="el-icon-arrow-down" @click="showAll=true" v-if="!showAll">
+              <el-button type="text" icon="el-icon-arrow-down" @click="showAll = true" v-if="!showAll">
                 展开
               </el-button>
-              <el-button type="text" icon="el-icon-arrow-up" @click="showAll=false" v-else>
+              <el-button type="text" icon="el-icon-arrow-up" @click="showAll = false" v-else>
                 收起
               </el-button>
             </el-form-item>
@@ -48,40 +48,34 @@
       <div class="JNPF-common-layout-main JNPF-flex-main">
         <div class="JNPF-common-head">
           <div>
-<!--            <el-button type="primary" v-has="'btn_add'" icon="el-icon-plus" @click="addOrUpdateHandle()">新增-->
-<!--            </el-button>-->
+            <!--            <el-button type="primary" v-has="'btn_add'" icon="el-icon-plus" @click="addOrUpdateHandle()">新增-->
+            <!--            </el-button>-->
             <el-button type="text" v-has="'btn_download'" icon="el-icon-download" @click="exportData()">导出
             </el-button>
-<!--            <el-button type="text" v-has="'btn_upload'" icon="el-icon-download" @click="">导入-->
-<!--            </el-button>-->
-<!--            <el-button type="text" v-has="'btn_batchRemove'" icon="el-icon-delete" @click="handleBatchRemoveDel()">批量删除-->
-<!--            </el-button>-->
+            <!--            <el-button type="text" v-has="'btn_upload'" icon="el-icon-download" @click="">导入-->
+            <!--            </el-button>-->
+            <!--            <el-button type="text" v-has="'btn_batchRemove'" icon="el-icon-delete" @click="handleBatchRemoveDel()">批量删除-->
+            <!--            </el-button>-->
           </div>
           <div class="JNPF-common-head-right">
             <el-tooltip effect="dark" content="刷新" placement="top">
-              <el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false"
-                       @click="reset()"/>
+              <el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false" @click="reset()" />
             </el-tooltip>
-            <screenfull isContainer/>
+            <screenfull isContainer />
           </div>
         </div>
         <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c :hasNO="false"
-                    @selection-change="handleSelectionChange" border>
+          @selection-change="handleSelectionChange" border>
           <el-table-column type="index" width="50" label="序号" fixed="left" align="center" />
-          <el-table-column prop="supplierCode" label="供应商编码" width="200" align="center"  fixed="left" sortable
-                           sortable="custom"/>
-          <el-table-column prop="companyId" label="所属公司" width="200" align="center"  fixed="left" sortable
-                           sortable="custom"/>
-          <el-table-column prop="supplierName" label="供应商名称" width="200" align="center" sortable
-                           sortable="custom"/>
-          <el-table-column prop="country" label="国家" width="120" align="center" sortable
-          />
-          <el-table-column prop="supply" label="供货指标" width="120" align="center" sortable
-          />
-          <el-table-column prop="province" label="省" width="120" align="center" sortable
-          />
-          <el-table-column prop="contactName" label="联系人" width="120" align="center" sortable
-                           sortable="custom"/>
+          <el-table-column prop="supplierCode" label="供应商编码" width="200" align="center" fixed="left" sortable
+            sortable="custom" />
+          <el-table-column prop="companyId" label="所属公司" width="200" align="center" fixed="left" sortable
+            sortable="custom" />
+          <el-table-column prop="supplierName" label="供应商名称" width="200" align="center" sortable sortable="custom" />
+          <el-table-column prop="country" label="国家" width="120" align="center" sortable />
+          <el-table-column prop="supply" label="供货指标" width="120" align="center" sortable />
+          <el-table-column prop="province" label="省" width="120" align="center" sortable />
+          <el-table-column prop="contactName" label="联系人" width="120" align="center" sortable sortable="custom" />
 
           <el-table-column label="供应商等级" width="120" sortable prop="supplierLevel" align="center">
             <template slot-scope="scope">
@@ -89,8 +83,7 @@
             </template>
           </el-table-column>
 
-          <el-table-column prop="contactPhone" label="联系电话" width="200" align="center" sortable
-                           sortable="custom"/>
+          <el-table-column prop="contactPhone" label="联系电话" width="200" align="center" sortable sortable="custom" />
 
 
           <el-table-column label="供应商性质" width="120" sortable prop="enterprise" align="center">
@@ -100,8 +93,7 @@
           </el-table-column>
 
 
-          <el-table-column prop="address" label="地址" width="200" align="center" sortable
-                           sortable="custom"/>
+          <el-table-column prop="address" label="地址" width="200" align="center" sortable sortable="custom" />
 
 
           <el-table-column label="供应商类型" width="120" sortable prop="classification" align="center">
@@ -110,12 +102,9 @@
             </template>
           </el-table-column>
 
-          <el-table-column prop="bank" label="开户行" width="200" align="center" sortable
-          />
-          <el-table-column prop="vatRegistrationNum" label="纳税编号" width="200" align="center" sortable
-          />
-          <el-table-column prop="bankAccount" label="银行账户" width="200" align="center" sortable
-          />
+          <el-table-column prop="bank" label="开户行" width="200" align="center" sortable />
+          <el-table-column prop="vatRegistrationNum" label="纳税编号" width="200" align="center" sortable />
+          <el-table-column prop="bankAccount" label="银行账户" width="200" align="center" sortable />
 
           <el-table-column label="默认税码" width="120" sortable prop="taxCode" align="center">
             <template slot-scope="scope">
@@ -123,8 +112,7 @@
             </template>
           </el-table-column>
 
-          <el-table-column prop="payable" label="应付科目" width="120" align="center" sortable
-          />
+          <el-table-column prop="payable" label="应付科目" width="120" align="center" sortable />
 
           <el-table-column label="是否采购" width="120" sortable prop="isPurchase" align="center">
             <template slot-scope="scope">
@@ -132,8 +120,7 @@
             </template>
           </el-table-column>
 
-          <el-table-column prop="prepaid" label="预付科目" width="120" align="center" sortable
-          />
+          <el-table-column prop="prepaid" label="预付科目" width="120" align="center" sortable />
 
 
           <el-table-column label="是否付款" width="120" sortable prop="isPayment" align="center">
@@ -148,254 +135,248 @@
             </template>
           </el-table-column>
 
-          <el-table-column prop="supplierSiteCode" label="供应商地点" width="120" align="center" sortable
-                           sortable="custom"/>
-          <el-table-column label="操作" fixed="right"
-                           width="80">
+          <el-table-column prop="supplierSiteCode" label="供应商地点" width="120" align="center" sortable sortable="custom" />
+          <el-table-column label="操作" fixed="right" width="80">
             <template slot-scope="scope">
-<!--              <el-button type="text" v-has="'btn_edit'"-->
-<!--                         @click="addOrUpdateHandle(scope.row.id)">编辑-->
-<!--              </el-button>-->
-<!--              <el-button type="text" v-has="'btn_remove'" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">删除-->
-<!--              </el-button>-->
+              <!--              <el-button type="text" v-has="'btn_edit'"-->
+              <!--                         @click="addOrUpdateHandle(scope.row.id)">编辑-->
+              <!--              </el-button>-->
+              <!--              <el-button type="text" v-has="'btn_remove'" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">删除-->
+              <!--              </el-button>-->
 
-              <el-button type="text"
-                         @click="goDetail(scope.row.id)">详情
+              <el-button type="text" @click="goDetail(scope.row.id)">详情
               </el-button>
             </template>
           </el-table-column>
         </JNPF-table>
         <pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize"
-                    @pagination="initData"/>
+          @pagination="initData" />
       </div>
     </div>
-    <JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh"/>
-    <ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download"/>
-    <Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible=false"/>
+    <JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh" />
+    <ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download" />
+    <Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible = false" />
   </div>
 </template>
 
 <script>
-  import request from '@/utils/request'
-  import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
-  import JNPFForm from './Form'
-  import ExportBox from './ExportBox'
-  import { getDataInterfaceRes } from '@/api/systemData/dataInterface'
-  import Detail from './Detail'
+import request from '@/utils/request'
+import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
+import JNPFForm from './Form'
+import ExportBox from './ExportBox'
+import { getDataInterfaceRes } from '@/api/systemData/dataInterface'
+import Detail from './Detail'
 
-  export default {
-    components: { JNPFForm, ExportBox, Detail },
-    data() {
-      return {
-        showAll: false,
-        detailVisible: false,
-        query: {
-          supplierCode: undefined,
-          supplierName: undefined,
-          contactName: undefined,
-          contactPhone: undefined,
-          supplierSiteCode: undefined
-        },
-        treeProps: {
-          children: 'children',
-          label: 'fullName',
-          value: 'id'
-        },
-        list: [],
-        listLoading: true,
-        multipleSelection: [], total: 0,
-        listQuery: {
-          currentPage: 1,
-          pageSize: 20,
-          sort: 'desc',
-          sidx: 'creatorTime'
-        },
-        formVisible: false,
-        exportBoxVisible: false,
-        columnList: [
-          { prop: 'supplierCode', label: '供应商编码' },
-          { prop: 'companyId', label: '所属公司' },
-          { prop: 'supplierName', label: '供应商名称' },
-          { prop: 'country', label: '国家' },
-          { prop: 'supply', label: '供货指标' },
-          { prop: 'province', label: '省' },
-          { prop: 'contactName', label: '联系人' },
-          { prop: 'supplierLevel', label: '供应商等级' },
-          { prop: 'contactPhone', label: '联系电话' },
-          { prop: 'enterprise', label: '供应商性质' },
-          { prop: 'address', label: '地址' },
-          { prop: 'classification', label: '供应商类型' },
-          { prop: 'bank', label: '开户行' },
-          { prop: 'vatRegistrationNum', label: '纳税编号' },
-          { prop: 'bankAccount', label: '银行账户' },
-          { prop: 'taxCode', label: '默认税码' },
-          { prop: 'payable', label: '应付科目' },
-          { prop: 'isPurchase', label: '是否采购' },
-          { prop: 'prepaid', label: '预付科目' },
-          { prop: 'isPayment', label: '是否付款' },
-          { prop: 'status', label: '是否启用' },
-          { prop: 'supplierSiteCode', label: '供应商地点' }
-        ],
-        supplierLevelOptions: [{ 'fullName': '一级', 'id': '1' }, { 'fullName': '二级', 'id': '2' }, {
-          'fullName': '三级',
-          'id': '3'
-        }, { 'fullName': '四级', 'id': '4' }],
-        supplierLevelProps: { 'label': 'fullName', 'value': 'id' },
-        enterpriseOptions: [{ 'fullName': '民营', 'id': '0' }, { 'fullName': '私营', 'id': '1' }],
-        enterpriseProps: { 'label': 'fullName', 'value': 'id' },
-        classificationOptions: [{ 'fullName': '国内', 'id': '0' }, { 'fullName': '国外', 'id': '1' }],
-        classificationProps: { 'label': 'fullName', 'value': 'id' },
-        taxCodeOptions: [{ 'fullName': '13个点', 'id': '0' }, { 'fullName': '9个点', 'id': '1' }, {
-          'fullName': '6个点',
-          'id': '2'
-        }, { 'fullName': '5个点', 'id': '3' }],
-        taxCodeProps: { 'label': 'fullName', 'value': 'id' },
-        isPurchaseOptions: [{ 'fullName': '否', 'id': '0' }, { 'fullName': '是', 'id': '1' }],
-        isPurchaseProps: { 'label': 'fullName', 'value': 'id' },
-        isPaymentOptions: [{ 'fullName': '否', 'id': '0' }, { 'fullName': '是', 'id': '1' }],
-        isPaymentProps: { 'label': 'fullName', 'value': 'id' },
-        statusOptions: [{ 'fullName': '启用', 'id': '1' }, { 'fullName': '停用', 'id': '2' }],
-        statusProps: { 'label': 'fullName', 'value': 'id' }
-      }
-    },
-    computed: {
-      menuId() {
-        return this.$route.meta.modelId || ''
-      }
+export default {
+  components: { JNPFForm, ExportBox, Detail },
+  data() {
+    return {
+      showAll: false,
+      detailVisible: false,
+      query: {
+        supplierCode: undefined,
+        supplierName: undefined,
+        contactName: undefined,
+        contactPhone: undefined,
+        supplierSiteCode: undefined
+      },
+      treeProps: {
+        children: 'children',
+        label: 'fullName',
+        value: 'id'
+      },
+      list: [],
+      listLoading: true,
+      multipleSelection: [], total: 0,
+      listQuery: {
+        currentPage: 1,
+        pageSize: 20,
+        sort: 'desc',
+        sidx: 'creatorTime'
+      },
+      formVisible: false,
+      exportBoxVisible: false,
+      columnList: [
+        { prop: 'supplierCode', label: '供应商编码' },
+        { prop: 'companyId', label: '所属公司' },
+        { prop: 'supplierName', label: '供应商名称' },
+        { prop: 'country', label: '国家' },
+        { prop: 'supply', label: '供货指标' },
+        { prop: 'province', label: '省' },
+        { prop: 'contactName', label: '联系人' },
+        { prop: 'supplierLevel', label: '供应商等级' },
+        { prop: 'contactPhone', label: '联系电话' },
+        { prop: 'enterprise', label: '供应商性质' },
+        { prop: 'address', label: '地址' },
+        { prop: 'classification', label: '供应商类型' },
+        { prop: 'bank', label: '开户行' },
+        { prop: 'vatRegistrationNum', label: '纳税编号' },
+        { prop: 'bankAccount', label: '银行账户' },
+        { prop: 'taxCode', label: '默认税码' },
+        { prop: 'payable', label: '应付科目' },
+        { prop: 'isPurchase', label: '是否采购' },
+        { prop: 'prepaid', label: '预付科目' },
+        { prop: 'isPayment', label: '是否付款' },
+        { prop: 'status', label: '是否启用' },
+        { prop: 'supplierSiteCode', label: '供应商地点' }
+      ],
+      supplierLevelOptions: [{ 'fullName': '一级', 'id': '1' }, { 'fullName': '二级', 'id': '2' }, {
+        'fullName': '三级',
+        'id': '3'
+      }, { 'fullName': '四级', 'id': '4' }],
+      supplierLevelProps: { 'label': 'fullName', 'value': 'id' },
+      enterpriseOptions: [{ 'fullName': '民营', 'id': '0' }, { 'fullName': '国有', 'id': '1' }, { 'fullName': '其它', 'id': '2' }],
+      enterpriseProps: { 'label': 'fullName', 'value': 'id' },
+      classificationOptions: [{ 'fullName': '国内', 'id': '0' }, { 'fullName': '国外', 'id': '1' }],
+      classificationProps: { 'label': 'fullName', 'value': 'id' },
+      taxCodeOptions: [{ "fullName": "13", "id": "0" }, { "fullName": "9", "id": "1" }, { "fullName": "6", "id": "2" }, { "fullName": "5", "id": "3" }, { "fullName": "3", "id": "4" }, { "fullName": "0", "id": "5" }],
+      taxCodeProps: { 'label': 'fullName', 'value': 'id' },
+      isPurchaseOptions: [{ 'fullName': '否', 'id': '0' }, { 'fullName': '是', 'id': '1' }],
+      isPurchaseProps: { 'label': 'fullName', 'value': 'id' },
+      isPaymentOptions: [{ 'fullName': '否', 'id': '0' }, { 'fullName': '是', 'id': '1' }],
+      isPaymentProps: { 'label': 'fullName', 'value': 'id' },
+      statusOptions: [{ 'fullName': '启用', 'id': '1' }, { 'fullName': '停用', 'id': '2' }],
+      statusProps: { 'label': 'fullName', 'value': 'id' }
+    }
+  },
+  computed: {
+    menuId() {
+      return this.$route.meta.modelId || ''
+    }
+  },
+  created() {
+    this.initData()
+  },
+  methods: {
+    goDetail(id) {
+      this.detailVisible = true
+      this.$nextTick(() => {
+        this.$refs.Detail.init(id)
+      })
     },
-    created() {
+    sortChange({ column, prop, order }) {
+      this.listQuery.sort = order == 'ascending' ? 'asc' : 'desc'
+      this.listQuery.sidx = !order ? '' : prop
       this.initData()
     },
-    methods: {
-      goDetail(id) {
-        this.detailVisible = true
-        this.$nextTick(() => {
-          this.$refs.Detail.init(id)
-        })
-      },
-      sortChange({ column, prop, order }) {
-        this.listQuery.sort = order == 'ascending' ? 'asc' : 'desc'
-        this.listQuery.sidx = !order ? '' : prop
-        this.initData()
-      },
-      initData() {
-        this.listLoading = true
-        let _query = {
-          ...this.listQuery,
-          ...this.query,
-          menuId: this.menuId
+    initData() {
+      this.listLoading = true
+      let _query = {
+        ...this.listQuery,
+        ...this.query,
+        menuId: this.menuId
+      }
+      request({
+        url: `/api/example/Supplier/getList`,
+        method: 'post',
+        data: _query
+      }).then(res => {
+        var _list = []
+        for (let i = 0; i < res.data.list.length; i++) {
+          let _data = res.data.list[i]
+          _list.push(_data)
         }
+        this.list = _list
+        this.total = res.data.pagination.total
+
+        this.listLoading = false
+      })
+    },
+    handleDel(id) {
+      this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
+        type: 'warning'
+      }).then(() => {
         request({
-          url: `/api/example/Supplier/getList`,
-          method: 'post',
-          data: _query
+          url: `/api/example/Supplier/${id}`,
+          method: 'DELETE'
         }).then(res => {
-          var _list = []
-          for (let i = 0; i < res.data.list.length; i++) {
-            let _data = res.data.list[i]
-            _list.push(_data)
-          }
-          this.list = _list
-          this.total = res.data.pagination.total
-
-          this.listLoading = false
-        })
-      },
-      handleDel(id) {
-        this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
-          type: 'warning'
-        }).then(() => {
-          request({
-            url: `/api/example/Supplier/${id}`,
-            method: 'DELETE'
-          }).then(res => {
-            this.$message({
-              type: 'success',
-              message: res.msg,
-              onClose: () => {
-                this.initData()
-              }
-            })
-          })
-        }).catch(() => {
-        })
-      },
-      handleSelectionChange(val) {
-        const res = val.map(item => item.id)
-        this.multipleSelection = res
-      },
-      handleBatchRemoveDel() {
-        if (!this.multipleSelection.length) {
           this.$message({
-            type: 'error',
-            message: '请选择一条数据',
-            duration: 1500
-          })
-          return
-        }
-        const ids = this.multipleSelection.join()
-        this.$confirm('您确定要删除这些数据吗, 是否继续？', '提示', {
-          type: 'warning'
-        }).then(() => {
-          request({
-            url: `/api/example/Supplier/batchRemove/${ids}`,
-            method: 'DELETE'
-          }).then(res => {
-            this.$message({
-              type: 'success',
-              message: res.msg,
-              onClose: () => {
-                this.initData()
-              }
-            })
+            type: 'success',
+            message: res.msg,
+            onClose: () => {
+              this.initData()
+            }
           })
-        }).catch(() => {
         })
-      },
-      addOrUpdateHandle(id, isDetail) {
-        this.formVisible = true
-        this.$nextTick(() => {
-          this.$refs.JNPFForm.init(id, isDetail)
-        })
-      },
-      exportData() {
-        this.exportBoxVisible = true
-        this.$nextTick(() => {
-          this.$refs.ExportBox.init(this.columnList)
+      }).catch(() => {
+      })
+    },
+    handleSelectionChange(val) {
+      const res = val.map(item => item.id)
+      this.multipleSelection = res
+    },
+    handleBatchRemoveDel() {
+      if (!this.multipleSelection.length) {
+        this.$message({
+          type: 'error',
+          message: '请选择一条数据',
+          duration: 1500
         })
-      },
-      download(data) {
-        let query = { ...data, ...this.listQuery, ...this.query, menuId: this.menuId }
+        return
+      }
+      const ids = this.multipleSelection.join()
+      this.$confirm('您确定要删除这些数据吗, 是否继续？', '提示', {
+        type: 'warning'
+      }).then(() => {
         request({
-          url: `/api/example/Supplier/Actions/Export`,
-          method: 'GET',
-          data: query
+          url: `/api/example/Supplier/batchRemove/${ids}`,
+          method: 'DELETE'
         }).then(res => {
-          if (!res.data.url) return
-          this.jnpf.downloadFile(res.data.url)
-          this.$refs.ExportBox.visible = false
-          this.exportBoxVisible = false
+          this.$message({
+            type: 'success',
+            message: res.msg,
+            onClose: () => {
+              this.initData()
+            }
+          })
         })
-      },
-      search() {
-        this.listQuery = {
-          currentPage: 1,
-          pageSize: 20,
-          sort: 'desc',
-          sidx: 'creatorTime'
-        }
-        this.initData()
-      },
-      refresh(isrRefresh) {
-        this.formVisible = false
-        if (isrRefresh) this.reset()
-      },
-      reset() {
-        for (let key in this.query) {
-          this.query[key] = undefined
-        }
-        this.search()
+      }).catch(() => {
+      })
+    },
+    addOrUpdateHandle(id, isDetail) {
+      this.formVisible = true
+      this.$nextTick(() => {
+        this.$refs.JNPFForm.init(id, isDetail)
+      })
+    },
+    exportData() {
+      this.exportBoxVisible = true
+      this.$nextTick(() => {
+        this.$refs.ExportBox.init(this.columnList)
+      })
+    },
+    download(data) {
+      let query = { ...data, ...this.listQuery, ...this.query, menuId: this.menuId }
+      request({
+        url: `/api/example/Supplier/Actions/Export`,
+        method: 'GET',
+        data: query
+      }).then(res => {
+        if (!res.data.url) return
+        this.jnpf.downloadFile(res.data.url)
+        this.$refs.ExportBox.visible = false
+        this.exportBoxVisible = false
+      })
+    },
+    search() {
+      this.listQuery = {
+        currentPage: 1,
+        pageSize: 20,
+        sort: 'desc',
+        sidx: 'creatorTime'
+      }
+      this.initData()
+    },
+    refresh(isrRefresh) {
+      this.formVisible = false
+      if (isrRefresh) this.reset()
+    },
+    reset() {
+      for (let key in this.query) {
+        this.query[key] = undefined
       }
+      this.search()
     }
   }
+}
 </script>