lilei 3 vuotta sitten
vanhempi
commit
3d224e318b
44 muutettua tiedostoa jossa 89 lisäystä ja 89 poistoa
  1. 2 2
      src/views/allocationManagement/chainTransferIn/list.vue
  2. 2 2
      src/views/allocationManagement/chainTransferOut/list.vue
  3. 2 2
      src/views/allocationManagement/storeTransferOut/list.vue
  4. 3 3
      src/views/allocationManagement/warehouseAllocation/edit.vue
  5. 1 1
      src/views/basicData/bulkPartsTypeManagement/list.vue
  6. 1 1
      src/views/basicData/customerTypeManagement/list.vue
  7. 2 2
      src/views/basicData/expenseType/list.vue
  8. 1 1
      src/views/basicData/storeTransferOutTypeManagement/list.vue
  9. 4 4
      src/views/bulkManagement/bulkReturnGoods/edit.vue
  10. 4 4
      src/views/bulkManagement/bulkReturnGoods/grabEdit.vue
  11. 1 1
      src/views/bulkManagement/bulkReturnGoods/list.vue
  12. 4 4
      src/views/bulkManagement/bulkWarehousingOrder/edit.vue
  13. 4 4
      src/views/bulkManagement/bulkWarehousingOrder/list.vue
  14. 1 1
      src/views/customerManagement/customerInfo/list.vue
  15. 1 1
      src/views/financialManagement/companyReceivablePayable/list.vue
  16. 2 2
      src/views/financialManagement/expenseManagement/list.vue
  17. 2 2
      src/views/financialManagement/financialCollection/list.vue
  18. 2 2
      src/views/financialManagement/financialPayment/list.vue
  19. 2 2
      src/views/financialManagement/inventoryCheckAudit/list.vue
  20. 2 2
      src/views/financialManagement/warehousingAudit/list.vue
  21. 4 4
      src/views/inventoryManagement/inventoryChecking/list.vue
  22. 1 1
      src/views/inventoryManagement/inventoryQuery/list.vue
  23. 1 1
      src/views/inventoryManagement/inventoryWarning/list.vue
  24. 2 2
      src/views/inventoryManagement/warehouse/list.vue
  25. 1 1
      src/views/inventoryManagement/warehouse/storingLocation/list.vue
  26. 1 1
      src/views/productManagement/productBrand/list.vue
  27. 2 2
      src/views/productManagement/productCategory/list.vue
  28. 1 1
      src/views/productManagement/productInfo/list.vue
  29. 2 2
      src/views/purchasingManagement/purchaseOrder/edit.vue
  30. 1 1
      src/views/purchasingManagement/purchaseOrder/importGuideModal.vue
  31. 1 1
      src/views/purchasingManagement/purchaseOrder/list.vue
  32. 2 2
      src/views/purchasingManagement/purchaseOrder/receivingAddress/chooseAddressModal.vue
  33. 1 1
      src/views/purchasingManagement/purchaseOrder/warehousing.vue
  34. 6 6
      src/views/purchasingManagement/purchaseReturn/edit.vue
  35. 1 1
      src/views/purchasingManagement/purchaseReturn/list.vue
  36. 1 1
      src/views/purchasingManagement/signWarehousing/edit.vue
  37. 2 2
      src/views/purchasingManagement/signWarehousing/list.vue
  38. 9 9
      src/views/salesManagement/productPricing/list.vue
  39. 1 1
      src/views/salesManagement/salesReturn/queryPart.vue
  40. 2 2
      src/views/salesManagement/salesman/editModal.vue
  41. 1 1
      src/views/salesManagement/salesman/list.vue
  42. 1 1
      src/views/storeManagement/bind/list.vue
  43. 1 1
      src/views/storeManagement/userAuthorization/list.vue
  44. 1 1
      src/views/supplierManagement/supplierInfo/list.vue

+ 2 - 2
src/views/allocationManagement/chainTransferIn/list.vue

@@ -100,14 +100,14 @@
             size="small"
             type="link"
             v-if="record.state == 'WAIT_AUDIT'&&$hasPermissions('B_allocLinkagePutAudit')"
-            class="button-warning"
+            class="button-primary"
             @click="handleExamine(record)"
             id="chainTransferInList-examine-btn">审核</a-button>
           <a-button
             size="small"
             type="link"
             v-if="record.state == 'WAIT_AUDIT'&&$hasPermissions('B_allocLinkagePutEdit')"
-            class="button-info"
+            class="button-primary"
             @click="handleEdit(record)"
             id="chainTransferInList-edit-btn">编辑</a-button>
           <span v-if="((record.state != 'WAIT_SUBMIT') && (record.state != 'WAIT_AUDIT')) || (!(record.state == 'WAIT_SUBMIT'&&$hasPermissions('B_allocLinkagePutEdit'))&&!(record.state == 'WAIT_AUDIT'&&$hasPermissions('B_allocLinkagePutAudit'))&&!(record.state == 'WAIT_AUDIT'&&$hasPermissions('B_allocLinkagePutEdit')))">--</span>

+ 2 - 2
src/views/allocationManagement/chainTransferOut/list.vue

@@ -97,14 +97,14 @@
             size="small"
             type="link"
             v-if="record.state == 'WAIT_AUDIT'&&$hasPermissions('B_allocLinkageOutAudit')"
-            class="button-warning"
+            class="button-primary"
             @click="handleExamine(record)"
             id="chainTransferOutList-examine-btn">审核</a-button>
           <a-button
             size="small"
             type="link"
             v-if="(record.state == 'WAIT_SUBMIT' || record.state == 'WAIT_AUDIT') &&$hasPermissions('B_allocLinkageOutEdit')"
-            class="button-info"
+            class="button-primary"
             @click="handleEdit(record)"
             id="chainTransferOutList-edit-btn">编辑</a-button>
           <a-button

+ 2 - 2
src/views/allocationManagement/storeTransferOut/list.vue

@@ -86,14 +86,14 @@
             size="small"
             type="link"
             v-if="record.state == 'WAIT_AUDIT'&&$hasPermissions('B_storeCallOutAudit')"
-            class="button-warning"
+            class="button-primary"
             @click="handleExamine(record)"
             id="storeTransferOutList-examine-btn">审核</a-button>
           <a-button
             size="small"
             type="link"
             v-if="((record.state == 'WAIT_SUBMIT') || (record.state == 'WAIT_AUDIT')) &&$hasPermissions('B_storeCallOutEdit')"
-            class="button-info"
+            class="button-primary"
             @click="handleEdit(record)"
             id="storeTransferOutList-edit-btn">编辑</a-button>
           <a-button

+ 3 - 3
src/views/allocationManagement/warehouseAllocation/edit.vue

@@ -137,7 +137,7 @@
             </a-alert>
             <!-- 筛选条件 -->
             <a-row :gutter="15" justify="space-between">
-              <a-col :span="17">
+              <a-col :span="18">
                 <div class="table-page-search-wrapper">
                   <a-form layout="inline" @keyup.enter.native="$refs.chooseTable.refresh(true)">
                     <a-row :gutter="15">
@@ -159,8 +159,8 @@
                   </a-form>
                 </div>
               </a-col>
-              <a-col :span="7">
-                <div style="margin-top: 4px;">
+              <a-col :span="6">
+                <div style="margin-top: 4px;text-align: right;">
                   <!-- <a-button size="small" style="margin-left: 8px" id="chainTransferOutEdit-import-btn">导入明细</a-button> -->
                   <a-button size="small" type="danger" style="margin-left: 8px" @click.stop="handleDel('', 'all')" id="warehouseAllocationEdit-del-all-btn">整单删除</a-button>
                 </div>

+ 1 - 1
src/views/basicData/bulkPartsTypeManagement/list.vue

@@ -24,7 +24,7 @@
             v-if="$hasPermissions('B_basicData_bulkPartsType_edit') && record.tenantId!=0"
             size="small"
             type="link"
-            class="button-info"
+            class="button-primary"
             @click="handleEdit(record)"
             id="bulkPartsTypeList-edit-btn">编辑</a-button>
           <a-button

+ 1 - 1
src/views/basicData/customerTypeManagement/list.vue

@@ -40,7 +40,7 @@
             size="small"
             v-if="$hasPermissions('B_basicData_customerType_edit') && record.tenantId!=0"
             type="link"
-            class="button-info"
+            class="button-primary"
             @click="handleEdit(record)"
             id="customerTypeList-edit-btn">编辑</a-button>
           <a-button

+ 2 - 2
src/views/basicData/expenseType/list.vue

@@ -25,7 +25,7 @@
           <a-button
             v-if="record.typeLevel<3 && $hasPermissions('B_basicData_expenseType_add')"
             type="link"
-            class="button-success"
+            class="button-primary"
             size="small"
             icon="plus"
             id="expenseType-addSubItem"
@@ -33,7 +33,7 @@
           <a-button
             v-if="record.pid != 0 && $hasPermissions('B_basicData_expenseType_edit') && record.tenantId!=0"
             type="link"
-            class="button-info"
+            class="button-primary"
             size="small"
             icon="edit"
             id="expenseType-edit"

+ 1 - 1
src/views/basicData/storeTransferOutTypeManagement/list.vue

@@ -29,7 +29,7 @@
             v-if="$hasPermissions('B_basicData_storeTransferOutType_edit') && record.tenantId!=0"
             size="small"
             type="link"
-            class="button-info"
+            class="button-primary"
             @click="handleEdit(record)"
             id="storeTransferOutTypeList-edit-btn">编辑</a-button>
           <a-button

+ 4 - 4
src/views/bulkManagement/bulkReturnGoods/edit.vue

@@ -58,7 +58,7 @@
           :customRow="handleClickRow"
           :data="loadData"
           :defaultLoadData="false"
-          :scroll="{ y:300 }"
+          :scroll="{ y:150 }"
           bordered>
           <!-- 退货单价 -->
           <template slot="purchaseCost" slot-scope="text, record">
@@ -86,7 +86,7 @@
           </template>
           <!-- 操作 -->
           <template slot="action" slot-scope="text, record">
-            <a-button size="small" type="primary" class="button-primary" @click="handleAdd(record)" id="bulkReturnGoodsEdit-add-btn">添加</a-button>
+            <a-button size="small" type="link" class="button-primary" @click="handleAdd(record)" id="bulkReturnGoodsEdit-add-btn">添加</a-button>
           </template>
         </s-table>
       </a-card>
@@ -135,7 +135,7 @@
           :columns="chooseColumns"
           :data="chooseLoadData"
           :defaultLoadData="false"
-          :scroll="{ y:300 }"
+          :scroll="{ y:200 }"
           bordered>
           <!-- 退货单价 -->
           <template slot="purchaseCost" slot-scope="text, record">
@@ -165,7 +165,7 @@
           </template>
           <!-- 操作 -->
           <template slot="action" slot-scope="text, record">
-            <a-button size="small" type="primary" class="button-error" @click="handleDel(record)" id="bulkReturnGoodsEdit-del-btn">删除</a-button>
+            <a-button size="small" type="link" class="button-error" @click="handleDel(record)" id="bulkReturnGoodsEdit-del-btn">删除</a-button>
           </template>
         </s-table>
       </a-card>

+ 4 - 4
src/views/bulkManagement/bulkReturnGoods/grabEdit.vue

@@ -49,7 +49,7 @@
           :customRow="handleClickRow"
           :defaultLoadData="false"
           :data="loadData"
-          :scroll="{ y:300 }"
+          :scroll="{ y:150 }"
           bordered>
           <!-- 退货单价 -->
           <template slot="purchaseCost" slot-scope="text, record">
@@ -77,7 +77,7 @@
           </template>
           <!-- 操作 -->
           <template slot="action" slot-scope="text, record">
-            <a-button size="small" type="primary" class="button-primary" @click="handleAdd(record)" id="bulkReturnGoodsEdit-add-btn">添加</a-button>
+            <a-button size="small" type="link" class="button-primary" @click="handleAdd(record)" id="bulkReturnGoodsEdit-add-btn">添加</a-button>
           </template>
         </s-table>
       </a-card>
@@ -126,7 +126,7 @@
           :columns="chooseColumns"
           :data="chooseLoadData"
           :defaultLoadData="false"
-          :scroll="{ y:300 }"
+          :scroll="{ y:200 }"
           bordered>
           <!-- 退货单价 -->
           <template slot="purchaseCost" slot-scope="text, record">
@@ -156,7 +156,7 @@
           </template>
           <!-- 操作 -->
           <template slot="action" slot-scope="text, record">
-            <a-button size="small" type="primary" class="button-error" @click="handleDel(record)" id="bulkReturnGoodsEdit-del-btn">删除</a-button>
+            <a-button size="small" type="link" class="button-error" @click="handleDel(record)" id="bulkReturnGoodsEdit-del-btn">删除</a-button>
           </template>
         </s-table>
       </a-card>

+ 1 - 1
src/views/bulkManagement/bulkReturnGoods/list.vue

@@ -85,7 +85,7 @@
             type="link"
             v-if="(record.state == 'WAIT_SUBMIT' || record.state == 'AUDIT_REJECT') && $hasPermissions('B_bulkReturnGoodsEdit')"
             @click="handleEdit(record)"
-            class="button-info"
+            class="button-primary"
             id="bulkReturnGoodsList-edit-btn">编辑</a-button>
           <a-button
             size="small"

+ 4 - 4
src/views/bulkManagement/bulkWarehousingOrder/edit.vue

@@ -73,7 +73,7 @@
                 :customRow="handleClickRow"
                 :data="loadData"
                 :defaultLoadData="false"
-                :scroll="{ y: 300 }"
+                :scroll="{ y: 150 }"
                 bordered>
                 <!-- 成本价 -->
                 <template slot="putCost" slot-scope="text, record">
@@ -115,7 +115,7 @@
                 </template>
                 <!-- 操作 -->
                 <template slot="action" slot-scope="text, record">
-                  <a-button size="small" type="primary" class="button-primary" @click="handleAdd(record)" id="bulkWarehousingOrderEdit-add-btn">添加</a-button>
+                  <a-button size="small" type="link" class="button-primary" @click="handleAdd(record)" id="bulkWarehousingOrderEdit-add-btn">添加</a-button>
                 </template>
               </s-table>
             </div>
@@ -148,7 +148,7 @@
                 :columns="chooseColumns"
                 :data="chooseLoadData"
                 :defaultLoadData="false"
-                :scroll="{ y: 300 }"
+                :scroll="{ y: 200 }"
                 bordered>
                 <!-- 成本价 -->
                 <template slot="putCost" slot-scope="text, record">
@@ -192,7 +192,7 @@
                 </template>
                 <!-- 操作 -->
                 <template slot="action" slot-scope="text, record">
-                  <a-button size="small" type="primary" class="button-error" @click="handleDel(record)" id="bulkWarehousingOrderEdit-del-btn">删除</a-button>
+                  <a-button size="small" type="link" class="button-error" @click="handleDel(record)" id="bulkWarehousingOrderEdit-del-btn">删除</a-button>
                 </template>
               </s-table>
             </div>

+ 4 - 4
src/views/bulkManagement/bulkWarehousingOrder/list.vue

@@ -191,14 +191,14 @@ export default {
         { title: '序号', dataIndex: 'no', width: '5%', align: 'center' },
         { title: '散件单号', scopedSlots: { customRender: 'sparePartsPurchaseNo' }, width: '15%', align: 'center' },
         { title: '创建时间', dataIndex: 'createDate', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '供应商', dataIndex: 'supplierName', width: '20%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '供应商', dataIndex: 'supplierName', width: '23%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '产品款数', dataIndex: 'productTotalCategory', width: '5%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '总数量', dataIndex: 'productTotalQty', width: '5%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '总金额', dataIndex: 'productTotalCost', width: '5%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '业务状态', dataIndex: 'stateDictValue', width: '5%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '提交', scopedSlots: { customRender: 'submit' }, width: '3%', align: 'center' },
-        { title: '入库', scopedSlots: { customRender: 'waitOut' }, width: '3%', align: 'center' },
-        { title: '付款', scopedSlots: { customRender: 'financial' }, width: '3%', align: 'center' },
+        { title: '提交', scopedSlots: { customRender: 'submit' }, width: '2%', align: 'center' },
+        { title: '入库', scopedSlots: { customRender: 'waitOut' }, width: '2%', align: 'center' },
+        { title: '付款', scopedSlots: { customRender: 'financial' }, width: '2%', align: 'center' },
         // { title: '财务状态', dataIndex: 'settleStateDictValue', width: '5%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: '10%', align: 'center' }
       ],

+ 1 - 1
src/views/customerManagement/customerInfo/list.vue

@@ -94,7 +94,7 @@
             size="small"
             v-if="$hasPermissions('B_customer_customerInfo_edit')"
             type="link"
-            class="button-info"
+            class="button-primary"
             @click="handleEdit(record)"
             id="customerManagementList-edit-btn">编辑</a-button>
           <a-button

+ 1 - 1
src/views/financialManagement/companyReceivablePayable/list.vue

@@ -56,7 +56,7 @@
             v-if="$hasPermissions('M_collectionPayment')"
             size="small"
             type="link"
-            class="button-info"
+            class="button-primary"
             @click="handleCollectionPayment(record)"
             id="companyReceivablePayableList-collectionPayment-btn">收付款</a-button>
           <a-button

+ 2 - 2
src/views/financialManagement/expenseManagement/list.vue

@@ -92,14 +92,14 @@
             size="small"
             type="link"
             v-if="record.state == 'WAIT_AUDIT' && $hasPermissions('B_expenseAudit')"
-            class="button-warning"
+            class="button-primary"
             @click="handleAudit(record)"
             id="expenseManagement-audit-btn">审核</a-button>
           <a-button
             size="small"
             type="link"
             v-if="record.state == 'WAIT_AUDIT' && $hasPermissions('B_expenseEdit')"
-            class="button-info"
+            class="button-primary"
             @click="handleEdit(record)"
             id="expenseManagement-edit-btn">编辑</a-button>
           <a-button

+ 2 - 2
src/views/financialManagement/financialCollection/list.vue

@@ -93,7 +93,7 @@
           <a-button
             size="small"
             type="link"
-            class="button-info"
+            class="button-primary"
             v-if="record.settleState == 'SETTLED' && $hasPermissions('B_financialCollectionDetail')"
             @click="handleVoucher(record)"
             id="financialCollectionList-voucher-btn">凭证</a-button>
@@ -101,7 +101,7 @@
             size="small"
             type="link"
             :loading="loading"
-            class="button-warning"
+            class="button-error"
             v-if="(record.settleState == 'UNSETTLE' || record.settleState == 'PART_SETTLED')&&record.satelliteFlag!=1 && $hasPermissions('B_financialCollectionSing')"
             @click="handleCollectionSing(record)"
             id="financialCollectionList-pay-btn">收款</a-button>

+ 2 - 2
src/views/financialManagement/financialPayment/list.vue

@@ -92,14 +92,14 @@
           <a-button
             size="small"
             type="link"
-            class="button-info"
+            class="button-primary"
             v-if="record.settleState == 'SETTLED' && $hasPermissions('B_financialPaymentDetail')"
             @click="handleVoucher(record)"
             id="finacialPay-voucher-btn">凭证</a-button>
           <a-button
             size="small"
             type="link"
-            class="button-warning"
+            class="button-error"
             :loading="loading"
             v-else-if="record.settleState != 'SETTLED' && $hasPermissions('B_financialPaymentSing')"
             @click="handlePay(record)"

+ 2 - 2
src/views/financialManagement/inventoryCheckAudit/list.vue

@@ -51,14 +51,14 @@
             size="small"
             v-if="record.state=='WAIT_FINANCE_AUDIT' && $hasPermissions('B_inventoryCheckAuditAudit')"
             type="link"
-            class="button-info"
+            class="button-primary"
             @click="handleExamine(record, true)"
             id="warehousingAudit-adopt-btn">通过</a-button>
           <a-button
             size="small"
             type="link"
             v-if="record.state == 'WAIT_FINANCE_AUDIT' && $hasPermissions('B_inventoryCheckingAgain')"
-            class="button-warning"
+            class="button-error"
             @click="handleAgain(record)"
           >重盘</a-button>
           <span v-if="!(record.state=='WAIT_FINANCE_AUDIT' && ($hasPermissions('B_inventoryCheckAuditAudit') || $hasPermissions('B_inventoryCheckingAgain')))">--</span>

+ 2 - 2
src/views/financialManagement/warehousingAudit/list.vue

@@ -76,14 +76,14 @@
             size="small"
             v-if="record.auditState=='WAIT_PUT_WAREHOUSE_AUDIT' && $hasPermissions('B_receivingAudit')"
             type="link"
-            class="button-info"
+            class="button-primary"
             @click="handleExamine(record, 1)"
             id="warehousingAudit-adopt-btn">通过</a-button>
           <a-button
             size="small"
             v-if="record.auditState=='WAIT_PUT_WAREHOUSE_AUDIT'&& $hasPermissions('B_receivingAudit')"
             type="link"
-            class="button-warning"
+            class="button-error"
             @click="handleExamine(record, 2)"
             id="warehousingAudit-unadopt-btn">不通过</a-button>
           <span v-if="record.auditState!='WAIT_PUT_WAREHOUSE_AUDIT'|| !$hasPermissions('B_receivingAudit')">--</span>

+ 4 - 4
src/views/inventoryManagement/inventoryChecking/list.vue

@@ -69,28 +69,28 @@
           size="small"
           type="link"
           v-if="(record.state == 'WAIT_SUBMIT') || (record.state == 'AUDIT_REJECT') && $hasPermissions('B_inventoryCheckingEdit')"
-          class="button-info"
+          class="button-primary"
           @click="handleEdit(record)"
         >编辑</a-button>
         <a-button
           size="small"
           type="link"
           v-if="record.state == 'WAIT_AUDIT' && $hasPermissions('B_inventoryCheckingAudit')"
-          class="button-warning"
+          class="button-primary"
           @click="handleEexamine(record)"
         >审核</a-button>
         <a-button
           size="small"
           type="link"
           v-if="record.state == 'WAIT_CHECK_WAREHOUSE' && $hasPermissions('B_inventoryCheckingInventory')"
-          class="button-warning"
+          class="button-primary"
           @click="handleWarehouse(record)"
         >盘点</a-button>
         <a-button
           size="small"
           type="link"
           v-if="record.state == 'WAIT_CHECK_WAREHOUSE' && $hasPermissions('B_inventoryCheckingAgain')"
-          class="button-info"
+          class="button-primary"
           @click="handleAgain(record)"
         >重盘</a-button>
         <a-button

+ 1 - 1
src/views/inventoryManagement/inventoryQuery/list.vue

@@ -145,7 +145,7 @@
             size="small"
             type="link"
             v-if="$hasPermissions('B_inventoryInventoryQueryStock')"
-            class="button-warning"
+            class="button-primary"
             @click="goWarehouseDetail(record)"
             id="inventoryQueryList-warehouseDetail-btn">出入库明细</a-button>
           <span v-if="!$hasPermissions('B_inventoryInventoryQueryDetail') && !$hasPermissions('B_inventoryInventoryQueryStock')">--</span>

+ 1 - 1
src/views/inventoryManagement/inventoryWarning/list.vue

@@ -160,7 +160,7 @@
             type="link"
             v-if="$hasPermissions('B_inventoryWarningSave')"
             size="small"
-            class="button-info"
+            class="button-primary"
             @click="handleSave(record)"
             id="inventoryWarningList-add-btn">保存</a-button>
           <span v-if="!$hasPermissions('B_inventoryWarningSave')">--</span>

+ 2 - 2
src/views/inventoryManagement/warehouse/list.vue

@@ -40,14 +40,14 @@
             size="small"
             v-if="$hasPermissions('M_inventoryWarehouseStoringLocationList')"
             type="link"
-            class="button-warning"
+            class="button-primary"
             @click="goStoringLocation(record)"
             id="warehouseList-storingLocation-btn">仓位管理</a-button>
           <a-button
             size="small"
             v-if="$hasPermissions('B_inventory_warehouse_edit') && record.sysFlag==0"
             type="link"
-            class="button-info"
+            class="button-primary"
             @click="handleEdit(record)"
             id="warehouseList-edit-btn">编辑</a-button>
           <a-button

+ 1 - 1
src/views/inventoryManagement/warehouse/storingLocation/list.vue

@@ -48,7 +48,7 @@
               size="small"
               v-if="$hasPermissions('B_inventory_warehouse_storingLocation_edit') && record.sysFlag==0"
               type="link"
-              class="button-info"
+              class="button-primary"
               @click="handleEdit(record)"
               id="storingLocationList-edit-btn">编辑</a-button>
             <a-button

+ 1 - 1
src/views/productManagement/productBrand/list.vue

@@ -55,7 +55,7 @@
             size="small"
             v-if="$hasPermissions('B_product_dealerProductBrand_edit')&&record.sysFlag == 0"
             type="link"
-            class="button-info"
+            class="button-primary"
             @click="handleEdit(record)"
             id="productBrandList-edit-btn">编辑</a-button>
           <span v-else>--</span>

+ 2 - 2
src/views/productManagement/productCategory/list.vue

@@ -23,7 +23,7 @@
           <a-button
             v-if="record.productTypeLevel<3 && $hasPermissions('B_product_dealerProductType_add')&&record.sysFlag == 0"
             type="link"
-            class="button-success"
+            class="button-primary"
             size="small"
             icon="plus"
             id="productCategory-addSubItem"
@@ -31,7 +31,7 @@
           <a-button
             v-if="record.pid != 0 && $hasPermissions('B_product_dealerProductType_edit')&&record.sysFlag == 0"
             type="link"
-            class="button-info"
+            class="button-primary"
             size="small"
             icon="edit"
             id="productCategory-edit"

+ 1 - 1
src/views/productManagement/productInfo/list.vue

@@ -112,7 +112,7 @@
             size="small"
             v-if="$hasPermissions('B_product_dealerProduct_edit')"
             type="link"
-            class="button-info"
+            class="button-primary"
             @click="handleEdit(record)"
             id="productInfoList-edit-btn">编辑</a-button>
           <a-button

+ 2 - 2
src/views/purchasingManagement/purchaseOrder/edit.vue

@@ -124,7 +124,7 @@
                   <a-button
                     size="small"
                     type="link"
-                    class="button-info"
+                    class="button-primary"
                     :loading="addLoading"
                     @click="handleAdd(record,0)"
                     v-if="record.purchasePrice>0"
@@ -175,7 +175,7 @@
                   </a-col>
                   <a-col :span="6">
                     <div style="float:right;overflow: hidden;">
-                      <a-button size="small" type="primary" class="button-info" id="purchaseOrderEdit-import-btn" @click="handleOutStock">上次缺货</a-button>
+                      <a-button size="small" type="primary" class="button-primary" id="purchaseOrderEdit-import-btn" @click="handleOutStock">上次缺货</a-button>
                       <a-button size="small" id="purchaseOrderEdit-import-btn" @click="openGuideModal=true">导入产品</a-button>
                     </div>
                   </a-col>

+ 1 - 1
src/views/purchasingManagement/purchaseOrder/importGuideModal.vue

@@ -4,7 +4,7 @@
     class="importGuide-modal"
     :footer="null"
     :maskClosable="false"
-    title="导入"
+    title="导入产品"
     v-model="isShow"
     @cancle="isShow=false"
     :width="750">

+ 1 - 1
src/views/purchasingManagement/purchaseOrder/list.vue

@@ -120,7 +120,7 @@
           <a-button
             size="small"
             type="link"
-            class="button-info"
+            class="button-primary"
             v-if="(record.billStatus == 'WAIT_SUBMIT'||record.billStatus == 'AUDIT_REJECT') && $hasPermissions('B_purchaseEdit')"
             @click="handleEdit(record)"
           >编辑</a-button>

+ 2 - 2
src/views/purchasingManagement/purchaseOrder/receivingAddress/chooseAddressModal.vue

@@ -42,14 +42,14 @@
           <a-button
             size="small"
             type="link"
-            class="button-success"
+            class="button-primary"
             v-if="record.defaultFlag!=1"
             @click="handleDefault(record)"
             id="chooseAddressList-default-btn">设为默认</a-button>
           <a-button
             size="small"
             type="link"
-            class="button-info"
+            class="button-primary"
             v-if="record.readOnlyFlag!=1"
             @click="handleEdit(record)"
             id="chooseAddressList-edit-btn"

+ 1 - 1
src/views/purchasingManagement/purchaseOrder/warehousing.vue

@@ -51,7 +51,7 @@
         <div style="text-align: center;">
           <a-button
             type="primary"
-            class="button-warning"
+            class="button-primary"
             :id="'purchaseOrderWarehousing-warehousing-'+bindex"
             @click="handleWarehousing(item,bindex)"
             v-if="item.auditState=='WAIT_PUT_WAREHOUSE' || item.auditState == 'PUT_WAREHOUSE_AUDIT_REJECT'"

+ 6 - 6
src/views/purchasingManagement/purchaseReturn/edit.vue

@@ -13,7 +13,7 @@
         </template>
       </a-page-header>
       <!-- 选择产品 -->
-      <a-card size="small" :bordered="false" class="purchaseReturnEdit-cont">
+      <div class="purchaseReturnEdit-cont">
         <a-collapse :activeKey="['1']">
           <a-collapse-panel key="1" header="选择产品">
             <!-- 筛选条件 -->
@@ -89,7 +89,7 @@
             </s-table>
           </a-collapse-panel>
         </a-collapse>
-      </a-card>
+      </div>
       <!-- 已选产品 -->
       <a-card size="small" :bordered="false" class="purchaseReturnEdit-cont">
         <a-collapse :activeKey="['1']">
@@ -99,10 +99,10 @@
               <a-button
                 size="small"
                 type="primary"
-                class="import-btn"
+                class="button-error"
                 id="purchaseReturnEdit-delAll-btn"
                 @click.stop="handleDel('', 'all')"
-                style="margin-left: 10px;">整单删除</a-button>
+                style="margin-right: 10px;float: right;">整单删除</a-button>
             </template>
             <!-- 列表 -->
             <s-table
@@ -148,7 +148,7 @@
         </a-collapse>
       </a-card>
     </a-spin>
-    <div class="affix-cont">
+    <a-card size="small" :bordered="false" class="affix-cont">
       <a-button
         type="primary"
         id="purchaseReturnEdit-submit"
@@ -157,7 +157,7 @@
         class="button-primary"
         @click="handleSubmit"
         style="padding: 0 60px;">提交</a-button>
-    </div>
+    </a-card>
   </div>
 </template>
 

+ 1 - 1
src/views/purchasingManagement/purchaseReturn/list.vue

@@ -77,7 +77,7 @@
           <a-button
             size="small"
             type="link"
-            class="button-info"
+            class="button-primary"
             v-if="(record.state == 'WAIT_SUBMIT' || record.state == 'AUDIT_REJECT') && $hasPermissions('B_purchaseReturnEdit')"
             @click="handleEdit(record)"
             id="purchaseReturnList-edit-btn">编辑</a-button>

+ 1 - 1
src/views/purchasingManagement/signWarehousing/edit.vue

@@ -54,7 +54,7 @@
         <div style="text-align: center;">
           <a-button
             type="primary"
-            class="button-warning"
+            class="button-primary"
             :disabled="spinning"
             :id="'purchaseOrderWarehousing-warehousing-'+bindex"
             @click="handleWarehousing(item,bindex)"

+ 2 - 2
src/views/purchasingManagement/signWarehousing/list.vue

@@ -71,7 +71,7 @@
           <a-button
             size="small"
             type="link"
-            class="button-warning"
+            class="button-primary"
             v-if="(record.auditState == 'PUT_WAREHOUSE_AUDIT_REJECT' || record.auditState == 'WAIT_PUT_WAREHOUSE')&&$hasPermissions('B_signWarehousingSign')"
             @click="handleWarehouse(record)"
           >签收入库</a-button>
@@ -117,7 +117,7 @@ export default {
         { title: '发货金额', dataIndex: 'totalPutAmount', width: '8%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '入库时间', dataIndex: 'stockPutTime', width: '14%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '业务状态', dataIndex: 'auditStateDictValue', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '操作', scopedSlots: { customRender: 'action' }, width: '12%', align: 'center' }
+        { title: '操作', scopedSlots: { customRender: 'action' }, width: '8%', align: 'center' }
       ],
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {

+ 9 - 9
src/views/salesManagement/productPricing/list.vue

@@ -43,7 +43,7 @@
       </a-form>
     </div>
     <!-- 价格 -->
-    <div style="margin-bottom: 10px;">
+    <div style="border-top: 1px solid #eee;padding: 10px 0;text-align: right;">
       <a-checkbox v-model="isCostPrice"><span style="display: inline-block;">成本价</span></a-checkbox>
       <!-- 特约加盟商不可见市级价 -->
       <a-checkbox v-model="isCityPrice" v-if="dealerData && dealerData.dealerLevel != 'SPECIAL'"><span style="display: inline-block;">市级价</span></a-checkbox>
@@ -55,7 +55,7 @@
     <s-table
       class="sTable fixPagination"
       ref="table"
-      :style="{ height: tableHeight+84.5+'px' }"
+      :style="{ height: tableHeight+74.5+'px' }"
       size="small"
       :rowKey="(record) => record.id"
       :columns="columns"
@@ -123,22 +123,22 @@ export default {
       const arr = [
         { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
         { title: '产品编码', dataIndex: 'code', width: '15%', align: 'center', customRender: function (text) { return text || '--' }, sorter: true },
-        { title: '产品名称', dataIndex: 'name', width: '19%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '产品名称', dataIndex: 'name', width: '25%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '原厂编码', dataIndex: 'origCode', width: '11%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '品牌', dataIndex: 'productBrandName', width: '11%', align: 'center', customRender: function (text) { return text || '--' }, sorter: true },
-        { title: '库存数量', dataIndex: 'stockQty', width: '8%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '库存数量', dataIndex: 'stockQty', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         // { title: '成本价', dataIndex: 'offerCost', width: '8%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         // { title: '市级价', dataIndex: 'cityPrice', width: '8%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         // { title: '特约价', dataIndex: 'specialPrice', width: '8%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         // { title: '终端会员价', dataIndex: 'terminalPrice', width: '8%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '车主价', dataIndex: 'carOwnersPrice', width: '8%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } }
+        { title: '车主价', dataIndex: 'carOwnersPrice', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } }
       ]
       if (this.isCostPrice) {
-        arr.splice(6, 0, { title: '成本价', dataIndex: 'offerCost', width: '8%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
+        arr.splice(6, 0, { title: '成本价', dataIndex: 'offerCost', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
       }
       if (this.isCityPrice) {
         const ind = this.isCostPrice ? 7 : 6
-        arr.splice(ind, 0, { title: '市级价', dataIndex: 'cityPrice', width: '8%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
+        arr.splice(ind, 0, { title: '市级价', dataIndex: 'cityPrice', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
       }
       if (this.isSpecialPrice) {
         let ind = 0
@@ -149,10 +149,10 @@ export default {
         } else if (!this.isCostPrice && !this.isCityPrice) {
           ind = 6
         }
-        arr.splice(ind, 0, { title: '特约价', dataIndex: 'specialPrice', width: '8%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
+        arr.splice(ind, 0, { title: '特约价', dataIndex: 'specialPrice', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
       }
       if (this.isTerminalPrice) {
-        arr.splice(arr.length - 1, 0, { title: '终端会员价', dataIndex: 'terminalPrice', width: '8%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
+        arr.splice(arr.length - 1, 0, { title: '终端会员价', dataIndex: 'terminalPrice', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
       }
       return arr
     }

+ 1 - 1
src/views/salesManagement/salesReturn/queryPart.vue

@@ -121,7 +121,7 @@
           v-else
           size="small"
           type="link"
-          class="button-info"
+          class="button-primary"
           :loading="newLoading"
           @click="handleAdd(record)"
         >添加</a-button>

+ 2 - 2
src/views/salesManagement/salesman/editModal.vue

@@ -74,8 +74,8 @@
           </a-form-model-item>
         </a-form-model>
         <div class="btn-cont">
-          <a-button type="primary" id="supplierInfoEdit-btn-submit" @click="handleSubmit">保存</a-button>
-          <a-button id="supplierInfoEdit-btn-back" @click="isShow = false" style="margin-left: 15px;">取消</a-button>
+          <a-button type="primary" size="large" id="supplierInfoEdit-btn-submit" @click="handleSubmit">保存</a-button>
+          <a-button id="supplierInfoEdit-btn-back" size="large" @click="isShow = false" style="margin-left: 15px;">取消</a-button>
         </div>
       </div>
       <!-- 详情 -->

+ 1 - 1
src/views/salesManagement/salesman/list.vue

@@ -52,7 +52,7 @@
         <a-button
           size="small"
           type="link"
-          class="button-info"
+          class="button-primary"
           @click="handleEdit(record,1)"
           v-if="$hasPermissions('B_salesman_edit')"
           id="salesmanList-edit-btn">编辑</a-button>

+ 1 - 1
src/views/storeManagement/bind/list.vue

@@ -43,7 +43,7 @@
           <a-button
             size="small"
             type="link"
-            class="button-info"
+            class="button-primary"
             @click="handleEdit(record)"
             v-if="$hasPermissions('B_storeManagementBind_edit')"
             id="bindList-edit-btn">编辑</a-button>

+ 1 - 1
src/views/storeManagement/userAuthorization/list.vue

@@ -52,7 +52,7 @@
           <a-button
             size="small"
             type="link"
-            class="button-info"
+            class="button-primary"
             @click="handleEdit(record)"
             v-if="$hasPermissions('B_storeManagementUserAuth_edit')"
             id="userAuthList-edit-btn">编辑</a-button>

+ 1 - 1
src/views/supplierManagement/supplierInfo/list.vue

@@ -48,7 +48,7 @@
           v-if="$hasPermissions('B_supplier_supplierInfo_edit') && record.tenantId!=0"
           size="small"
           type="link"
-          class="button-info"
+          class="button-primary"
           @click="handleEdit(record)"
           id="supplierInfoList-edit-btn">编辑</a-button>
         <span v-else>--</span>