lilei 4 роки тому
батько
коміт
9609232a71

+ 1 - 1
src/api/dealerProductType.js

@@ -5,7 +5,7 @@ export const dealerProductTypeList = (params) => {
   const url = `/dealerProductType/query`
   const url = `/dealerProductType/query`
   return axios({
   return axios({
     url: url,
     url: url,
-    data: {},
+    data: params,
     method: 'post'
     method: 'post'
   })
   })
 }
 }

+ 10 - 3
src/views/basicData/bulkPartsTypeManagement/list.vue

@@ -16,11 +16,18 @@
       bordered>
       bordered>
       <!-- 操作 -->
       <!-- 操作 -->
       <template slot="action" slot-scope="text, record">
       <template slot="action" slot-scope="text, record">
-        <a-button v-if="$hasPermissions('B_basicData_bulkPartsType_edit')" size="small" type="link" @click="handleEdit(record)" id="bulkPartsTypeList-edit-btn">编辑</a-button>
+        <a-button
+          v-if="$hasPermissions('B_basicData_bulkPartsType_edit')"
+          size="small"
+          type="primary"
+          class="button-info"
+          @click="handleEdit(record)"
+          id="bulkPartsTypeList-edit-btn">编辑</a-button>
         <a-button
         <a-button
           v-if="$hasPermissions('B_basicData_bulkPartsType_del')"
           v-if="$hasPermissions('B_basicData_bulkPartsType_del')"
           size="small"
           size="small"
-          type="link"
+          type="primary"
+          class="button-error"
           @click="handleDel(record)"
           @click="handleDel(record)"
           id="bulkPartsTypeList-del-btn"
           id="bulkPartsTypeList-del-btn"
           style="margin: 0 0 0 8px;">删除</a-button>
           style="margin: 0 0 0 8px;">删除</a-button>
@@ -47,7 +54,7 @@ export default {
         { title: '序号', dataIndex: 'no', width: 80, align: 'center' },
         { title: '序号', dataIndex: 'no', width: 80, align: 'center' },
         { title: '散件类型名称', dataIndex: 'name', align: 'center', ellipsis: true },
         { title: '散件类型名称', dataIndex: 'name', align: 'center', ellipsis: true },
         { title: '创建时间', dataIndex: 'createDate', align: 'center' },
         { title: '创建时间', dataIndex: 'createDate', align: 'center' },
-        { title: '操作', scopedSlots: { customRender: 'action' }, width: 240, align: 'center' }
+        { title: '操作', scopedSlots: { customRender: 'action' }, width: 200, align: 'center' }
       ],
       ],
       // 加载数据方法 必须为 Promise 对象
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
       loadData: parameter => {

+ 15 - 3
src/views/basicData/customerTypeManagement/list.vue

@@ -32,8 +32,20 @@
       bordered>
       bordered>
       <!-- 操作 -->
       <!-- 操作 -->
       <template slot="action" slot-scope="text, record">
       <template slot="action" slot-scope="text, record">
-        <a-button size="small" v-if="$hasPermissions('B_basicData_customerType_edit')" type="link" @click="handleEdit(record)" id="customerTypeList-edit-btn">编辑</a-button>
-        <a-button size="small" v-if="$hasPermissions('B_basicData_customerType_del')" type="link" @click="handleDel(record)" id="customerTypeList-del-btn">删除</a-button>
+        <a-button
+          size="small"
+          v-if="$hasPermissions('B_basicData_customerType_edit')"
+          type="primary"
+          class="button-info"
+          @click="handleEdit(record)"
+          id="customerTypeList-edit-btn">编辑</a-button>
+        <a-button
+          size="small"
+          v-if="$hasPermissions('B_basicData_customerType_del')"
+          type="primary"
+          class="button-error"
+          @click="handleDel(record)"
+          id="customerTypeList-del-btn">删除</a-button>
       </template>
       </template>
     </s-table>
     </s-table>
     <!-- 新增/编辑客户类型 -->
     <!-- 新增/编辑客户类型 -->
@@ -57,7 +69,7 @@ export default {
         { title: '序号', dataIndex: 'no', width: 80, align: 'center' },
         { title: '序号', dataIndex: 'no', width: 80, align: 'center' },
         { title: '客户类型名称', dataIndex: 'name', align: 'center', ellipsis: true },
         { title: '客户类型名称', dataIndex: 'name', align: 'center', ellipsis: true },
         { title: '创建时间', dataIndex: 'createDate', align: 'center' },
         { title: '创建时间', dataIndex: 'createDate', align: 'center' },
-        { title: '操作', scopedSlots: { customRender: 'action' }, width: 240, align: 'center' }
+        { title: '操作', scopedSlots: { customRender: 'action' }, width: 200, align: 'center' }
       ],
       ],
       // 加载数据方法 必须为 Promise 对象
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
       loadData: parameter => {

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

@@ -19,26 +19,26 @@
       <template slot="action" slot-scope="text, record">
       <template slot="action" slot-scope="text, record">
         <a-button
         <a-button
           v-if="record.typeLevel<3 && $hasPermissions('B_basicData_expenseType_add')"
           v-if="record.typeLevel<3 && $hasPermissions('B_basicData_expenseType_add')"
-          type="link"
+          type="primary"
+          class="button-success"
           size="small"
           size="small"
           icon="plus"
           icon="plus"
-          class="btn-add-s"
           id="expenseType-addSubItem"
           id="expenseType-addSubItem"
           @click="handleAdd(record)">新增子级</a-button>
           @click="handleAdd(record)">新增子级</a-button>
         <a-button
         <a-button
           v-if="record.pid != 0 && $hasPermissions('B_basicData_expenseType_edit')"
           v-if="record.pid != 0 && $hasPermissions('B_basicData_expenseType_edit')"
-          type="link"
+          type="primary"
+          class="button-info"
           size="small"
           size="small"
           icon="edit"
           icon="edit"
-          class="btn-edit-s"
           id="expenseType-edit"
           id="expenseType-edit"
           @click="handleEdit(record)">编辑</a-button>
           @click="handleEdit(record)">编辑</a-button>
         <a-button
         <a-button
           v-if="record.pid != 0 && $hasPermissions('B_basicData_expenseType_del')"
           v-if="record.pid != 0 && $hasPermissions('B_basicData_expenseType_del')"
-          type="link"
+          type="primary"
+          class="button-error"
           size="small"
           size="small"
           icon="delete"
           icon="delete"
-          class="btn-del-s"
           id="expenseType-del"
           id="expenseType-del"
           @click="handleDel(record)">删除</a-button>
           @click="handleDel(record)">删除</a-button>
       </template>
       </template>

+ 20 - 4
src/views/basicData/storeTransferOutTypeManagement/list.vue

@@ -2,7 +2,11 @@
   <a-card size="small" :bordered="false" class="storeTransferOutTypeList-wrap">
   <a-card size="small" :bordered="false" class="storeTransferOutTypeList-wrap">
     <!-- 操作按钮 -->
     <!-- 操作按钮 -->
     <div class="table-operator">
     <div class="table-operator">
-      <a-button v-if="$hasPermissions('B_basicData_storeTransferOutType_add')" id="storeTransferOutTypeList-add" type="primary" @click="handleEdit()">新增店内调出类型</a-button>
+      <a-button
+        v-if="$hasPermissions('B_basicData_storeTransferOutType_add')"
+        id="storeTransferOutTypeList-add"
+        type="primary"
+        @click="handleEdit()">新增店内调出类型</a-button>
     </div>
     </div>
     <!-- 列表 -->
     <!-- 列表 -->
     <s-table
     <s-table
@@ -16,8 +20,20 @@
       bordered>
       bordered>
       <!-- 操作 -->
       <!-- 操作 -->
       <template slot="action" slot-scope="text, record">
       <template slot="action" slot-scope="text, record">
-        <a-button v-if="$hasPermissions('B_basicData_storeTransferOutType_edit')" size="small" type="link" @click="handleEdit(record)" id="storeTransferOutTypeList-edit-btn">编辑</a-button>
-        <a-button v-if="$hasPermissions('B_basicData_storeTransferOutType_del')" size="small" type="link" @click="handleDel(record)" id="storeTransferOutTypeList-del-btn">删除</a-button>
+        <a-button
+          v-if="$hasPermissions('B_basicData_storeTransferOutType_edit')"
+          size="small"
+          type="primary"
+          class="button-info"
+          @click="handleEdit(record)"
+          id="storeTransferOutTypeList-edit-btn">编辑</a-button>
+        <a-button
+          v-if="$hasPermissions('B_basicData_storeTransferOutType_del')"
+          size="small"
+          type="primary"
+          class="button-error"
+          @click="handleDel(record)"
+          id="storeTransferOutTypeList-del-btn">删除</a-button>
       </template>
       </template>
     </s-table>
     </s-table>
     <!-- 新增/编辑店内调出类型 -->
     <!-- 新增/编辑店内调出类型 -->
@@ -41,7 +57,7 @@ export default {
         { title: '序号', dataIndex: 'no', width: 80, align: 'center' },
         { title: '序号', dataIndex: 'no', width: 80, align: 'center' },
         { title: '店内调出类型名称', dataIndex: 'name', align: 'center', ellipsis: true },
         { title: '店内调出类型名称', dataIndex: 'name', align: 'center', ellipsis: true },
         { title: '创建时间', dataIndex: 'createDate', align: 'center' },
         { title: '创建时间', dataIndex: 'createDate', align: 'center' },
-        { title: '操作', scopedSlots: { customRender: 'action' }, width: 240, align: 'center' }
+        { title: '操作', scopedSlots: { customRender: 'action' }, width: 200, align: 'center' }
       ],
       ],
       // 加载数据方法 必须为 Promise 对象
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
       loadData: parameter => {

+ 17 - 4
src/views/customerManagement/customerInfo/list.vue

@@ -110,12 +110,25 @@
       bordered>
       bordered>
       <!-- 操作 -->
       <!-- 操作 -->
       <template slot="action" slot-scope="text, record">
       <template slot="action" slot-scope="text, record">
-        <a-button size="small" v-if="$hasPermissions('B_customer_customerInfo_edit')" type="link" @click="handleEdit(record)" id="customerManagementList-edit-btn">编辑</a-button>
-        <a-button size="small" v-if="$hasPermissions('B_customer_customerInfo_detail')" type="link" @click="handleDetail(record)" id="customerManagementList-detail-btn">详情</a-button>
+        <a-button
+          size="small"
+          v-if="$hasPermissions('B_customer_customerInfo_edit')"
+          type="primary"
+          class="button-info"
+          @click="handleEdit(record)"
+          id="customerManagementList-edit-btn">编辑</a-button>
+        <a-button
+          size="small"
+          v-if="$hasPermissions('B_customer_customerInfo_detail')"
+          type="primary"
+          class="button-success"
+          @click="handleDetail(record)"
+          id="customerManagementList-detail-btn">详情</a-button>
         <a-button
         <a-button
           size="small"
           size="small"
           v-if="$hasPermissions('B_customer_customerInfo_del') && record.satelliteFlag!=1"
           v-if="$hasPermissions('B_customer_customerInfo_del') && record.satelliteFlag!=1"
-          type="link"
+          type="primary"
+          class="button-error"
           @click="handleDel(record)"
           @click="handleDel(record)"
           id="customerManagementList-del-btn">删除</a-button>
           id="customerManagementList-del-btn">删除</a-button>
       </template>
       </template>
@@ -158,7 +171,7 @@ export default {
         { title: '联系电话', dataIndex: 'contactTel', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '联系电话', dataIndex: 'contactTel', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '最后销售时间', dataIndex: 'lastSaleTime', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '最后销售时间', dataIndex: 'lastSaleTime', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '是否卫星仓', dataIndex: 'satelliteFlagDictValue', width: 110, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '是否卫星仓', dataIndex: 'satelliteFlagDictValue', width: 110, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '操作', scopedSlots: { customRender: 'action' }, width: 170, align: 'center', fixed: 'right' }
+        { title: '操作', scopedSlots: { customRender: 'action' }, width: 220, align: 'center', fixed: 'right' }
       ],
       ],
       // 加载数据方法 必须为 Promise 对象
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
       loadData: parameter => {

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

@@ -81,7 +81,6 @@
       :rowKey="(record) => record.id"
       :rowKey="(record) => record.id"
       :columns="columns"
       :columns="columns"
       :data="loadData"
       :data="loadData"
-      :scroll="{ x: 1430 }"
       bordered>
       bordered>
       <!-- 产品分类 -->
       <!-- 产品分类 -->
       <template slot="productTypeName" slot-scope="text, record">
       <template slot="productTypeName" slot-scope="text, record">

+ 21 - 3
src/views/inventoryManagement/warehouse/list.vue

@@ -32,9 +32,27 @@
       <!-- 操作 -->
       <!-- 操作 -->
       <template slot="action" slot-scope="text, record">
       <template slot="action" slot-scope="text, record">
         <!-- record.sysFlag表示该仓库是否默认,为默认仓库时则不可删除不可编辑 -->
         <!-- record.sysFlag表示该仓库是否默认,为默认仓库时则不可删除不可编辑 -->
-        <a-button size="small" v-if="$hasPermissions('M_inventory_warehouse_storingLocation')" type="link" @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" @click="handleEdit(record)" id="warehouseList-edit-btn">编辑</a-button>
-        <a-button size="small" v-if="$hasPermissions('B_inventory_warehouse_del') && record.sysFlag==0" type="link" @click="handleDel(record)" id="warehouseList-del-btn">删除</a-button>
+        <a-button
+          size="small"
+          v-if="$hasPermissions('M_inventory_warehouse_storingLocation')"
+          type="primary"
+          class="button-warning"
+          @click="goStoringLocation(record)"
+          id="warehouseList-storingLocation-btn">仓位管理</a-button>
+        <a-button
+          size="small"
+          v-if="$hasPermissions('B_inventory_warehouse_edit') && record.sysFlag==0"
+          type="primary"
+          class="button-info"
+          @click="handleEdit(record)"
+          id="warehouseList-edit-btn">编辑</a-button>
+        <a-button
+          size="small"
+          v-if="$hasPermissions('B_inventory_warehouse_del') && record.sysFlag==0"
+          type="primary"
+          class="button-error"
+          @click="handleDel(record)"
+          id="warehouseList-del-btn">删除</a-button>
       </template>
       </template>
     </s-table>
     </s-table>
     <!-- 新增/编辑仓库 -->
     <!-- 新增/编辑仓库 -->

+ 16 - 4
src/views/inventoryManagement/warehouse/storingLocation/list.vue

@@ -40,8 +40,20 @@
         <!-- 操作 -->
         <!-- 操作 -->
         <template slot="action" slot-scope="text, record">
         <template slot="action" slot-scope="text, record">
           <!-- record.sysFlag表示该仓库是否默认,为默认仓库时则不可删除不可编辑 -->
           <!-- record.sysFlag表示该仓库是否默认,为默认仓库时则不可删除不可编辑 -->
-          <a-button size="small" v-if="$hasPermissions('B_inventory_warehouse_storingLocation_edit') && record.sysFlag==0" type="link" @click="handleEdit(record)" id="storingLocationList-edit-btn">编辑</a-button>
-          <a-button size="small" v-if="$hasPermissions('B_inventory_warehouse_storingLocation_del') && record.sysFlag==0" type="link" @click="handleDel(record)" id="storingLocationList-del-btn">删除</a-button>
+          <a-button
+            size="small"
+            v-if="$hasPermissions('B_inventory_warehouse_storingLocation_edit') && record.sysFlag==0"
+            type="primary"
+            class="button-info"
+            @click="handleEdit(record)"
+            id="storingLocationList-edit-btn">编辑</a-button>
+          <a-button
+            size="small"
+            v-if="$hasPermissions('B_inventory_warehouse_storingLocation_del') && record.sysFlag==0"
+            type="primary"
+            class="button-error"
+            @click="handleDel(record)"
+            id="storingLocationList-del-btn">删除</a-button>
         </template>
         </template>
       </s-table>
       </s-table>
     </a-card>
     </a-card>
@@ -66,8 +78,8 @@ export default {
       columns: [
       columns: [
         { title: '序号', dataIndex: 'no', width: 80, align: 'center' },
         { title: '序号', dataIndex: 'no', width: 80, align: 'center' },
         { title: '仓位名称', dataIndex: 'name', align: 'center', ellipsis: true },
         { title: '仓位名称', dataIndex: 'name', align: 'center', ellipsis: true },
-        { title: '排序', dataIndex: 'sort', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '操作', scopedSlots: { customRender: 'action' }, align: 'center' }
+        { title: '排序', dataIndex: 'sort', align: 'center', width: 150, customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '操作', scopedSlots: { customRender: 'action' }, width: 200, align: 'center' }
       ],
       ],
       // 加载数据方法 必须为 Promise 对象
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
       loadData: parameter => {

+ 10 - 3
src/views/productManagement/productBrand/list.vue

@@ -41,14 +41,21 @@
           id="productBrandList-enable"
           id="productBrandList-enable"
           checkedChildren="启用"
           checkedChildren="启用"
           unCheckedChildren="禁用"
           unCheckedChildren="禁用"
-          v-if="$hasPermissions('B_product_dealerProductBrand_enable')"
+          v-if="$hasPermissions('B_product_dealerProductBrand_enable')&&record.sysFlag == 0"
           @change="changeStatus(record)"
           @change="changeStatus(record)"
           :checked="record.enabledFlag == 1 ? true : false" />
           :checked="record.enabledFlag == 1 ? true : false" />
         <span v-else> {{ record.enabledFlag==1? '已启用': '已禁用' }} </span>
         <span v-else> {{ record.enabledFlag==1? '已启用': '已禁用' }} </span>
       </template>
       </template>
       <!-- 操作 -->
       <!-- 操作 -->
       <template slot="action" slot-scope="text, record">
       <template slot="action" slot-scope="text, record">
-        <a-button size="small" v-if="$hasPermissions('B_product_dealerProductBrand_edit')" type="link" @click="handleEdit(record)" id="productBrandList-edit-btn">编辑</a-button>
+        <a-button
+          size="small"
+          v-if="$hasPermissions('B_product_dealerProductBrand_edit')&&record.sysFlag == 0"
+          type="primary"
+          class="button-info"
+          @click="handleEdit(record)"
+          id="productBrandList-edit-btn">编辑</a-button>
+        <span v-else>--</span>
       </template>
       </template>
     </s-table>
     </s-table>
     <!-- 新增/编辑产品品牌 -->
     <!-- 新增/编辑产品品牌 -->
@@ -75,7 +82,7 @@ export default {
         { title: '首字母', dataIndex: 'firstChar', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '首字母', dataIndex: 'firstChar', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '创建时间', dataIndex: 'createDate', align: 'center' },
         { title: '创建时间', dataIndex: 'createDate', align: 'center' },
         { title: '状态', scopedSlots: { customRender: 'enabledFlag' }, width: 160, align: 'center' },
         { title: '状态', scopedSlots: { customRender: 'enabledFlag' }, width: 160, align: 'center' },
-        { title: '操作', scopedSlots: { customRender: 'action' }, width: 200, align: 'center' }
+        { title: '操作', scopedSlots: { customRender: 'action' }, width: 120, align: 'center' }
       ],
       ],
       // 加载数据方法 必须为 Promise 对象
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
       loadData: parameter => {

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

@@ -18,27 +18,27 @@
       <!-- 操作 -->
       <!-- 操作 -->
       <template slot="action" slot-scope="text, record">
       <template slot="action" slot-scope="text, record">
         <a-button
         <a-button
-          v-if="record.productTypeLevel<3 && $hasPermissions('B_product_dealerProductType_add')"
-          type="link"
+          v-if="record.productTypeLevel<3 && $hasPermissions('B_product_dealerProductType_add')&&record.sysFlag == 0"
+          type="primary"
+          class="button-success"
           size="small"
           size="small"
           icon="plus"
           icon="plus"
-          class="btn-add-s"
           id="productCategory-addSubItem"
           id="productCategory-addSubItem"
           @click="handleAdd(record)">新增子级</a-button>
           @click="handleAdd(record)">新增子级</a-button>
         <a-button
         <a-button
-          v-if="record.pid != 0 && $hasPermissions('B_product_dealerProductType_edit')"
-          type="link"
+          v-if="record.pid != 0 && $hasPermissions('B_product_dealerProductType_edit')&&record.sysFlag == 0"
+          type="primary"
+          class="button-info"
           size="small"
           size="small"
           icon="edit"
           icon="edit"
-          class="btn-edit-s"
           id="productCategory-edit"
           id="productCategory-edit"
           @click="handleEdit(record)">编辑</a-button>
           @click="handleEdit(record)">编辑</a-button>
         <a-button
         <a-button
-          v-if="record.pid != 0 && $hasPermissions('B_product_dealerProductType_del')"
-          type="link"
+          v-if="record.pid != 0 && $hasPermissions('B_product_dealerProductType_del')&&record.sysFlag == 0"
+          type="primary"
+          class="button-error"
           size="small"
           size="small"
           icon="delete"
           icon="delete"
-          class="btn-del-s"
           id="productCategory-del"
           id="productCategory-del"
           @click="handleDel(record)">删除</a-button>
           @click="handleDel(record)">删除</a-button>
       </template>
       </template>

+ 11 - 3
src/views/productManagement/productInfo/edit.vue

@@ -1,9 +1,9 @@
 <template>
 <template>
   <div class="productInfoEdit-wrap">
   <div class="productInfoEdit-wrap">
-    <a-page-header :ghost="false" @back="handleBack" class="productInfoEdit-back">
+    <a-page-header :ghost="false" :backIcon="false" class="productInfoEdit-back">
       <!-- 自定义的二级文字标题 -->
       <!-- 自定义的二级文字标题 -->
       <template slot="subTitle">
       <template slot="subTitle">
-        <a id="productInfoEdit-back-btn" href="javascript:;" @click="handleBack">返回列表</a>
+        <a id="productInfoEdit-back-btn" href="javascript:;" @click="handleBack"><a-icon type="left" /> 返回列表</a>
       </template>
       </template>
     </a-page-header>
     </a-page-header>
     <a-card size="small" :bordered="false" class="productInfoEdit-table-page-wrapper">
     <a-card size="small" :bordered="false" class="productInfoEdit-table-page-wrapper">
@@ -42,7 +42,10 @@
             allowClear />
             allowClear />
         </a-form-model-item>
         </a-form-model-item>
         <a-form-model-item label="基本单位" prop="unit">
         <a-form-model-item label="基本单位" prop="unit">
-          <v-select code="UNIT" id="productInfoEdit-unit" v-model="form.unit" allowClear placeholder="请选择基本单位"></v-select>
+          <a-input-group compact>
+            <a-input style="width: 80%" v-model="form.unit" id="productInfoEdit-unit-input" placeholder="请输入基本单位" allowClear/>
+            <v-select style="width: 20%" code="UNIT" @change="unitChange" id="productInfoEdit-unit" placeholder="快速选择单位"></v-select>
+          </a-input-group>
         </a-form-model-item>
         </a-form-model-item>
         <a-form-model-item label="产品品牌" prop="productBrandSn">
         <a-form-model-item label="产品品牌" prop="productBrandSn">
           <a-select
           <a-select
@@ -166,6 +169,11 @@ export default {
     }
     }
   },
   },
   methods: {
   methods: {
+    // 选择单位
+    unitChange (a, b) {
+      console.log(a, b)
+      this.form.unit = b.dispName
+    },
     //  获取产品信息
     //  获取产品信息
     getGoodsDetail () {
     getGoodsDetail () {
       dealerProductDetail({ id: this.$route.params.id }).then(res => {
       dealerProductDetail({ id: this.$route.params.id }).then(res => {

+ 23 - 6
src/views/productManagement/productInfo/list.vue

@@ -23,7 +23,7 @@
             <a-col :md="6" :sm="24">
             <a-col :md="6" :sm="24">
               <a-form-item label="产品品牌">
               <a-form-item label="产品品牌">
                 <a-select
                 <a-select
-                  placeholder="请选择"
+                  placeholder="请选择产品品牌"
                   id="productInfoList-productBrandSn"
                   id="productInfoList-productBrandSn"
                   allowClear
                   allowClear
                   v-model="queryParam.productBrandSn"
                   v-model="queryParam.productBrandSn"
@@ -39,6 +39,7 @@
                 <a-cascader
                 <a-cascader
                   @change="changeProductType"
                   @change="changeProductType"
                   change-on-select
                   change-on-select
+                  v-model="productType"
                   :options="productTypeList"
                   :options="productTypeList"
                   :fieldNames="{ label: 'productTypeName', value: 'productTypeSn', children: 'children' }"
                   :fieldNames="{ label: 'productTypeName', value: 'productTypeSn', children: 'children' }"
                   id="productInfoList-productType"
                   id="productInfoList-productType"
@@ -103,8 +104,20 @@
       </template>
       </template>
       <!-- 操作 -->
       <!-- 操作 -->
       <template slot="action" slot-scope="text, record">
       <template slot="action" slot-scope="text, record">
-        <a-button size="small" v-if="$hasPermissions('B_product_dealerProduct_edit')" type="link" @click="handleEdit(record)" id="productInfoList-edit-btn">编辑</a-button>
-        <a-button v-if="$hasPermissions('B_product_dealerProduct_detail')" size="small" type="link" @click="handleDetail(record)" id="productInfoList-detail-btn">详情</a-button>
+        <a-button
+          size="small"
+          v-if="$hasPermissions('B_product_dealerProduct_edit')"
+          type="primary"
+          class="button-info"
+          @click="handleEdit(record)"
+          id="productInfoList-edit-btn">编辑</a-button>
+        <a-button
+          v-if="$hasPermissions('B_product_dealerProduct_detail')"
+          size="small"
+          type="primary"
+          class="button-success"
+          @click="handleDetail(record)"
+          id="productInfoList-detail-btn">详情</a-button>
       </template>
       </template>
     </s-table>
     </s-table>
     <!-- 产品详情 -->
     <!-- 产品详情 -->
@@ -124,10 +137,12 @@ export default {
   data () {
   data () {
     return {
     return {
       advanced: false, // 高级搜索 展开/关闭
       advanced: false, // 高级搜索 展开/关闭
+      productType: [],
       queryParam: { //  查询条件
       queryParam: { //  查询条件
         code: '', //  产品编码
         code: '', //  产品编码
         name: '', //  产品名称
         name: '', //  产品名称
         origCode: '', //  原厂编码
         origCode: '', //  原厂编码
+        sysFlag: '0',
         productBrandSn: undefined, //  产品品牌
         productBrandSn: undefined, //  产品品牌
         productTypeSn1: '', //  产品一级分类
         productTypeSn1: '', //  产品一级分类
         productTypeSn2: '', //  产品二级分类
         productTypeSn2: '', //  产品二级分类
@@ -146,7 +161,7 @@ export default {
         { title: '终端价', dataIndex: 'terminalPrice', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '终端价', dataIndex: 'terminalPrice', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '创建时间', dataIndex: 'createDate', width: 160, align: 'center' },
         { title: '创建时间', dataIndex: 'createDate', width: 160, align: 'center' },
         { title: '状态', scopedSlots: { customRender: 'enabledFlag' }, width: 140, align: 'center' },
         { title: '状态', scopedSlots: { customRender: 'enabledFlag' }, width: 140, align: 'center' },
-        { title: '操作', scopedSlots: { customRender: 'action' }, width: 130, align: 'center', fixed: 'right' }
+        { title: '操作', scopedSlots: { customRender: 'action' }, width: 200, align: 'center', fixed: 'right' }
       ],
       ],
       // 加载数据方法 必须为 Promise 对象
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
       loadData: parameter => {
@@ -182,6 +197,7 @@ export default {
       this.queryParam.productTypeSn2 = ''
       this.queryParam.productTypeSn2 = ''
       this.queryParam.productTypeSn3 = ''
       this.queryParam.productTypeSn3 = ''
       this.queryParam.enabledFlag = undefined
       this.queryParam.enabledFlag = undefined
+      this.productType = []
       this.$refs.table.refresh(true)
       this.$refs.table.refresh(true)
     },
     },
     //  新增/编辑
     //  新增/编辑
@@ -197,6 +213,7 @@ export default {
 
 
     },
     },
     filterOption (input, option) {
     filterOption (input, option) {
+      console.log(option.componentOptions.children[0].text, 'option')
       return (
       return (
         option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
         option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
       )
       )
@@ -269,7 +286,7 @@ export default {
     },
     },
     //  产品品牌  列表
     //  产品品牌  列表
     getProductBrand () {
     getProductBrand () {
-      dealerProductBrandQuery({}).then(res => {
+      dealerProductBrandQuery({ 'sysFlag': '0' }).then(res => {
         if (res.status == 200) {
         if (res.status == 200) {
           this.productBrandList = res.data
           this.productBrandList = res.data
         } else {
         } else {
@@ -279,7 +296,7 @@ export default {
     },
     },
     //  产品分类  列表
     //  产品分类  列表
     getProductType () {
     getProductType () {
-      dealerProductTypeList({}).then(res => {
+      dealerProductTypeList({ 'sysFlag': '0' }).then(res => {
         if (res.status == 200) {
         if (res.status == 200) {
           this.productTypeList = res.data
           this.productTypeList = res.data
         } else {
         } else {

+ 9 - 3
src/views/productManagement/productInfoJg/list.vue

@@ -85,6 +85,11 @@
         <span v-if="record.productTypeName2 || record.productTypeName3">{{ record.productTypeName2 }} {{ record.productTypeName3 ? '>' : '' }} {{ record.productTypeName3 }}</span>
         <span v-if="record.productTypeName2 || record.productTypeName3">{{ record.productTypeName2 }} {{ record.productTypeName3 ? '>' : '' }} {{ record.productTypeName3 }}</span>
         <span v-else>--</span>
         <span v-else>--</span>
       </template>
       </template>
+      <!-- 状态 -->
+      <template slot="onlineFalgDictValue" slot-scope="text, record">
+        <span v-if="record.onlineFalgDictValue == '下架'" style="color: #999;">{{ record.onlineFalgDictValue }} </span>
+        <span v-else style="color: #00aa00;">{{ record.onlineFalgDictValue }}</span>
+      </template>
     </s-table>
     </s-table>
   </a-card>
   </a-card>
 </template>
 </template>
@@ -104,6 +109,7 @@ export default {
         code: '', //  产品编码
         code: '', //  产品编码
         name: '', //  产品名称
         name: '', //  产品名称
         origCode: '', //  原厂编码
         origCode: '', //  原厂编码
+        sysFlag: '1',
         productBrandSn: undefined, //  产品品牌
         productBrandSn: undefined, //  产品品牌
         productTypeSn1: '', //  产品一级分类
         productTypeSn1: '', //  产品一级分类
         productTypeSn2: '', //  产品二级分类
         productTypeSn2: '', //  产品二级分类
@@ -122,7 +128,7 @@ export default {
         { title: '产品分类', scopedSlots: { customRender: 'productType' }, width: 240, align: 'center' },
         { title: '产品分类', scopedSlots: { customRender: 'productType' }, width: 240, align: 'center' },
         { title: '终端价', dataIndex: 'terminalPrice', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '终端价', dataIndex: 'terminalPrice', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '创建时间', dataIndex: 'createDate', width: 160, align: 'center' },
         { title: '创建时间', dataIndex: 'createDate', width: 160, align: 'center' },
-        { title: '状态', dataIndex: 'onlineFalgDictValue', width: 140, align: 'center' }
+        { title: '状态', scopedSlots: { customRender: 'onlineFalgDictValue' }, width: 140, align: 'center' }
       ],
       ],
       // 加载数据方法 必须为 Promise 对象
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
       loadData: parameter => {
@@ -193,7 +199,7 @@ export default {
     },
     },
     //  产品品牌  列表
     //  产品品牌  列表
     getProductBrand () {
     getProductBrand () {
-      productBrandQuery({}).then(res => {
+      productBrandQuery({ 'sysFlag': '1' }).then(res => {
         if (res.status == 200) {
         if (res.status == 200) {
           this.productBrandList = res.data
           this.productBrandList = res.data
         } else {
         } else {
@@ -203,7 +209,7 @@ export default {
     },
     },
     //  产品分类  列表
     //  产品分类  列表
     getProductType () {
     getProductType () {
-      productTypeQuery({}).then(res => {
+      productTypeQuery({ 'sysFlag': '1' }).then(res => {
         if (res.status == 200) {
         if (res.status == 200) {
           this.productTypeList = res.data
           this.productTypeList = res.data
         } else {
         } else {

+ 31 - 10
src/views/purchasingManagement/purchaseOrder/list.vue

@@ -103,15 +103,36 @@
       </template>
       </template>
       <!-- 操作 -->
       <!-- 操作 -->
       <template slot="action" slot-scope="text, record">
       <template slot="action" slot-scope="text, record">
-        <a-button size="small" type="link" @click="handleEdit(record)" id="purchasingManagement-edit-btn">编辑</a-button>
-        <a-divider type="vertical" style="margin: 0;" />
-        <a-button size="small" type="link" @click="handleDetail(record)" id="purchasingManagement-detail-btn">详情</a-button>
-        <a-divider type="vertical" style="margin: 0;" />
-        <a-button size="small" type="link" @click="handleSubmit(record)" id="purchasingManagement-submit-btn">提交</a-button>
-        <a-divider type="vertical" style="margin: 0;" />
-        <a-button size="small" type="link" @click="handleWarehouse(record)" id="purchasingManagement-warehouse-btn">签收入库</a-button>
-        <a-divider type="vertical" style="margin: 0;" />
-        <a-button size="small" type="link" @click="handleDel(record)" id="purchasingManagement-del-btn">删除</a-button>
+        <a-button
+          size="small"
+          type="primary"
+          class="button-info"
+          @click="handleEdit(record)"
+          id="purchasingManagement-edit-btn">编辑</a-button>
+        <a-button
+          size="small"
+          type="primary"
+          class="button-success"
+          @click="handleDetail(record)"
+          id="purchasingManagement-detail-btn">详情</a-button>
+        <a-button
+          size="small"
+          type="primary"
+          class="button-primary"
+          @click="handleSubmit(record)"
+          id="purchasingManagement-submit-btn">提交</a-button>
+        <a-button
+          size="small"
+          type="primary"
+          class="button-warning"
+          @click="handleWarehouse(record)"
+          id="purchasingManagement-warehouse-btn">签收入库</a-button>
+        <a-button
+          size="small"
+          type="primary"
+          class="button-error"
+          @click="handleDel(record)"
+          id="purchasingManagement-del-btn">删除</a-button>
       </template>
       </template>
     </s-table>
     </s-table>
     <!-- 选择基本信息弹框 -->
     <!-- 选择基本信息弹框 -->
@@ -146,7 +167,7 @@ export default {
         { title: '采购金额(¥)', dataIndex: 'totalAmount', width: 115, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '采购金额(¥)', dataIndex: 'totalAmount', width: 115, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '业务状态', scopedSlots: { customRender: 'auditStatus' }, width: 100, align: 'center' },
         { title: '业务状态', scopedSlots: { customRender: 'auditStatus' }, width: 100, align: 'center' },
         { title: '财务状态', scopedSlots: { customRender: 'financialStatus' }, width: 100, align: 'center' },
         { title: '财务状态', scopedSlots: { customRender: 'financialStatus' }, width: 100, align: 'center' },
-        { title: '操作', scopedSlots: { customRender: 'action' }, width: 290, align: 'center', fixed: 'right' }
+        { title: '操作', scopedSlots: { customRender: 'action' }, width: 350, align: 'center', fixed: 'right' }
       ],
       ],
       // 加载数据方法 必须为 Promise 对象
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
       loadData: parameter => {

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

@@ -38,7 +38,13 @@
       bordered>
       bordered>
       <!-- 操作 -->
       <!-- 操作 -->
       <template slot="action" slot-scope="text, record">
       <template slot="action" slot-scope="text, record">
-        <a-button v-if="$hasPermissions('B_supplier_supplierInfo_edit')" size="small" type="link" @click="handleEdit(record)" id="supplierInfoList-edit-btn">编辑</a-button>
+        <a-button
+          v-if="$hasPermissions('B_supplier_supplierInfo_edit')"
+          size="small"
+          type="primary"
+          class="button-info"
+          @click="handleEdit(record)"
+          id="supplierInfoList-edit-btn">编辑</a-button>
       </template>
       </template>
     </s-table>
     </s-table>
   </a-card>
   </a-card>