前端部分bug更改sdy

src/views/contractManagement/purchaseContract.vue

@@ -66,9 +66,6 @@
           class="find"
           type="primary"
           @click="find()"
-          v-hasPermission="
-            `${$permission('PERMISSIONS.PURSPAPPLINFO_CREATEINSTORE')}`
-          "
           ><img
             width="16"
             height="16"

src/views/contractManagement/purchaseContractAdd.vue

@@ -443,11 +443,11 @@
       <!--流程信息-->
 
       <ws-info-table>
-        <!--合同收入（元）-->
-        <ws-form-item label="合同收入（元）" span="1" prop="goodsNameKey">
+        <!--已付款（元）-->
+        <ws-form-item label="已付款（元）" span="1" prop="goodsNameKey">
           <ws-input
             v-model="deptBudgetList.contractProcessInfo.goodsNameKey"
-            placeholder="请输入合同收入（元）"
+            placeholder="请输入已付款（元）"
             maxlength="100"
             size="small"
           />
@@ -482,15 +482,6 @@
             size="small"
           />
         </ws-form-item>
-        <!--已完成发货量（吨）-->
-        <ws-form-item label="已完成发货量（吨）" span="1" prop="imperfectGrain">
-          <ws-input
-            v-model="deptBudgetList.contractProcessInfo.imperfectGrain"
-            placeholder="请输入已完成发货量（吨）"
-            maxlength="100"
-            size="small"
-          />
-        </ws-form-item>
         <!--双章原件回收情况-->
         <ws-form-item label="双章原件回收情况" span="1" prop="grade">
           <ws-select
@@ -507,6 +498,15 @@
             />
           </ws-select>
         </ws-form-item>
+        <!--已完成发货量（吨）-->
+        <ws-form-item label="已完成发货量（吨）" span="1" prop="imperfectGrain">
+          <ws-input
+            v-model="deptBudgetList.contractProcessInfo.imperfectGrain"
+            placeholder="请输入已完成发货量（吨）"
+            maxlength="100"
+            size="small"
+          />
+        </ws-form-item>
       </ws-info-table>
 
       <div class="wenzi">

src/views/contractManagement/salesContractEdit.vue

@@ -658,6 +658,7 @@ export default {
       this.dialogViewSpareMoney = false
     },
     returnsales() {
+      this.deptBudgetList = {}
       this.$router.push({ path: 'salesContract' })
     },
     handleChange(value) {
@@ -1306,6 +1307,7 @@ export default {
             .toPromise()
             .then((response) => {
               this.$message.success('编辑成功')
+              this.deptBudgetList = {}
               this.$router.push({ path: 'salesContract' })
             })
         } else {

src/views/contractManagement/salesContractExamine.vue

@@ -311,18 +311,17 @@
 
 <script>
 import {
-  getList,
   packList,
-  addList,
   xiala,
-  addxiala,
-  editxiala,
-  delxiala,
   examineList,
 } from '@/model/contarct/index'
 import { dayjs } from 'base-core-lib'
+import WsUpload from '@/components/WsUpload'
 export default {
   name: 'viewSpareMoney',
+  components: {
+    WsUpload,
+  },
   watch: {
     vesselId(val) {
       this.getVesselData()

src/views/tranManagement/tranManagementDriver.vue

@@ -1,7 +1,7 @@
 <!--司机管理-->
 <template>
   <div>
-    <BaseHeaderLayout :leftSpan="20">
+    <BaseHeaderLayout :leftSpan="12">
       <template slot="right">
         <ws-button type="primary" @click="handleAdd()">添加</ws-button>
       </template>
@@ -19,6 +19,8 @@
             :value="item.label"
           />
         </ws-select> -->
+        <span style="display: inline-block; width: 60px;color: #8890B1;">城市</span>
+        
         <el-cascader
           :options="options_"
           v-model="searchTypeText"
@@ -39,10 +41,21 @@
         <ws-button
           type="primary"
           @click="handleLook()"
-          v-hasPermission="
-            `${$permission('PERMISSIONS.PURSPAPPLINFO_CREATEINSTORE')}`
-          "
-          >查找</ws-button
+          >
+          <img
+            width="14"
+            height="16"
+            style="
+              vertical-align: text-top;
+              position: relative;
+              top: 0px;
+              left: -8px;
+            "
+            src="../../../public/img/sousuo.png"
+            alt=""
+        />
+          
+</ws-button
         >
       </template>
     </BaseHeaderLayout>
@@ -202,25 +215,16 @@
             <ws-button
               type="primary"
               @click="look(scope.row)"
-              v-hasPermission="
-                `${$permission('PERMISSIONS.PURSPAPPLINFO_CREATEINSTORE')}`
-              "
               >查看</ws-button
             >
             <ws-button
               type="primary"
               @click="edit(scope.row)"
-              v-hasPermission="
-                `${$permission('PERMISSIONS.PURSPAPPLINFO_CREATEINSTORE')}`
-              "
               >编辑</ws-button
             >
             <ws-button
               type="primary"
               @click="deletes(scope.row)"
-              v-hasPermission="
-                `${$permission('PERMISSIONS.PURSPAPPLINFO_CREATEINSTORE')}`
-              "
               >删除</ws-button
             >
             <ws-button
@@ -670,4 +674,7 @@ export default {
 /deep/.el-icon-arrow-right {
   display: none;
 }
+/deep/.el-pagination{
+  text-align: center;
+}
 </style>

src/views/tranManagement/tranManagementTransporHairRespond.vue

@@ -3,11 +3,11 @@
   <div>
     <BaseHeaderLayout :leftSpan="12">
       <template slot="left">
-        <ws-button class="but" type="primary" @click="handleAdd()">
+        <ws-button class="but" type="primary" @click="statusquery(1)">
           执行中</ws-button
         >
-        <ws-button class="but" @click="handleLook()">已完成</ws-button>
-        <ws-button class="but" @click="handleEdit()">全部任务</ws-button>
+        <ws-button class="but" @click="statusquery(2)">已完成</ws-button>
+        <ws-button class="but" @click="statusquery()">全部任务</ws-button>
       </template>
       <!-- 接单开始 -->
       <template slot="left">
@@ -193,11 +193,11 @@ export default {
       year: '',
       currentPage: 1,
       pageSize: 10,
-      searchType: 1,
       searchTypeText: '未完成',
       searchKeyWord: '',
       contractType: 2,
       tranTypeKey: 2,
+      searchType: 1,
       // 提交类型
       submitType: true,
       size: 10,
@@ -290,14 +290,10 @@ export default {
         },
       })
     },
-
-    //已完成
-    handleLook() {},
-    //待完成
-    handleAdd() {},
-    //全部任务
-    handleEdit() {},
-
+     statusquery(status){
+      this.searchType = status
+      this.getList()
+    },
     dateFormat(fmt, date) {
       let ret
       const opt = {
@@ -337,6 +333,7 @@ export default {
       automobileList({
         compId: sessionStorage.getItem('ws-pf_compId'),
         contractType: this.contractType,
+          searchType: this.searchType,
         currentPage: this.currentPage,
         pageSize: this.pageSize,
       })
@@ -346,14 +343,14 @@ export default {
         })
     },
     editClick(row) {
-      var status = ''
-      if (row.status == '待执行' || row.status == '已完成') {
-        status = '执行中'
-      } else if (row.status == '执行中') {
-        status = '已完成'
+      var feedbackStatus = ''
+      if (row.feedbackStatus == '待执行' || row.feedbackStatus == '已完成') {
+        feedbackStatus = '执行中'
+      } else if (row.feedbackStatus == '执行中') {
+        feedbackStatus = '已完成'
       }
       //cancelButtonClass: "btn-custom-cancel"
-      this.$confirm(`是否将状态改为${status}`, {
+      this.$confirm(`是否将状态改为${feedbackStatus}`, {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning',
@@ -389,6 +386,29 @@ export default {
       this.currentPage = 1
       this.getList()
     },
+     async exportlist() {
+      const { data } = await export1(
+        {
+          compId: sessionStorage.getItem('ws-pf_compId'),
+          contractType: this.contractType,
+          currentPage: this.currentPage,
+          pageSize: this.pageSize,
+          searchType: this.searchType,
+          searchKeyWord: this.searchKeyWord,
+          startDate: this.startDate,
+          endDate: this.endDate,
+        },
+        {},
+        { responseType: 'blob' }
+      ).toPromise()
+      downloadFile({
+        res: data,
+        fileName: `${
+          this.date.year + (this.date.month ? `-${this.date.month}` : '')
+        }_采购合同`,
+        type: 'xls',
+      })
+    },
   },
 }
 </script>

src/views/tranManagement/tranManagementTransporTationFire.vue

@@ -1,16 +1,17 @@
 //火运调度
 <template>
   <div>
-    <BaseHeaderLayout :leftSpan="12">
+    <BaseHeaderLayout :leftSpan="20">
       <template slot="left">
-        <ws-button class="but" type="primary" @click="handleAdd()">
+        <ws-button class="but" type="primary" @click="statusquery(1)">
           执行中</ws-button
         >
-        <ws-button class="but" @click="handleLook()">已完成</ws-button>
-        <ws-button class="but" @click="handleEdit()">全部任务</ws-button>
+        <ws-button class="but" @click="statusquery(2)">已完成</ws-button>
+        <ws-button class="but" @click="statusquery()">全部任务</ws-button>
       </template>
       <!-- 接单开始 -->
       <template slot="left">
+         <span style="display: inline-block; width: 300px;color: #8890B1;">接单日期</span>
         <ws-date-picker
           v-model="deptBudgetList.inOutDate"
           type="date"
@@ -186,7 +187,6 @@ export default {
       year: '',
       currentPage: 1,
       pageSize: 10,
-      searchType: 1,
       searchTypeText: '未完成',
       searchKeyWord: '',
       contractType: 2,
@@ -196,6 +196,7 @@ export default {
       size: 10,
       spanArr: [],
       warehouseName: '',
+      searchType: 1,
       compId: sessionStorage.getItem('ws-pf_compId'),
       deptCircularPage: {},
       tranManagementList: [],
@@ -261,13 +262,10 @@ export default {
         },
       })
     },
-
-    //待完成
-    handleLook() {},
-    //已完成
-    handleAdd() {},
-    //全部任务
-    handleEdit() {},
+    statusquery(state){
+      this.searchType = state
+      this.getList()
+    },
 
     dateFormat(fmt, date) {
       let ret
@@ -308,6 +306,7 @@ export default {
       automobileList({
         compId: sessionStorage.getItem('ws-pf_compId'),
         contractType: this.contractType,
+        searchType : this.searchType,
         currentPage: this.currentPage,
         pageSize: this.pageSize,
         tranTypeKey: this.tranTypeKey,

src/views/tranManagement/tranManagementVehicle.vue

@@ -3,14 +3,15 @@
   <div>
     <BaseHeaderLayout :leftSpan="20">
       <template slot="left">
-        <ws-button class="but" type="primary" @click="handleAdd()">
+        <ws-button class="but" type="primary" @click="statusquery(1)">
           执行中</ws-button
         >
-        <ws-button class="but" @click="handleLook()">已完成</ws-button>
-        <ws-button class="but" @click="handleEdit()">全部任务</ws-button>
+        <ws-button class="but" @click="statusquery(2)">已完成</ws-button>
+        <ws-button class="but" @click="statusquery()">全部任务</ws-button>
       </template>
       <!-- 接单开始 -->
       <template slot="left">
+        <span style="display: inline-block; width: 290px;color: #8890B1;">接单日期</span>
         <ws-date-picker
           v-model="deptBudgetList.inOutDate"
           type="date"
@@ -26,7 +27,7 @@
         />
         <ws-input
           v-model="searchKeyWord"
-          placeholder="可按照合同编号、买方名称、卖方名称进行查找"
+          placeholder="可按发货人、收货人、任务编号查找"
           clearable
           maxlength="500"
           type="input"
@@ -182,10 +183,10 @@ export default {
       year: '',
       currentPage: 1,
       pageSize: 10,
-      searchType: 1,
       searchTypeText: '未完成',
       searchKeyWord: '',
       contractType: 2,
+      searchType:1,
       // 提交类型
       submitType: true,
       size: 10,
@@ -275,6 +276,10 @@ export default {
         },
       })
     },
+    statusquery(status){
+      this.searchType = status
+      this.getList()
+    },
     // // 派车
     // warehousing() {
     //   this.$router.push({ path: 'tranManagementVehicleDispatching' })
@@ -319,6 +324,7 @@ export default {
         compId: sessionStorage.getItem('ws-pf_compId'),
         currentPage: this.currentPage,
         pageSize: this.pageSize,
+        searchType: this.searchType,
         tranTypeKey: this.tranTypeKey,
       })
         .toPromise()
@@ -539,5 +545,6 @@ export default {
 .el-range-editor--small.el-input__inner {
   height: 32px;
   margin-left: -20%;
+  
 }
 </style>

src/views/warehouse/warehouseManagementRecord.vue

@@ -10,6 +10,7 @@
           type="primary"
           size="small"
           @click="iossrecord()"
+          v-show="this.warehouseType != 2"
           >盘损记录</el-button
         >
         <el-button

vue.config.js

@@ -144,7 +144,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.119:8090/',
+        target: 'http://192.168.1.115:8090/',
         // target: 'http://192.168.1.119:8090/',
         // target: 'http://192.168.24.5:8098',//目标地址
         // target: 'http://product-server.winsea.com/',