Merge branch 'dev1.0' of http://192.168.0.200:3000/zhangxj/trade-platform-c-front-end into dev1.0

src/views/myTrade/purchaseAndSaleContract/salesContract/components/GoodsInfo.vue

@@ -32,11 +32,11 @@
 import { mapState } from 'vuex'
 import { downloadGoodsTemplate, getGoodsNameList, getCommoditySpid, getSupplierList } from '@/api/myTrade/salesContract'
 import { exportFile } from '@/utils'
-// import CustomerSelect from '@/components/CustomSelect'
+import CustomerSelect from '@/components/CustomSelect'
 
 export default {
   components: {
-    // CustomerSelect
+    CustomerSelect
   },
   props: {
     disabled: {

src/views/myTrade/purchaseAndSaleContract/salesContract/index.vue

@@ -116,19 +116,19 @@ export default {
         {
           label: '销售合同编号',
           prop: 'contractNo',
-          width: 120,
+          // width: 120,
           showTooltip: true
         },
         {
           label: '销售合同名称',
           showTooltip: true,
-          prop: 'contractName',
-          width: 120
+          prop: 'contractName'
+          // width: 120
         },
         {
           label: '进口商名称',
           showTooltip: true,
-          width: 120,
+          // width: 120,
           prop: 'importerEnterpriseName'
         },
         {
@@ -157,7 +157,7 @@ export default {
         },
         {
           label: '结算账期（天）',
-          width: 120,
+          // width: 120,
           showTooltip: true,
           render: (h, row) => {
             return <div>{ row.settlementCycle }</div>
@@ -172,7 +172,7 @@ export default {
           label: '是否使用标准合同模板',
           prop: 'templateType',
           showTooltip: true,
-          width: 160,
+          // width: 160,
           render: (h, row) => {
             return row.templateType === true ? '是' : '否'
           }
@@ -191,7 +191,7 @@ export default {
         },
         {
           label: '操作',
-          width: 200,
+          width: 160,
           render: (h, row) => {
             const btnList = [
               {

src/views/myTrade/salesBill/salesOrder/components/BasicInfo.vue

@@ -553,12 +553,12 @@ export default {
 }
 </script>
 
-  <style lang="scss" scoped>
-  .sales-order-edit {
-      padding: 10px 20px;
-      .sales-order-step {
-        width: 50%;
-        margin: 0 auto 20px;
-      }
-  }
-  </style>
+<style lang="scss" scoped>
+.sales-order-edit {
+    padding: 10px 20px;
+    .sales-order-step {
+      width: 50%;
+      margin: 0 auto 20px;
+    }
+}
+</style>