feat: 销售订单和发货单列表增加业务员和筛选

src/views/saleManage/saleOrder/components/searchTable.vue

@@ -38,14 +38,14 @@
             placeholder: ''
           },
           {
-            label: '销售类型',
+            label: '销售类型：',
             value: 'saleType',
             width: 380,
             type: 'DictSelection',
             dictName: '销售类型'
           },
           {
-            label: '库存状态',
+            label: '库存状态：',
             value: 'hasStock',
             width: 380,
             type: 'select',
@@ -80,7 +80,7 @@
             placeholder: ''
           },
           {
-            label: '编码',
+            label: '编码：',
             value: 'productCode',
             width: 380,
             type: 'input',
@@ -95,7 +95,7 @@
             placeholder: '请输入'
           },
           {
-            label: '生产编号',
+            label: '生产编号：',
             value: 'productionCodes',
             width: 380,
             type: 'input',
@@ -110,7 +110,7 @@
           //   placeholder: ''
           // },
           {
-            label: '订单类型',
+            label: '订单类型：',
             value: 'needProduces',
             width: 380,
             type: 'select',
@@ -135,7 +135,7 @@
             placeholder: ''
           },
           {
-            label: '审核状态',
+            label: '审核状态：',
             value: 'orderStatus',
             type: 'select',
             planList: reviewStatusSelect,
@@ -143,13 +143,20 @@
             placeholder: ''
           },
           {
-            label: '订单进度',
+            label: '订单进度：',
             value: 'progress',
             type: 'select',
             planList: saleOrderProgressStatusEnum,
             width: 380,
             placeholder: ''
           },
+          {
+            label: '业务员：',
+            value: 'salesmanName',
+            width: 380,
+            type: 'input',
+            placeholder: '请输入'
+          },
           {
             label: '创建人：',
             value: 'createUserName',

src/views/saleManage/saleOrder/index.vue

@@ -945,6 +945,13 @@ export default {
             return reviewStatus[_row.orderStatus];
           }
         },
+        {
+          prop: 'salesmanName',
+          label: '业务员',
+          align: 'center',
+          showOverflowTooltip: true,
+          minWidth: 80
+        },
 
         {
           prop: 'createUserName',

src/views/saleManage/saleOrder/invoice/components/searchTable.vue

@@ -99,6 +99,13 @@ export default {
           planList: orderStatusOptions,
           placeholder: '请选择'
         },
+        {
+          label: '业务员：',
+          value: 'salesmanName',
+          width: 380,
+          type: 'input',
+          placeholder: '请输入'
+        },
         {
           label: '创建人：',
           value: 'createUserName',

src/views/saleManage/saleOrder/invoice/index.vue

@@ -539,6 +539,13 @@
               return options.find(item => item.value == cellValue)?.label || '';
             }
           },
+          {
+            prop: 'salesmanName',
+            label: '业务员',
+            align: 'center',
+            showOverflowTooltip: true,
+            minWidth: 80
+          },
           {
             prop: 'createUserName',
             label: '创建人',

vue.config.js

@@ -44,8 +44,8 @@ module.exports = {
     proxy: {
       // 当我们的本地的请求 有/api的时候，就会代理我们的请求地址向另外一个服务器发出请求
       '/api': {
-        target: 'http://localhost:18086', //开发
-        // target: 'http://192.168.1.251:18186', //测试
+        // target: 'http://localhost:18086', //开发
+        target: 'http://192.168.1.18:18086', //测试
         // target: 'http://192.168.1.15:18086',//罗
         // target: 'http://192.168.1.144:18086',//付