暂存

src/views/modules/srmSupplier/supplierList.vue

@@ -46,7 +46,13 @@
         :min-width="item.columnWidth"
         :label="item.columnLabel">
         <template slot-scope="scope">
-          <span v-if="!item.columnHidden"> {{scope.row[item.columnProp]}}</span>
+          <span v-if="!item.columnHidden">{{
+            item.columnProp === 'paymentTermDesc'
+              ? (scope.row.paymentTermDesc || scope.row.paymentTerm)
+              : item.columnProp === 'deliveryTermDesc'
+                ? (scope.row.deliveryTermDesc || scope.row.deliveryTerm)
+                : scope.row[item.columnProp]
+          }}</span>
           <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]"
                                              style="width: 100px; height: 100px"/></span>
         </template>
@@ -144,9 +150,14 @@
                   <el-input v-model="currentSupplier.supplierNo" :disabled="!isAdd"></el-input>
                 </el-form-item>
               </el-col>
-              <el-col :span="12">
-                <el-form-item label="供应商名称" prop="supplierName">
-                  <el-input v-model="currentSupplier.supplierName"></el-input>
+              <el-col :span="6">
+                <el-form-item label="ShortOffice" >
+                  <el-input v-model="currentSupplier.cShortOffice"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="ShortNpc" >
+                  <el-input v-model="currentSupplier.cShortNpc" ></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="6">
@@ -159,16 +170,17 @@
               </el-col>
             </el-row>
             <el-row :gutter="24">
-              <el-col :span="6">
-                <el-form-item >
-                  <span style="cursor: pointer" slot="label" @click="getBaseList(521)"><a href="#">供应商分组1</a></span>
-                  <el-input v-model="currentSupplier.supplierGroup1" style="width: 130px"></el-input>
+              <el-col :span="24">
+                <el-form-item label="供应商名称" prop="supplierName">
+                  <el-input v-model="currentSupplier.supplierName"></el-input>
                 </el-form-item>
               </el-col>
+            </el-row>
+            <el-row :gutter="24">
               <el-col :span="6">
                 <el-form-item >
-                  <span style="cursor: pointer" slot="label" @click="getBaseList(525)"><a href="#">供应商分组2</a></span>
-                  <el-input v-model="currentSupplier.supplierGroup2" style="width: 130px"></el-input>
+                  <span style="cursor: pointer" slot="label" @click="getBaseList(521)"><a href="#">供应商分类</a></span>
+                  <el-input v-model="currentSupplier.supplierGroup" style="width: 130px"></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="6">
@@ -181,16 +193,16 @@
                   <el-input v-model="currentSupplier.buyer"></el-input>
                 </el-form-item>
               </el-col>
+              <el-col :span="6">
+                <el-form-item label="Sourcing专员">
+                  <el-input v-model="currentSupplier.sourcingStaff"></el-input>
+                </el-form-item>
+              </el-col>
             </el-row>
           </div>
 
           <div class="form-section">
             <el-row :gutter="24">
-              <el-col :span="6">
-                <el-form-item label="采购专员">
-                  <el-input v-model="currentSupplier.sourcingstaff"></el-input>
-                </el-form-item>
-              </el-col>
               <el-col :span="6">
                 <el-form-item>
                   <span style="cursor: pointer" slot="label" @click="getBaseList(522)"><a href="#">税率编号</a></span>
@@ -416,7 +428,43 @@ export default {
           columnProp: 'groupDesc',
           headerAlign: 'center',
           align: 'center',
-          columnLabel: '供应商分类1',
+          columnLabel: '供应商分类',
+          columnWidth: '100',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: false
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: this.functionId,
+          serialNumber: '811001Table1SupplierGroup',
+          tableId: '811001Table1',
+          tableName: '供应商信息',
+          columnProp: 'cShortOffice',
+          headerAlign: 'center',
+          align: 'center',
+          columnLabel: 'ShortOffice',
+          columnWidth: '100',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: false
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: this.functionId,
+          serialNumber: '811001Table1SupplierGroup',
+          tableId: '811001Table1',
+          tableName: '供应商信息',
+          columnProp: 'cShortNpc',
+          headerAlign: 'center',
+          align: 'center',
+          columnLabel: 'ShortNpc',
           columnWidth: '100',
           columnHidden: false,
           columnImage: false,
@@ -434,7 +482,7 @@ export default {
           columnProp: 'supplierDocType',
           headerAlign: 'center',
           align: 'center',
-          columnLabel: '供应商分类2',
+          columnLabel: '供应商文档类型',
           columnWidth: '150',
           columnHidden: false,
           columnImage: false,
@@ -485,7 +533,7 @@ export default {
           serialNumber: '811001Table1SourcingStaff',
           tableId: '811001Table1',
           tableName: '供应商信息',
-          columnProp: 'Sourcing Staff',
+          columnProp: 'sourcingStaff',
           headerAlign: 'center',
           align: 'left',
           columnLabel: 'Sourcing 专员',
@@ -515,13 +563,46 @@ export default {
           status: true,
           fixed: false
         },
+        {
+          userId: this.$store.state.user.name,
+          functionId: this.functionId,
+          serialNumber: '811001Table1TaxDesc',
+          tableId: '811001Table1',
+          tableName: '供应商信息',
+          columnProp: 'taxDesc',
+          headerAlign: 'center',
+          align: 'left',
+          columnLabel: '税率说明',
+          columnWidth: '120',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: false
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: this.functionId,
+          serialNumber: '811001Table1SupplierTaxRate',
+          headerAlign: 'center',
+          align: 'center',
+          columnLabel: '税率文本',
+          columnWidth: '100',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: false
+        },
         {
           userId: this.$store.state.user.name,
           functionId: this.functionId,
           serialNumber: '811001Table1PaymentTerm',
           tableId: '811001Table1',
           tableName: '供应商信息',
-          columnProp: 'paymentTerm',
+          columnProp: 'paymentTermDesc',
           headerAlign: 'center',
           align: 'center',
           columnLabel: '付款条款',
@@ -539,7 +620,7 @@ export default {
           serialNumber: '811001Table1DeliveryTerm',
           tableId: '811001Table1',
           tableName: '供应商信息',
-          columnProp: 'deliveryTerm',
+          columnProp: 'deliveryTermDesc',
           headerAlign: 'center',
           align: 'center',
           columnLabel: '交货条款',
@@ -611,7 +692,7 @@ export default {
           serialNumber: '811001Table1PhoneNo2',
           tableId: '811001Table1',
           tableName: '供应商信息',
-          columnProp: 'Phone No2',
+          columnProp: 'phoneNo2',
           headerAlign: 'center',
           align: 'left',
           columnLabel: '联系人电话2',
@@ -629,7 +710,7 @@ export default {
           serialNumber: '811001Table1PhoneNo3',
           tableId: '811001Table1',
           tableName: '供应商信息',
-          columnProp: 'Phone No3',
+          columnProp: 'phoneNo3',
           headerAlign: 'center',
           align: 'left',
           columnLabel: '联系人电话3',
@@ -803,6 +884,24 @@ export default {
           status: true,
           fixed: false
         },
+        {
+          userId: this.$store.state.user.name,
+          functionId: this.functionId,
+          serialNumber: '811001Table1TaxNo',
+          tableId: '811001Table1',
+          tableName: '供应商信息',
+          columnProp: 'taxNo',
+          headerAlign: 'center',
+          align: 'left',
+          columnLabel: '纳税人识别号',
+          columnWidth: '140',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: false
+        },
         {
           userId: this.$store.state.user.name,
           functionId: this.functionId,
@@ -1045,14 +1144,15 @@ export default {
       supplierDialogVisible: false,
       isAdd: true,
       currentSupplier: {
+        cShortOffice: '',
+        cShortNpc: '',
         supplierNo: '',
         supplierName: '',
         supplierDocType: '',
         active: '',
-        supplierGroup1:'',
-        supplierGroup2:'',
+        supplierGroup:'',
         abc: '',
-        sourcingstaff: '',
+        sourcingStaff: '',
         currency:'',
         taxCode:'',
         paymentTerm:'',
@@ -1340,7 +1440,7 @@ export default {
         supplierGroup2: '',
         abc: '',
         buyer: '',
-        sourcingstaff: '',
+        sourcingStaff: '',
         currency:'',
         taxCode:'',
         paymentTerm:'',