前端 页面筛选样式统一及部分bug sdy

src/api/V2/taskspost/index.js

@@ -31,4 +31,8 @@ export const API_GET_CONTRACT_GOODSNAME = '/contractGoodsInfo/getGoodsName'
 //移库列表
 export const API_GET_OUT_MOVE = '/inOutWarehouseTask/selectInOutWarehouseTaskRelocation'   
 //移库详情                                                         
-export const API_GET_OUT_MOVELOOK = '/inOutWarehouseTask/getInOutWarehouseTaskRelocation'
+export const API_GET_OUT_MOVELOOK = '/inOutWarehouseTask/getInOutWarehouseTaskRelocation'
+//运输任务状态修改
+export const API_POST_OUT_STATES = '/tranTaskInfo/api/editStatus'
+//移库任务状态修改
+export const API_POST_OUT_MOVESTATES = '/inOutWarehouseTask/api/editStatus'

src/model/tasksport/index.js

@@ -17,7 +17,9 @@ import {
     API_POST_OUT_DEL,
     API_GET_CONTRACT_GOODSNAME,
     API_GET_OUT_MOVE,
-    API_GET_OUT_MOVELOOK
+    API_GET_OUT_MOVELOOK,
+    API_POST_OUT_STATES,
+    API_POST_OUT_MOVESTATES
 } from '@/api/V2/taskspost'
 //运输任务列表
 export const gain = appRx.get(API_GET_TRAN_LIST, errorCatcher, errorHandle, filter)
@@ -51,3 +53,7 @@ export const getGoodsName = appRx.get(API_GET_CONTRACT_GOODSNAME, errorCatcher,
 export const moveList = appRx.get(API_GET_OUT_MOVE, errorCatcher, errorHandle, filter)
 //移库详情
 export const moveLook = appRx.get(API_GET_OUT_MOVELOOK, errorCatcher, errorHandle, filter)
+//运输任务状态修改
+export const states = appRx.post(API_POST_OUT_STATES, errorCatcher, errorHandle, filter)
+//移库任务状态修改
+export const movestates = appRx.post(API_POST_OUT_MOVESTATES, errorCatcher, errorHandle, filter)

src/views/contractManagement/purchaseContract.vue

@@ -2,7 +2,7 @@
 <!--2019年5月30日 20:25:16 by jlx-->
 <template>
   <div>
-    <BaseHeaderLayout :leftSpan="10">
+    <BaseHeaderLayout :leftSpan="8">
       <template slot="left">
         <ws-button type="primary" @click="handleAdd()"
         v-hasPermission="
@@ -30,6 +30,7 @@
         >
       </template>
       <template slot="right">
+          <span style="width: 142px; display: inline-block;color: #8890B1;">状态：</span>
         <ws-select
           v-model="searchTypeText"
           placeholder=""
@@ -42,6 +43,7 @@
             :key="item.value"
             :label="item.value"
             :value="item.value"
+            style="color: #8890B1;"
           />
         </ws-select>
 
@@ -918,4 +920,7 @@ export default {
     padding: 0 !important;
   }
 }
+/deep/.typeselect .el-input__inner{
+   color: #8890B1;
+}
 </style>

src/views/contractManagement/salesContract.vue

@@ -3,7 +3,7 @@
 <!--2019年5月30日 20:25:16 by jlx-->
 <template>
   <div>
-    <BaseHeaderLayout :leftSpan="10">
+    <BaseHeaderLayout :leftSpan="8">
       <template slot="left">
         <ws-button
           type="primary"
@@ -33,6 +33,7 @@
         >
       </template>
       <template slot="right">
+        <span style="width: 142px; display: inline-block;color: #8890B1;">状态：</span>
         <ws-select
           v-model="searchTypeText"
           placeholder=""
@@ -45,6 +46,7 @@
             :key="item.value"
             :label="item.value"
             :value="item.value"
+            style="color: #8890B1;"
           />
         </ws-select>
 
@@ -970,4 +972,7 @@ export default {
     border-radius: 4px;
   }
 }
+/deep/.typeselect .el-input__inner{
+   color: #8890B1;
+}
 </style>

src/views/taskManagement/moveWarehouseTask.vue

@@ -3,22 +3,36 @@
   <div>
     <BaseHeaderLayout :leftSpan="12">
       <template slot="left">
-        <ws-button class="but" type="primary" @click="handlestatus(1)">
+        <!-- <ws-button class="but" type="primary" @click="handlestatus(1)">
           执行中</ws-button
         >
         <ws-button class="but" @click="handlestatus(2)">已完成</ws-button>
-        <ws-button class="but" @click="handlestatus('')">全部任务</ws-button>
+        <ws-button class="but" @click="handlestatus('')">全部任务</ws-button> -->
       </template>
       <template slot="right">
+        <span style="width: 70px; display: inline-block;color: #8890B1;">状态：</span>
+        <ws-select
+          v-model="searchTypeText"
+          placeholder=""
+          class="typeselect"
+          @change="selecttaskType"
+          :value="searchType"
+        >
+          <ws-option
+            v-for="item in taskTypeList"
+            :key="item.value"
+            :label="item.value"
+            :value="item.value"
+            style="color: #8890B1;"
+          />
+        </ws-select>
         <ws-input
-          v-model="warehouseName"
+          v-model="searchKeyWord"
           placeholder="可按移库任务编号、发货库和收货库查找"
           clearable
           maxlength="500"
           type="input"
         ></ws-input>
-        <!-- v-hasPermission="'procurement.sparepart.directShip'" -->
-        <!-- <div > -->
         <ws-button class="find" type="primary" @click="lookUp()"
           ><img
             width="16"
@@ -61,9 +75,12 @@
         </el-table-column>
         <el-table-column prop="weightIn" label="入库量（吨）">
         </el-table-column>
-        <el-table-column prop="stockReturn" label="退库量（吨）">
+        <el-table-column prop="stockReturnCount" label="退库量（吨）">
         </el-table-column>
         <el-table-column prop="transportLoss" label="运输损耗（吨）">
+           <template scope="scope">
+            {{ scope.row.weight - scope.row.weightIn - scope.row.stockReturnCount}}
+          </template> 
         </el-table-column>
         <el-table-column prop="publisher" label="发布者"> </el-table-column>
         <el-table-column prop="taskStatus" label="状态">
@@ -144,11 +161,9 @@
   </div>
 </template>
 <script>
-import { outdelete, moveList } from '@/model/tasksport/index'
-import { downloadFile } from '@/utils/batchDown'
+import {  moveList,movestates} from '@/model/tasksport/index'
 import Pagination from '@/components/Pagination'
 import WsUpload from '@/components/WsUpload'
-import { dayjs, fmoney, EventBus } from 'base-core-lib'
 export default {
   name: 'viewSpareMoney',
   components: {
@@ -180,22 +195,23 @@ export default {
       gainList: [],
       currentPage: 1,
       pageSize: 10,
-      searchType: 3,
-      searchTypeText: '未完成',
+      searchType: 1,
+      searchTypeText: '待审核',
       searchKeyWord: '',
       contractType: 2,
       taskTypeKey: 3,
-      sendWarehouse: '',
-      receiveWarehouse: '',
       moveTaskNo: '',
-      // 提交类型
-      submitType: true,
       size: 10,
       spanArr: [],
-      warehouseName: '',
+       taskTypeList: [
+        { value: '待审核', type: 1 },
+        { value: '执行中', type: 3 },
+         { value: '已驳回', type: 2 },
+        { value: '已完成', type: 4 },
+        { value: '全部任务', type: '' },
+      ],
       deptBudgetTotal: 0,
       compId: sessionStorage.getItem('ws-pf_compId'),
-      deptCircularPage: {},
       historyList: [],
       pickerBeginDateBefore: {
         disabledDate: (time) => {
@@ -209,54 +225,21 @@ export default {
     this.getList()
     this.showType = this.isShow
   },
-  //   mounted(){
-  //     this.getList()
-  //   },
+
   methods: {
     //查找
     lookUp() {
       this.currentPage = 1
       this.getList()
     },
-    deleteclick(row) {
-      var text = ''
-      if (
-        (row.taskTypeKey == 3 && row.inOutType == '移库出库') ||
-        (row.taskTypeKey == 4 && row.inOutType == '销售出库')
-      ) {
-        text = '相同任务编号的任务将一并删除且不可恢复，是否确定删除？'
-      } else {
-        text = `运输任务删除后不可恢复，是否确定删除？`
-      }
-      //cancelButtonClass: "btn-custom-cancel"
-      this.$confirm(text, {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning',
-      })
-        .then(() => {
-          outdelete({
-            id: row.id,
-            relevanceId: row.relevanceId,
-            inOutFlag: row.inOutFlag,
-          })
-            .toPromise()
-            .then((response) => {
-              this.getList()
-            })
-        })
-        .catch(() => {
-          return false
-        })
-    },
     getList() {
       moveList({
         compId: sessionStorage.getItem('ws-pf_compId'),
         currentPage: this.currentPage,
         pageSize: this.pageSize,
         taskTypeKey: this.taskTypeKey,
+        searchType : this.searchType,
         searchKeyWord: this.searchKeyWord,
-        id: this.id,
       })
         .toPromise()
         .then((response) => {
@@ -279,21 +262,22 @@ export default {
         },
       })
     },
+     selecttaskType(e) {
+      for (var i = 0; i < this.taskTypeList.length; i++) {
+        if (this.taskTypeList[i].value == e) {
+          this.searchType = this.taskTypeList[i].type
+        }
+      }
+    },
 
     getSpanArr(data) {
       let that = this
-
       //页面展示的数据，不一定是全部的数据，所以每次都清空之前存储的 保证遍历的数据是最新的数据。以免造成数据渲染混乱
-
       that.spanArr = []
-
       that.pos = 0
-
       //遍历数据
-
       data.forEach((item, index) => {
         //判断是否是第一项
-
         // if (index === 0) {
         //   this.spanArr.push(1)
         //   this.pos = 0
@@ -308,7 +292,7 @@ export default {
           this.spanArr.push(1)
           this.pos = index
         }
-        // }
+    
       })
     },
     dateFormat(fmt, date) {
@@ -348,9 +332,9 @@ export default {
     },
     editClick(row) {
       var status = ''
-      if (row.status == '待审核' || row.status == '已完成') {
+      if (row.taskStatus == '待审核' || row.taskStatus == '已完成') {
         status = '执行中'
-      } else if (row.status == '执行中') {
+      } else if (row.taskStatus == '执行中') {
         status = '已完成'
       }
       //cancelButtonClass: "btn-custom-cancel"
@@ -360,7 +344,7 @@ export default {
         type: 'warning',
       })
         .then(() => {
-          editstatus({ id: row.id })
+          movestates({ id: row.id })
             .toPromise()
             .then((response) => {
               this.$notify.success({
@@ -377,19 +361,7 @@ export default {
           return false
         })
     },
-    selecttaskType(e) {
-      for (var i = 0; i < this.taskTypeList.length; i++) {
-        if (this.taskTypeList[i].value == e) {
-          this.searchType = this.taskTypeList[i].type
-        }
-      }
-    },
-    handleExamine(row) {
-      this.$router.push({
-        name: 'salesContractExamine',
-        query: { id: row.id },
-      })
-    },
+
     // 关闭 dialog时 处理文件url 初始化upload组件
     handleCloe() {
       this.dialogViewSpareMoney = false
@@ -401,10 +373,7 @@ export default {
           this.historyList = response
         })
     },
-    find() {
-      this.currentPage = 1
-      this.getList()
-    },
+
   },
 }
 </script>
@@ -477,4 +446,32 @@ export default {
 .el-pagination {
   text-align: center;
 }
+.el-select{
+  width: 30%;
+    margin-right: 10px;
+}
+//状态样式
+.executory,
+.inExecution,
+.done {
+  width: 6px;
+  height: 6px;
+  display: inline-block;
+  border-radius: 50%;
+  position: relative;
+  top: -1px;
+  font-size: 14px;
+}
+.executory {
+  background: #ff9f24;
+}
+.inExecution {
+  background: #5878e8;
+}
+.done {
+  background: #50cad4;
+}
+/deep/.typeselect .el-input__inner{
+   color: #8890B1;
+}
 </style>

src/views/taskManagement/moveWarehouseTaskLook.vue

@@ -28,8 +28,11 @@
       :model="deptBudgetList"
     >
       <div class="small-title" style="font-size: 16px">任务详情</div>
-      
-      <span>移库任务编号:  <span style="font-weight: 600;">{{ this.moveTaskNo }}</span></span>
+
+      <span
+        >移库任务编号:
+        <span style="font-weight: 600">{{ this.moveTaskNo }}</span></span
+      >
       <div v-for="(item, index) in moveLookData" :key="index">
         <ws-info-table class="inout" v-show="item.inOutType == '移库出库'">
           <!--出货库-->
@@ -55,14 +58,14 @@
           </ws-form-item>
           <el-divider direction="vertical" class="line"></el-divider>
           <!--预计出库日期-->
-          <ws-form-item label="预计出库日期:" span="1" prop="predictDate">
+          <ws-form-item label="预计出库日期：" span="1" prop="predictDate">
             {{ item.predictDate }}
           </ws-form-item>
         </ws-info-table>
         <ws-info-table class="inout" v-show="item.inOutType == '移库入库'">
           <div class="library">
             <span style="margin-left: 14px">
-              入货库：{{ item.receiveWarehouse }}</span
+              入货库：{{ item.warehouseName }}</span
             >
             <span style="margin-left: 10px">{{ item.taskStatus }}</span>
           </div>
@@ -77,12 +80,12 @@
           </ws-form-item>
           <el-divider direction="vertical" class="line"></el-divider>
           <!-- 仓位 -->
-          <ws-form-item label="仓位:" span="1" prop="deliveryVolume">
+          <ws-form-item label="仓位：" span="1" prop="deliveryVolume">
             {{ item.binNumber == null ? '未指定' : item.binNumber }}
           </ws-form-item>
           <el-divider direction="vertical" class="line"></el-divider>
           <!--预计入库日期-->
-          <ws-form-item label="预计入库日期:" span="1" prop="predictDate">
+          <ws-form-item label="预计入库日期：" span="1" prop="predictDate">
             {{ item.predictDate }}
           </ws-form-item>
         </ws-info-table>
@@ -97,40 +100,40 @@
         <el-input
           placeholder="信息暂无"
           :disabled="true"
-          v-model="this.moveLookData[0].goodsName"
+          v-model="this.goodsName"
         ></el-input>
         <el-divider direction="vertical" class="line1"></el-divider>
         <el-input
           placeholder="信息暂无"
           :disabled="true"
-          v-model="this.moveLookData[0].grade"
+          v-model="this.grade"
         ></el-input>
         <el-divider direction="vertical" class="line1"></el-divider>
         <el-input
           placeholder="信息暂无"
           :disabled="true"
-          v-model="this.moveLookData[0].bulkDensity"
+          v-model="this.bulkDensity+'g/L(容)'"
         >
         </el-input>
         <el-divider direction="vertical" class="line1"></el-divider>
         <el-input
           placeholder="信息暂无"
           :disabled="true"
-          v-model="this.moveLookData[0].waterContent"
+          v-model="this.waterContent+'%(水)'"
         >
         </el-input>
         <el-divider direction="vertical" class="line1"></el-divider>
         <el-input
           placeholder="信息暂无"
           :disabled="true"
-          v-model="this.moveLookData[0].weight"
+          v-model="this.weight+'(吨)'"
         >
         </el-input>
         <el-divider direction="vertical" class="line1"></el-divider>
         <el-input
           placeholder="信息暂无"
           :disabled="true"
-          v-model="this.moveLookData[0].unitPrice"
+          v-model="this.unitPrice +'(元/吨)'"
         >
         </el-input>
       </ws-info-table>
@@ -139,15 +142,15 @@
       >
       <!--业务描述-->
       <ws-input
-        v-model="this.moveLookData[0].businessDescribe"
+        v-model="businessDescribe"
         type="textarea"
         row="3"
-        placeholder="请输入备注信息，不超过200字"
+        placeholder="暂无"
         maxlength="200"
       />
       <div class="small-title" style="font-size: 16px">实际流转数量</div>
       <ws-info-table class="flow">
-        <el-table :data="moveLookData" height="90" border style="width: 100%">
+        <el-table :data="moveLookData" height="90" border style="width: 100%;">
           <el-table-column prop="weightOut" label="累计出库量（吨）">
             <template>
               <div class="weights">{{ this.weightOut }}</div>
@@ -171,7 +174,9 @@
         <el-table :data="moveLookData" height="90" border style="width: 100%">
           <el-table-column prop="stockReturnCount" label="累计退库量（吨）">
             <template>
-              <div class="weights">{{ this.retreat == null ? 0: this.retreat}}</div>
+              <div class="weights">
+                {{ this.retreat == null ? 0 : this.retreat }}
+              </div>
             </template>
           </el-table-column>
         </el-table>
@@ -240,6 +245,13 @@ export default {
       weightIn: 0,
       transportLoss: 0,
       retreat: 0,
+      goodsName: '',
+      grade: '',
+      bulkDensity: 0,
+      waterContent: 0,
+      weight: 0,
+      unitPrice: 0,
+      businessDescribe:'',
     }
   },
 
@@ -291,6 +303,13 @@ export default {
               this.weightIn = this.moveLookData[i].weight
             }
             this.transportLoss = this.weightOut - this.weightIn
+            this.goodsName = this.moveLookData[0].goodsName
+            this.grade = this.moveLookData[0].grade
+            this.bulkDensity = this.moveLookData[0].bulkDensity
+            this.waterContent = this.moveLookData[0].waterContent
+            this.weight = this.moveLookData[0].weight
+            this.unitPrice = this.moveLookData[0].unitPrice
+            this.businessDescribe = this.moveLookData[0].businessDescribe
           }
         })
     },
@@ -405,7 +424,7 @@ export default {
   background: #fff;
   font-size: 14px;
   font-weight: 400;
-  width: 40%;
+  width: 52%;
 }
 
 .button-container {
@@ -591,6 +610,9 @@ export default {
 .line1 {
   height: 50px;
 }
+/deep/.is-disabled .el-input__inner{
+   margin-top: 4px;
+}
 //业务描述
 /deep/.el-textarea {
   width: 90%;
@@ -636,10 +658,13 @@ export default {
   width: 100%;
   height: 50px;
   text-align: center;
-  // border-right: 1px solid #d8dce6;
   line-height: 50px;
 }
 /deep/.el-textarea__inner {
   border: none;
 }
+/deep/.el-table th>.cell{
+    color: #000 !important;
+    font-weight: 400;
+}
 </style>

src/views/taskManagement/tranManagementTransport.vue

@@ -1,7 +1,7 @@
 <!--运输任务-->
 <template>
   <div>
-    <BaseHeaderLayout :leftSpan="12">
+    <BaseHeaderLayout :leftSpan="8">
       <template slot="left">
         <ws-button
           class="but"
@@ -10,15 +10,42 @@
           v-hasPermission="
            `transportationTask.transportation.transportationInfo.add`
           "
-        >添加</ws-button>
-        <ws-button class="but" :type="primary == 1 ? 'primary' : ''" @click="handlestatus(1)">执行中</ws-button>
+        ><img
+            width="13"
+            height="13"
+            style="
+              vertical-align: text-top;
+              position: relative;
+              top: 2px;
+              left: -4px;
+            "
+            src="../../../public/img/header-add.png"
+            alt=""
+          />添加</ws-button>
+        <!-- <ws-button class="but" :type="primary == 1 ? 'primary' : ''" @click="handlestatus(1)">执行中</ws-button>
         <ws-button class="but" :type="primary == 2 ? 'primary' : ''" @click="handlestatus(2)">已完成</ws-button>
-        <ws-button class="but" :type="primary == 3 ? 'primary' : ''" @click="handlestatus('')">全部任务</ws-button>
+        <ws-button class="but" :type="primary == 3 ? 'primary' : ''" @click="handlestatus('')">全部任务</ws-button> -->
       </template>
       <template slot="right">
-        <span style="width: 134px; display: inline-block">起点：</span>
+        <span style="width: 142px; display: inline-block;color: #8890B1;">状态：</span>
+        <ws-select
+          v-model="searchTypeText"
+          placeholder=""
+          class="typeselect"
+          @change="selecttaskType"
+          :value="searchType"
+        >
+          <ws-option
+            v-for="item in taskTypeList"
+            :key="item.value"
+            :label="item.value"
+            :value="item.value"
+            style="color: #8890B1;"
+          />
+        </ws-select>
+        <span style="width: 142px; display: inline-block;color: #8890B1;">起点：</span>
         <el-input label="起点" placeholder="请输入起点" clearable maxlength="200" type="input"></el-input>
-        <span style="width: 134px; display: inline-block">终点：</span>
+        <span style="width: 142px; display: inline-block;color: #8890B1;">终点：</span>
         <el-input label="终点" placeholder="请输入终点" clearable maxlength="200" type="input"></el-input>
         <el-input
           v-model="warehouseName"
@@ -126,13 +153,6 @@
         </el-table-column>
         <el-table-column prop="seller" label="操作" width="300">
           <template slot-scope="scope">
-            <!-- <ws-button class="completed" @click="nocomplete(scope.row)">
-              查看
-            </ws-button>
-            <ws-button class="putstorage" @click="delivery(scope.row)">
-              编辑
-            </ws-button>
-            <ws-button @click="deleteclick(scope.row)"> 删除 </ws-button>-->
             <div
               class="record"
               @click="nocomplete(scope.row)"
@@ -161,11 +181,9 @@
   </div>
 </template>
 <script>
-import { gain, deltran } from '@/model/tasksport/index'
-import { downloadFile } from '@/utils/batchDown'
+import { gain, deltran,states } from '@/model/tasksport/index'
 import Pagination from '@/components/Pagination'
 import WsUpload from '@/components/WsUpload'
-import { dayjs, fmoney, EventBus } from 'base-core-lib'
 export default {
   name: 'viewSpareMoney',
   components: {
@@ -199,7 +217,7 @@ export default {
       primary: 1,
       pageSize: 10,
       searchType: 1,
-      searchTypeText: '未完成',
+      searchTypeText: '执行中',
       searchKeyWord: '',
       contractType: 2,
       // 提交类型
@@ -215,7 +233,12 @@ export default {
           return time.getTime() > Date.now()
         }
       },
-      accessoryTFs: false
+      accessoryTFs: false,
+       taskTypeList: [
+        { value: '执行中', type: 1 },
+        { value: '已完成', type: 2 },
+        { value: '全部任务', type: 3 },
+      ],
     }
   },
   activated() {
@@ -404,7 +427,7 @@ export default {
         type: 'warning'
       })
         .then(() => {
-          editstatus({ id: row.id })
+          states({ id: row.id })
             .toPromise()
             .then(response => {
               this.$notify.success({
@@ -510,7 +533,7 @@ export default {
 }
 /deep/.el-table td,
 /deep/.el-table th.is-leaf {
-  border-right: 1px solid transparent;
+  border-right: 1px solid #E9ECF7;
   text-align: center;
 }
 .findValue.el-input {
@@ -578,4 +601,12 @@ export default {
     border-color: #5878e8;
     margin-left: 6px;
 }
+.el-select{
+  width: 30%;
+    margin-right: 10px;
+}
+
+/deep/.typeselect .el-input__inner{
+   color: #8890B1;
+}
 </style>

src/views/taskManagement/tranManagementWarehouseInOutTask.vue

@@ -1,7 +1,7 @@
 <!--出入库任务-->
 <template>
   <div class="container">
-    <BaseHeaderLayout :leftSpan="14">
+    <BaseHeaderLayout :leftSpan="12">
       <template slot="left">
         <ws-button
           type="primary"
@@ -23,38 +23,24 @@
             alt
           />添加
         </ws-button>
-        <ws-button
-          class="but"
-          :type="primary == 1 ? 'primary' : ''"
-          @click="handlestatus(1)"
-          >待审核</ws-button
-        >
-        <ws-button
-          class="but"
-          :type="primary == 2 ? 'primary' : ''"
-          @click="handlestatus(2)"
-          >已驳回</ws-button
-        >
-        <ws-button
-          class="but"
-          :type="primary == 3 ? 'primary' : ''"
-          @click="handlestatus(3)"
-          >执行中</ws-button
-        >
-        <ws-button
-          class="but"
-          :type="primary == 4 ? 'primary' : ''"
-          @click="handlestatus(4)"
-          >已完成</ws-button
-        >
-        <ws-button
-          class="but"
-          :type="primary == 5 ? 'primary' : ''"
-          @click="handlestatus('')"
-          >全部任务</ws-button
-        >
       </template>
       <template slot="right">
+         <span style="width: 70px; display: inline-block;color: #8890B1;">状态：</span>
+        <ws-select
+          v-model="searchTypeText"
+          placeholder=""
+          class="typeselect"
+          @change="selecttaskType"
+          :value="searchType"
+        >
+          <ws-option
+            v-for="item in taskTypeList"
+            :key="item.value"
+            :label="item.value"
+            :value="item.value"
+            style="color: #8890B1;"
+          />
+        </ws-select>
         <ws-input
           v-model="warehouseName"
           placeholder="可按合同编号或任务编号查找"
@@ -251,7 +237,7 @@
   </div>
 </template>
 <script>
-import { getoreditoutput, outdelete } from '@/model/tasksport/index'
+import { getoreditoutput, outdelete ,movestates} from '@/model/tasksport/index'
 import { downloadFile } from '@/utils/batchDown'
 import Pagination from '@/components/Pagination'
 import WsUpload from '@/components/WsUpload'
@@ -289,9 +275,16 @@ export default {
       primary: '1',
       pageSize: 10,
       searchType: 1,
-      searchTypeText: '未完成',
+      searchTypeText: '待审核',
       searchKeyWord: '',
       contractType: 2,
+       taskTypeList: [
+        { value: '待审核', type: 1 },
+        { value: '执行中', type: 3 },
+         { value: '已驳回', type: 2 },
+        { value: '已完成', type: 4 },
+        { value: '全部任务', type: '' },
+      ],
       // 提交类型
       submitType: true,
       size: 10,
@@ -372,21 +365,21 @@ export default {
           this.deptBudgetTotal = response.total
         })
     },
-    handlestatus(status) {
-      if (status == 1) {
-        this.primary = 1
-      } else if (status == 2) {
-        this.primary = 2
-      } else if (status == 3) {
-        this.primary = 3
-      } else if (status == 4) {
-        this.primary = 4
-      } else {
-        this.primary = 5
-      }
-      this.searchType = status
-      this.getList()
-    },
+    // handlestatus(status) {
+    //   if (status == 1) {
+    //     this.primary = 1
+    //   } else if (status == 2) {
+    //     this.primary = 2
+    //   } else if (status == 3) {
+    //     this.primary = 3
+    //   } else if (status == 4) {
+    //     this.primary = 4
+    //   } else {
+    //     this.primary = 5
+    //   }
+    //   this.searchType = status
+    //   this.getList()
+    // },
     //编辑
     delivery(item) {
       this.$router.push({
@@ -474,9 +467,9 @@ export default {
     },
     editClick(row) {
       var status = ''
-      if (row.status == '待审核' || row.status == '已完成') {
+      if (row.taskStatus == '待审核' || row.taskStatus == '已完成') {
         status = '执行中'
-      } else if (row.status == '执行中') {
+      } else if (row.taskStatus == '执行中') {
         status = '已完成'
       }
       //cancelButtonClass: "btn-custom-cancel"
@@ -486,7 +479,7 @@ export default {
         type: 'warning',
       })
         .then(() => {
-          editstatus({ id: row.id })
+          movestates({ id: row.id })
             .toPromise()
             .then((response) => {
               this.$notify.success({
@@ -690,4 +683,11 @@ export default {
 .done {
   background: #50cad4;
 }
+.el-select{
+  width: 30%;
+    margin-right: 10px;
+}
+/deep/.typeselect .el-input__inner{
+   color: #8890B1;
+}
 </style>

src/views/tranManagement/tranManagementDriver.vue

@@ -3,11 +3,22 @@
   <div>
     <BaseHeaderLayout :leftSpan="12">
       <template slot="left">
-        <ws-button type="primary" @click="handleAdd()">添加</ws-button>
+        <ws-button type="primary" @click="handleAdd()"><img
+            width="13"
+            height="13"
+            style="
+              vertical-align: text-top;
+              position: relative;
+              top: 2px;
+              left: -4px;
+            "
+            src="../../../public/img/header-add.png"
+            alt=""
+          />添加</ws-button>
       </template>
       <template slot="right">
-        <span style="display: inline-block; width: 60px; color: #8890b1"
-          >城市</span
+        <span style="display: inline-block; width: 65px; color: #8890b1"
+          >城市：</span
         >
         <el-cascader
           :options="options_"
@@ -235,25 +246,29 @@
             >
             <el-button
               v-if="scope.row.disableStatusFlag != 1"
+              class="record1"
               size="medium"
               type="text"
+              
               @click="stop(scope.row)"
               >禁用</el-button
             >
-            <el-tooltip
+            <!-- <el-tooltip
               class="item record"
               effect="dark"
               :content="scope.row.disableReasons"
               placement="right-start"
-            >
+            > -->
               <el-button
                 v-if="scope.row.disableStatusFlag == 1"
+                class="record1"
                 size="medium"
                 type="text"
+                style="font-size:14px"
                 @click="relieve(scope.row)"
                 >已禁用</el-button
               >
-            </el-tooltip>
+            <!-- </el-tooltip> -->
           </template>
         </el-table-column>
       </el-table>
@@ -703,7 +718,7 @@ export default {
 /deep/.el-table .el-table__body .cell {
   text-align: center;
 }
-.el-table th.is-leaf,
+/deep/.el-table th.is-leaf,
 .el-table td {
   border-right: 1px solid #eee;
 }
@@ -715,13 +730,17 @@ export default {
 }
 //操作按钮
 .record,
-.adjustment {
+.adjustment ,.record1{
   display: inline-block;
   color: #5878e8;
   padding: 0 4px !important;
   position: relative;
   font-size: 14px;
 }
+.record1{
+  width: 38px;
+  height: 32px;
+}
 .record:after {
   position: absolute;
   content: '';
@@ -732,4 +751,7 @@ export default {
   height: 12px;
   background: #e9ecf7;
 }
+/deep/.el-table td{
+      border-right: 1px solid #eee;
+}
 </style>

src/views/tranManagement/tranManagementReceivingFeedback.vue

@@ -1,16 +1,32 @@
 //收货反馈
 <template>
   <div>
-    <BaseHeaderLayout :leftSpan="13">
+    <BaseHeaderLayout :leftSpan="8">
       <template slot="left">
-        <ws-button class="but" :type="primary == 1 ? 'primary' : ''" @click="statusquery(1)">
+        <!-- <ws-button class="but" :type="primary == 1 ? 'primary' : ''" @click="statusquery(1)">
           执行中</ws-button
         >
         <ws-button class="but" :type="primary == 2 ? 'primary' : ''" @click="statusquery(2)">已完成</ws-button>
-        <ws-button class="but" :type="primary == 3 ? 'primary' : ''" @click="statusquery()">全部任务</ws-button>
+        <ws-button class="but" :type="primary == 3 ? 'primary' : ''" @click="statusquery()">全部任务</ws-button> -->
       </template>
       <!-- 接单开始 -->
       <template slot="right">
+        <span style="width: 142px; display: inline-block;color: #8890B1;">状态：</span>
+         <ws-select
+          v-model="searchTypeText"
+          placeholder=""
+          class="typeselect"
+          @change="selecttaskType"
+          :value="searchType"  
+        >
+          <ws-option
+            v-for="item in taskTypeList"
+            :key="item.value"
+            :label="item.value"
+            :value="item.value"
+            style="color: #8890B1;"
+          />
+        </ws-select>
        <div>
           <span style="display: inline-block; width: 60px;color: #8890B1;">接单日期</span>
         </div>
@@ -208,9 +224,14 @@ export default {
       currentPage: 1,
       pageSize: 10,
       feedbackFlag: 1,
-      searchTypeText: '未完成',
+      searchTypeText: '执行中',
       searchKeyWord: '',
       contractType: 2,
+      taskTypeList: [
+        { value: '执行中', type: 1 },
+        { value: '已完成', type: 2 },
+        { value: '全部任务', type: 3 },
+      ],
       
       // 提交类型
       submitType: true,
@@ -259,17 +280,17 @@ export default {
           this.deptBudgetTotal = response.total
         })
     },
-    statusquery(status){
-      if (status == 1) {
-        this.primary = 1
-      } else if (status == 2) {
-        this.primary = 2
-      } else {
-        this.primary = 3
-      }
-      this.feedbackFlag = status
-      this.getList()
-    },
+    // statusquery(status){
+    //   if (status == 1) {
+    //     this.primary = 1
+    //   } else if (status == 2) {
+    //     this.primary = 2
+    //   } else {
+    //     this.primary = 3
+    //   }
+    //   this.feedbackFlag = status
+    //   this.getList()
+    // },
     delivery(item) {
       this.$router.push({
         path: 'warehouseManagementDelivery',
@@ -371,9 +392,9 @@ export default {
     },
     editClick(row) {
       var status = ''
-      if (row.status == '待执行' || row.status == '已完成') {
+      if (row.feedbackStatus == '待执行' || row.feedbackStatus == '已完成') {
         status = '执行中'
-      } else if (row.status == '执行中') {
+      } else if (row.feedbackStatus == '执行中') {
         status = '已完成'
       }
       //cancelButtonClass: "btn-custom-cancel"
@@ -403,7 +424,7 @@ export default {
     selecttaskType(e) {
       for (var i = 0; i < this.taskTypeList.length; i++) {
         if (this.taskTypeList[i].value == e) {
-          this.searchType = this.taskTypeList[i].type
+          this.feedbackFlag = this.taskTypeList[i].type
         }
       }
     },
@@ -566,4 +587,11 @@ export default {
     font-weight: 700;
     margin-bottom: 20px;
 }
+.el-select{
+  width: 30%;
+    margin-right: 10px;
+}
+/deep/.typeselect .el-input__inner{
+   color: #8890B1;
+}
 </style>

src/views/tranManagement/tranManagementShipping.vue

@@ -1,14 +1,27 @@
 //船运调度
 <template>
   <div>
-    <BaseHeaderLayout :leftSpan="12">
+    <BaseHeaderLayout :leftSpan="8">
       <template slot="left">
-        <ws-button class="but" :type="searchType == 1 ?'primary':''"  @click="statusquery(1)"> 执行中</ws-button>
-        <ws-button class="but" :type="searchType == 2 ?'primary':''"  @click="statusquery(2)">已完成</ws-button>
-        <ws-button class="but" :type="searchType == undefined ?'primary':''"  @click="statusquery()">全部任务</ws-button>
       </template>
       <!-- 接单开始 -->
       <template slot="right">
+         <span style="width: 142px; display: inline-block;color: #8890B1;">状态：</span>
+        <ws-select
+          v-model="searchTypeText"
+          placeholder=""
+          class="typeselect"
+          @change="selecttaskType"
+          :value="searchType"  
+        >
+          <ws-option
+            v-for="item in taskTypeList"
+            :key="item.value"
+            :label="item.value"
+            :value="item.value"
+            style="color: #8890B1;"
+          />
+        </ws-select>
         <div>
           <span style="display: inline-block; width: 60px; color: #8890b1"
             >接单日期</span
@@ -154,11 +167,10 @@
   </div>
 </template>
 <script>
-import { getList, shippingList, alsostate } from '@/model/transport/index'
-import { downloadFile } from '@/utils/batchDown'
+import {shippingList, alsostate } from '@/model/transport/index'
 import Pagination from '@/components/Pagination'
 import WsUpload from '@/components/WsUpload'
-import { dayjs, fmoney, EventBus } from 'base-core-lib'
+import { EventBus } from 'base-core-lib'
 export default {
   name: 'viewSpareMoney',
   components: {
@@ -194,7 +206,12 @@ export default {
       tranTypeKey: 3,
       pageSize: 10,
       searchType: 1,
-      searchTypeText: '未完成',
+      searchTypeText: '执行中',
+       taskTypeList: [
+        { value: '执行中', type: 1 },
+        { value: '已完成', type: 2 },
+        { value: '全部任务', type: '' },
+      ],
       searchKeyWord: '',
       contractType: 2,
       inOutDate: [],
@@ -218,9 +235,6 @@ export default {
     }
   },
   activated() {
-    //cg.viewBudget
-    //cg.viewSpareMoney
-    // this.getVesselData();
     this.getList()
     this.showType = this.isShow
   },
@@ -245,10 +259,6 @@ export default {
           this.deptBudgetTotal = response.total
         })
     },
-    statusquery(state) {
-      this.searchType = state
-      this.getList()
-    },
     delivery(item) {
       this.$router.push({
         path: 'warehouseManagementDelivery',
@@ -345,14 +355,14 @@ export default {
       this.getList()
     },
     editClick(row) {
-      var processStatus = ''
+      var status = ''
       if (row.processStatus == '待执行' || row.processStatus == '已完成') {
         status = '执行中'
       } else if (row.processStatus == '执行中') {
         status = '已完成'
       }
       //cancelButtonClass: "btn-custom-cancel"
-      this.$confirm(`是否将状态改为${processStatus}`, {
+      this.$confirm(`是否将状态改为${status}`, {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning',
@@ -438,9 +448,12 @@ export default {
 }
 //分页
 .el-pagination {
-  padding: 10px 15px;
-  margin-bottom: 0;
   text-align: center;
+    white-space: nowrap;
+    padding: 2px 5px;
+    color: #303133;
+    font-weight: 700;
+    margin-bottom: 20px;
 }
 /deep/.el-pager li.active {
   color: #5878e8;
@@ -548,4 +561,11 @@ export default {
   position: relative;
   font-size: 14px;
 }
+.el-select{
+  width: 30%;
+    margin-right: 10px;
+}
+/deep/.typeselect .el-input__inner{
+   color: #8890B1;
+}
 </style>

src/views/tranManagement/tranManagementTransporHairRespond.vue

@@ -1,16 +1,32 @@
 //发货反馈
 <template>
   <div>
-    <BaseHeaderLayout :leftSpan="12">
+    <BaseHeaderLayout :leftSpan="8">
       <template slot="left">
-         <ws-button class="but"  :type="primary == 1 ? 'primary' : ''" @click="statusquery(1)">
+         <!-- <ws-button class="but"  :type="primary == 1 ? 'primary' : ''" @click="statusquery(1)">
           执行中</ws-button
         >
         <ws-button class="but"  :type="primary == 2 ? 'primary' : ''" @click="statusquery(2)">已完成</ws-button>
-        <ws-button class="but"  :type="primary == 3 ? 'primary' : ''" @click="statusquery()">全部任务</ws-button>
+        <ws-button class="but"  :type="primary == 3 ? 'primary' : ''" @click="statusquery()">全部任务</ws-button> -->
       </template>
       <!-- 接单开始 -->
       <template slot="right">
+         <span style="width: 142px; display: inline-block;color: #8890B1;">状态：</span>
+        <ws-select
+          v-model="searchTypeText"
+          placeholder=""
+          class="typeselect"
+          @change="selecttaskType"
+          :value="searchType"  
+        >
+          <ws-option
+            v-for="item in taskTypeList"
+            :key="item.value"
+            :label="item.value"
+            :value="item.value"
+            style="color: #8890B1;"
+          />
+        </ws-select>
         <div>
           <span style="display: inline-block; width: 60px; color: #8890b1"
             >接单日期</span
@@ -139,7 +155,7 @@
             />
           </template>
         </el-table-column>
-        <el-table-column prop="receivingDate" class="table_td" label="接单日期">
+        <el-table-column prop="createDate" class="table_td" label="接单日期">
         </el-table-column>
         <el-table-column prop="seller" label="操作" width="300">
           <template  slot-scope="scope">
@@ -205,12 +221,17 @@ export default {
       currentPage: 1,
       pageSize: 10,
       deptBudgetTotal: 0,
-      searchTypeText: '未完成',
+      searchTypeText: '执行中',
       searchKeyWord: '',
       contractType: 2,
       tranTypeKey: 2,
       feedbackFlag: 1,
       searchTypeOne: 1,
+       taskTypeList: [
+        { value: '执行中', type: 1 },
+        { value: '已完成', type: 2 },
+        { value: '全部任务', type: 3 },
+      ],
       // 提交类型
       submitType: true,
       size: 10,
@@ -232,9 +253,6 @@ export default {
     }
   },
   activated() {
-    //cg.viewBudget
-    //cg.viewSpareMoney
-    // this.getVesselData();
     this.getList()
     this.showType = this.isShow
   },
@@ -283,17 +301,17 @@ export default {
         },
       })
     },
-    statusquery(status) {
-       if (status == 1) {
-        this.primary = 1
-      } else if (status == 2) {
-        this.primary = 2
-      } else {
-        this.primary = 3
-      }
-      this.feedbackFlag = status
-      this.getList()
-    },
+    // statusquery(status) {
+    //    if (status == 1) {
+    //     this.primary = 1
+    //   } else if (status == 2) {
+    //     this.primary = 2
+    //   } else {
+    //     this.primary = 3
+    //   }
+    //   this.feedbackFlag = status
+    //   this.getList()
+    // },
     dateFormat(fmt, date) {
       let ret
       const opt = {
@@ -383,7 +401,7 @@ export default {
     selecttaskType(e) {
       for (var i = 0; i < this.taskTypeList.length; i++) {
         if (this.taskTypeList[i].value == e) {
-          this.searchType = this.taskTypeList[i].type
+          this. feedbackFlag = this.taskTypeList[i].type
         }
       }
     },
@@ -502,4 +520,11 @@ margin:0 10px;
     font-weight: 700;
     margin-bottom: 20px;
 }
+.el-select{
+  width: 30%;
+    margin-right: 10px;
+}
+/deep/.typeselect .el-input__inner{
+   color: #8890B1;
+}
 </style>

src/views/tranManagement/tranManagementTransporTationFire.vue

@@ -1,36 +1,32 @@
 //火运调度
 <template>
   <div>
-    <BaseHeaderLayout :leftSpan="12">
+    <BaseHeaderLayout :leftSpan="8">
       <template slot="left">
-        <ws-button
-          class="but"
-          :type="searchType == 1 ? 'primary' : ''"
-          @click="statusquery(1)"
-        >
-          执行中</ws-button
-        >
-        <ws-button
-          class="but"
-          :type="searchType == 2 ? 'primary' : ''"
-          @click="statusquery(2)"
-          >已完成</ws-button
-        >
-        <ws-button
-          class="but"
-          :type="searchType == undefined ? 'primary' : ''"
-          @click="statusquery()"
-          >全部任务</ws-button
-        >
       </template>
       <!-- 接单开始 -->
       <template slot="right">
+         <span style="width: 142px; display: inline-block;color: #8890B1;">状态：</span>
+        <ws-select
+          v-model="searchTypeText"
+          placeholder=""
+          class="typeselect"
+          @change="selecttaskType"
+          :value="searchType"  
+        >
+          <ws-option
+            v-for="item in taskTypeList"
+            :key="item.value"
+            :label="item.value"
+            :value="item.value"
+            style="color: #8890B1;"
+          />
+        </ws-select>
         <div>
           <span style="display: inline-block; width: 60px; color: #8890b1"
             >接单日期</span
           >
         </div>
-        <!-- v-model="deptBudgetList.inOutDate" -->
         <el-date-picker
           v-model="inOutDate"
           type="daterange"
@@ -225,7 +221,7 @@ export default {
       currentPage: 1,
       pageSize: 10,
       deptBudgetTotal:0,
-      searchTypeText: '未完成',
+      searchTypeText: '执行中',
       searchKeyWord: '',
       tranTypeKey: 2,
       // 提交类型
@@ -242,6 +238,11 @@ export default {
       deptBudgetList: {},
       historyList: [],
       inOutDate: [],
+      taskTypeList: [
+        { value: '执行中', type: 1 },
+        { value: '已完成', type: 2 },
+        { value: '全部任务', type: '' },
+      ],
       pickerBeginDateBefore: {
         disabledDate: (time) => {
           return time.getTime() > Date.now()
@@ -302,11 +303,6 @@ export default {
         },
       })
     },
-    statusquery(state) {
-      this.searchType = state
-      this.getList()
-    },
-
     dateFormat(fmt, date) {
       let ret
       const opt = {
@@ -547,4 +543,11 @@ export default {
     font-weight: 700;
     margin-bottom: 20px;
 }
+.el-select{
+  width: 30%;
+    margin-right: 10px;
+}
+/deep/.typeselect .el-input__inner{
+   color: #8890B1;
+}
 </style>

src/views/tranManagement/tranManagementVehicle.vue

@@ -1,16 +1,33 @@
 //汽运调度
 <template>
   <div>
-    <BaseHeaderLayout :leftSpan="12">
+    <BaseHeaderLayout :leftSpan="8">
       <template slot="left">
-        <ws-button class="but" :type="searchType == 1?'primary':''" @click="changestatus(1)">
+        <!-- <ws-button class="but" :type="searchType == 1?'primary':''" @click="changestatus(1)">
           执行中</ws-button
         >
         <ws-button class="but" :type="searchType == 2?'primary':''" @click="changestatus(2)">已完成</ws-button>
-        <ws-button class="but" :type="searchType == undefined?'primary':''" @click="changestatus()">全部任务</ws-button>
+        <ws-button class="but" :type="searchType == undefined?'primary':''" @click="changestatus()">全部任务</ws-button> -->
       </template>
       <!-- 接单开始 -->
       <template slot="right">
+        <span style="width: 142px; display: inline-block; color: #8890B1;">状态：</span>
+        <ws-select
+          v-model="searchTypeText"
+          placeholder=""
+          class="typeselect"
+          @change="selecttaskType"
+          :value="searchType"
+      
+        >
+          <ws-option
+            v-for="item in taskTypeList"
+            :key="item.value"
+            :label="item.value"
+            :value="item.value"
+            style="color: #8890B1;"
+          />
+        </ws-select>
         <div>
           <span style="display: inline-block; width: 60px;color: #8890B1;">接单日期</span>
         </div>
@@ -193,7 +210,7 @@ export default {
       currentPage: 1,
       pageSize: 10,
     deptBudgetTotal :0,
-      searchTypeText: '未完成',
+      searchTypeText: '执行中',
       searchKeyWord: '',
       contractType: 2,
       searchType:1,
@@ -209,6 +226,11 @@ export default {
       warehouseList: [],
       deptBudgetList: {},
       historyList: [],
+       taskTypeList: [
+        { value: '执行中', type: 1 },
+        { value: '已完成', type: 2 },
+        { value: '全部任务', type: '' },
+      ],
       pickerBeginDateBefore: {
         disabledDate: (time) => {
           return time.getTime() > Date.now()
@@ -274,14 +296,6 @@ export default {
         },
       })
     },
-    statusquery(status){
-      this.searchType = status
-      this.getList()
-    },
-    // // 派车
-    // warehousing() {
-    //   this.$router.push({ path: 'tranManagementVehicleDispatching' })
-    // },
     dateFormat(fmt, date) {
       let ret
       const opt = {
@@ -372,13 +386,13 @@ export default {
           return false
         })
     },
-    // selecttaskType(e) {
-    //   for (var i = 0; i < this.taskTypeList.length; i++) {
-    //     if (this.taskTypeList[i].value == e) {
-    //       this.searchType = this.taskTypeList[i].type
-    //     }
-    //   }
-    // },
+    selecttaskType(e) {
+      for (var i = 0; i < this.taskTypeList.length; i++) {
+        if (this.taskTypeList[i].value == e) {
+          this.searchType = this.taskTypeList[i].type
+        }
+      }
+    },
     fujian(row) {
       if (
         row.receiveAttachmentPath === null ||
@@ -544,4 +558,11 @@ export default {
     font-weight: 700;
     margin-bottom: 20px;
 }
+.el-select{
+  width: 30%;
+    margin-right: 10px;
+}
+/deep/.typeselect .el-input__inner{
+   color: #8890B1;
+}
 </style>

src/views/warehouse/warehouseManagementList.vue

@@ -1,7 +1,7 @@
 <!--仓库管理-->
 <template>
   <div>
-    <BaseHeaderLayout :leftSpan="20">
+    <BaseHeaderLayout :leftSpan="15">
       <template slot="left">
         <ws-button type="primary" @click="handleAdd()"
         v-hasPermission="
@@ -31,7 +31,7 @@
           " @click="handlTask()">任务</ws-button>
       </template>
       <template slot="left">
-        <div style="margin-top: 2px">
+        <div >
           <el-radio-group
             v-model="warehouseType"
             @change="changeradio"
@@ -249,6 +249,7 @@
           </template>
         </el-table-column>
       </el-table>
+      
     </div>
   </div>
 </template>
@@ -292,8 +293,7 @@ export default {
       showType: true,
       // 年
       year: '',
-      currentPage: 1,
-      pageSize: 10,
+
       searchType: 1,
       searchTypeText: '未完成',
       searchKeyWord: '',
@@ -713,4 +713,13 @@ export default {
 /deep/.el-radio-button:first-child .el-radio-button__inner {
   margin-left: 10px;
 }
+//分页
+.el-pagination {
+  text-align: center;
+    white-space: nowrap;
+    padding: 2px 5px;
+    color: #303133;
+    font-weight: 700;
+    margin-bottom: 20px;
+}
 </style>

vue.config.js

@@ -143,7 +143,7 @@ module.exports = {
         // target: 'http://standard-dev.winsea.com/', //目标地址
         // target: 'http://localhost:8090/',
         // target: 'http://192.168.1.121:8090/',
-        target: 'http://192.168.1.115:8090/',
+        target: 'http://192.168.1.121:8090/',
         // target: 'http://192.168.1.119:8090/',
         // target: 'http://192.168.24.5:8098',//目标地址
         // target: 'http://product-server.winsea.com/',