前端sdy

src/api/V2/taskspost/index.js

@@ -39,4 +39,6 @@ export const API_GET_OUT_MOVELOOK = '/inOutWarehouseTask/getInOutWarehouseTaskRe
 //运输任务状态修改
 export const API_POST_OUT_STATES = '/tranTaskInfo/api/editStatus'
 //移库任务状态修改
-export const API_POST_OUT_MOVESTATES = '/inOutWarehouseTask/api/editStatus'
+export const API_POST_OUT_MOVESTATES = '/inOutWarehouseTask/api/editStatus'
+// 删除运输阶段
+export const API_POST_DEL_HAULAGE_STAGE= '/tranProcessInfo/api/deleteTranProcess'

src/model/tasksport/index.js

@@ -21,7 +21,8 @@ import {
     API_POST_INOUTWAREHOUSETASK,
     API_GET_OUT_MOVELOOK,
     API_POST_OUT_STATES,
-    API_POST_OUT_MOVESTATES
+    API_POST_OUT_MOVESTATES,
+    API_POST_DEL_HAULAGE_STAGE
 } from '@/api/V2/taskspost'
 //运输任务列表
 export const gain = appRx.get(API_GET_TRAN_LIST, errorCatcher, errorHandle, filter)
@@ -62,4 +63,6 @@ export const moveLook = appRx.get(API_GET_OUT_MOVELOOK, errorCatcher, errorHandl
 //运输任务状态修改
 export const states = appRx.post(API_POST_OUT_STATES, errorCatcher, errorHandle, filter)
 //移库任务状态修改
-export const movestates = appRx.post(API_POST_OUT_MOVESTATES, errorCatcher, errorHandle, filter)
+export const movestates = appRx.post(API_POST_OUT_MOVESTATES, errorCatcher, errorHandle, filter)
+//删除运输阶段
+export const delhaulagestage = appRx.post(API_POST_DEL_HAULAGE_STAGE, errorCatcher, errorHandle, filter)

src/views/contractManagement/purchaseContract.vue

@@ -709,7 +709,7 @@ export default {
   z-index: 2005;
 }
 .vertical-line {
-  height: 100px;
+  height: 64px;
   border-left: 2px solid #e9ecf7;
   margin-left: 4px;
   padding: 0 3px;

src/views/home/index.vue

@@ -7,182 +7,6 @@
         <!-- 任务、消息、提醒、超期 -->
         <Panel :data-list="panelList"
                @click="gotoNewRw"></Panel>
-        <div style="display:flex;justify-content: space-between;">
-          <!-- 新闻 -->
-          <div :class="vesselBankFlag === 'V' ? 'news-list v-width' : 'news-list'"
-               ref="newsList">
-            <div class="list-title">
-              <div class="list-title-name">{{ $t('home.news') }}</div>
-              <div class="list-title-more"
-                   @click="goNews">
-                {{ $t('home.more') }}
-              </div>
-            </div>
-            <div class="new-list-box"
-                 style="height: calc(100% - 44px); overflow: hidden; position: relative;">
-              <img v-show="newList.length === 0"
-                   class="noMore"
-                   src="@/assets/newhome/nomore.png" />
-              <div v-show="newList.length > 0"
-                   class="new-list-body"
-                   v-for="(item, index) in newList"
-                   :key="index"
-                   @click="goNewsDetail(item.id)">
-                <div class="new-list-img">
-                  <div class="newsTJ"
-                       v-show="item.systemFlag && item.systemFlag * 1 == 1">
-                    <img src="@/assets/newhome/recommend.png" />
-                  </div>
-                  <img v-lazy="$store.getters.baseInfo.fileUrl + item.coverUrl" />
-                </div>
-                <div style="padding:0 15px;width:80%">
-                  <div class="new-list-title">
-                    <span>{{ item.title }}</span>
-                  </div>
-                  <div class="new-list-content">
-                    <span>{{ item.newContent }}</span>
-                  </div>
-                  <div class="new-list-date">
-                    <span>{{ item.issueDate.substr(0, 16) }}</span>
-                  </div>
-                </div>
-              </div>
-            </div>
-          </div>
-          <!-- end 新闻 -->
-          <!-- 通知通函 -->
-          <div ref="noticeList"
-               :class="
-              vesselBankFlag === 'V' ? 'notice-list v-width' : 'notice-list'
-            ">
-            <div class="list-title">
-              <div class="list-title-name">{{ $t('home.notification') }}</div>
-              <div class="list-title-more"
-                   @click="goNoticeMore('0')">
-                {{ $t('home.more') }}
-              </div>
-            </div>
-            <div style="padding: 10px;overflow: hidden;height: calc(100% - 44px); position: relative;">
-              <img v-show="noticeList.length === 0"
-                   class="noMore"
-                   src="@/assets/newhome/nomore.png" />
-              <div v-show="noticeList.length > 0"
-                   class="home-tzthList"
-                   v-for="(item, index) in noticeList"
-                   :key="index"
-                   @click="goNotice(item)">
-                <div style="width:90%">
-                  <div class="home-tzthList-type">
-                    <div class="home-tzthList-type-title"><span>{{ item.circularTypeName + $t('common.colon') }}</span></div>
-                    <div class="home-tzthList-type-theme"><span>{{ item.theme }}</span></div>
-                  </div>
-                  <div class="home-tzthList-people">
-                    <div class="home-tzthList-Personnel"
-                         style="display:flex">
-                      <span>{{
-                        $t('home.sendPersonnel') +
-                          $t('common.colon')
-                      }}</span>
-                      <span>
-                        {{$ph( item.sender) }}
-                      </span>
-                    </div>
-                    <div class="home-tzthList-timer">
-                      <span>{{ item.dateOfIssue }}</span>
-                    </div>
-                  </div>
-                </div>
-                <div class="home-tzthList-timer-left"
-                     @click.stop="downloadNotification(item)"
-                     v-if="item.attachmentPath">
-                  <img src="../../assets/images/page/home/down.png">
-                </div>
-              </div>
-            </div>
-          </div>
-          <!-- end 通知通函 -->
-        </div>
-        <!-- 船舶动态 -->
-        <div class="ship-list"
-             style="margin-top: 10px;"
-             v-if="isShowShipList">
-          <div class="list-title">
-            <div class="list-title-name">
-              {{ $t('home.dynamicTrajectory') }}
-            </div>
-            <div class="list-title-more">
-              <div @click="toMap"
-                   style="color: #666666;margin-right: 20px">
-                <img src="@/assets/images/page/home/travel.png" />
-                <span>{{ $t('home.dynamicTrajectory') }}</span>
-              </div>
-              <ws-dropdown>
-                <span class="el-dropdown-link">
-                  <img class="shortcut-entrance-right"
-                       src="@/assets/images/page/home/set.png" />
-                </span>
-                <ws-dropdown-menu slot="dropdown">
-                  <ws-dropdown-item>
-                    <div @click="toHide(1)">{{ $t('home.hide') }}</div>
-                  </ws-dropdown-item>
-                </ws-dropdown-menu>
-              </ws-dropdown>
-            </div>
-          </div>
-          <div style="padding: 0 20px;height:105px;min-width:1000px;position: relative;">
-            <img v-show="shipList.length === 0"
-                 class="noMore"
-                 src="@/assets/newhome/nomore.png" />
-            <vue-seamless-scroll v-show="shipList.length > 0"
-                                 :data="shipList"
-                                 :class-option="optionSingleHeightTime"
-                                 class="seamless-warp">
-              <div style="display:flex">
-                <div class="ship-list-body"
-                     v-for="(item, index) in shipList"
-                     :key="index">
-                  <div class="shipList-box">
-                    <img class="shipList-icon"
-                         src="@/assets/images/page/home/circle.png" />
-                    <div style="display:flex">
-                      <div class="shipList-name">{{ item.vesselName }}</div>
-                      <div :class="getNaviStatusBg(item.navistatus)"
-                           class="ship-list-status bg0">
-                        {{ getNaviStatusStr(item.navistatus) || '-' }}
-                      </div>
-                    </div>
-                    <div class="shipList-address">
-                      {{
-                      (getLanguage == 'en' ? 'destination：' : '目的地：') +
-                        (item.dest_std ? item.dest_std : '-')
-                    }}
-                    </div>
-                    <div class="shipList-time">
-                      {{
-                      (getLanguage == 'en'
-                        ? 'Prearrival time：'
-                        : '预到时间：') + (item.eta_std ? item.eta_std : '-')
-                    }}
-                    </div>
-                    <div style="clear:both"></div>
-                  </div>
-                </div>
-              </div>
-            </vue-seamless-scroll>
-          </div>
-        </div>
-        <!-- end 船舶动态 -->
-        <div class="chart"
-             v-if="showEchart">
-          <!-- 维修保养 -->
-          <maintenance></maintenance>
-          <!-- 船舶证书 -->
-          <shipCertificate></shipCertificate>
-          <!-- 备件物料管理 -->
-          <sparePartsMaterial></sparePartsMaterial>
-          <!-- 采购管理 -->
-          <procurement></procurement>
-        </div>
       </div>
     </div>
     <div id="mapXY"></div>

src/views/taskManagement/inOutWarehouseTaskEdit.vue

@@ -921,7 +921,13 @@ export default {
             this.dataList = response[0]
             this.dataList1 = response[1]
           } else {
-            this.dataList = response[0]
+            console.log(response[0].taskTypeKey)
+            if(response[0].taskTypeKey==2){
+              
+              this.dataList1 = response[0]
+            }else{
+              this.dataList = response[0]
+            }
           }
         })
     },

src/views/taskManagement/tranManagementTransport.vue

@@ -189,6 +189,9 @@
 import { gain, deltran,states } from '@/model/tasksport/index'
 import Pagination from '@/components/Pagination'
 import WsUpload from '@/components/WsUpload'
+import {
+  billoperatehis
+} from '@/model/contarct/index'
 export default {
   name: 'viewSpareMoney',
   components: {
@@ -264,6 +267,14 @@ export default {
       this.currentPage = 1
       this.getList()
     },
+    history(row) {
+      console.log(row)
+      billoperatehis({ id: row.id })
+        .toPromise()
+        .then((response) => {
+          this.historyList = response
+        })
+    },
     deleteclick(row) {
       //cancelButtonClass: "btn-custom-cancel"
       this.$confirm(`运输任务删除后不可恢复，是否确定删除？`, {
@@ -606,4 +617,34 @@ text-align: center;
 /deep/.typeselect .el-input__inner{
    color: #8890B1;
 }
+// 操作历史
+.vertical-text-left {
+  width: 62px;
+  text-align: right;
+}
+.vertical-circle {
+  width: 10px;
+  height: 10px;
+  border: 2px solid #5878e8;
+  background-color: #ffffff;
+  -webkit-border-radius: 100px;
+}
+.vertical-circle:first-child {
+  color: red;
+}
+.vertical-text {
+  margin: 0 10px;
+  color: #8890b1;
+  font-size: 12px;
+  margin-top: -4px;
+}
+.vertical-line {
+  height: 64px;
+  border-left: 2px solid #e9ecf7;
+  margin-left: 4px;
+  padding: 0 3px;
+  // border-image: -webkit-linear-gradient(#00eba7, #08b8e6) 30 30;
+  // border-image: -moz-linear-gradient(#00eba7, #08b8e6) 30 30;
+  // border-image: linear-gradient(#00eba7, #08b8e6) 30 30;
+}
 </style>

src/views/taskManagement/tranManagementTransportEdit.vue

@@ -214,7 +214,7 @@
             width="22"
             height="22"
             class="del"
-            @click="del(index)"
+            @click="del(index,item)"
             src="../../../public/img/del.png"
             alt=""
           />
@@ -378,6 +378,7 @@ import {
   getwarehousename,
   xialaNo,
   examinetran,
+  delhaulagestage
 } from '@/model/tasksport/index'
 import WsUpload from '@/components/WsUpload'
 import mapDrag from '@/components/mapdrag/mapdrag'
@@ -661,9 +662,27 @@ export default {
       })
       this.number++
     },
-    del(index) {
-      if (this.deptBudgetList.tranProcessInfoList.length > 1) {
-        this.deptBudgetList.tranProcessInfoList.splice(index, 1)
+    del(index,row) {
+      console.log(row)
+      if(row.id){
+        this.$confirm('任务阶段删除后不可恢复，是否确定删除？', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      })
+        .then(() => {
+        delhaulagestage({id:row.id}).toPromise()
+            .then((response) => {
+              this.$message.success('删除成功')
+              if (this.deptBudgetList.tranProcessInfoList.length > 1) {
+                this.deptBudgetList.tranProcessInfoList.splice(index, 1)
+              }
+            })
+        })
+      }else{
+        if (this.deptBudgetList.tranProcessInfoList.length > 1) {
+          this.deptBudgetList.tranProcessInfoList.splice(index, 1)
+        }
       }
       this.number--
     },

src/views/taskManagement/tranManagementWarehouseInOutTask.vue

@@ -25,10 +25,10 @@
         </ws-button>
       </template>
       <template slot="right">
-         <span style="width: 70px; display: inline-block;color: #8890B1;">状态：</span>
+        <span style="width: 70px; display: inline-block;color: #8890B1;">状态：</span>
         <ws-select
           v-model="searchTypeText"
-          placeholder=""
+          placeholder
           class="typeselect"
           @change="selecttaskType"
           :value="searchType"
@@ -65,54 +65,21 @@
       </template>
     </BaseHeaderLayout>
     <div class="navv">
-      <el-table
-        class="wenzi"
-        :data="gainList.records"
-        style="width: 100%;"
-        height="780"
-      >
+      <el-table class="wenzi" :data="gainList.records" style="width: 100%;" height="780">
         <el-table-column type="index" label="序号">
           <template scope="scope">
             <span v-if="scope.$index < 9">0{{ scope.$index + 1 }}</span>
             <span v-else>{{ scope.$index + 1 }}</span>
           </template>
         </el-table-column>
-         <el-table-column prop="inOutTaskNo" label="任务编号"></el-table-column>
-        <el-table-column
-          prop="contractNo"
-          label="合同编号"
-          width="80"
-        ></el-table-column>
-        <el-table-column
-          prop="warehouseName"
-          class="table_td"
-          label="库房名"
-        ></el-table-column>
-        <el-table-column
-          prop="inOutType"
-          class="table_td"
-          label="出入库类型"
-        ></el-table-column>
-        <el-table-column
-          prop="goodsName"
-          class="table_td"
-          label="货名"
-        ></el-table-column>
-        <el-table-column
-          prop="weight"
-          class="table_td"
-          label="重量（吨）"
-        ></el-table-column>
-        <el-table-column
-          prop="predictDate"
-          class="table_td"
-          label="预计日期"
-        ></el-table-column>
-        <el-table-column
-          prop="publisher"
-          class="table_td"
-          label="发布者"
-        ></el-table-column>
+        <el-table-column prop="inOutTaskNo" label="任务编号"></el-table-column>
+        <el-table-column prop="contractNo" label="合同编号" width="80"></el-table-column>
+        <el-table-column prop="warehouseName" class="table_td" label="库房名"></el-table-column>
+        <el-table-column prop="inOutType" class="table_td" label="出入库类型"></el-table-column>
+        <el-table-column prop="goodsName" class="table_td" label="货名"></el-table-column>
+        <el-table-column prop="weight" class="table_td" label="重量（吨）"></el-table-column>
+        <el-table-column prop="predictDate" class="table_td" label="预计日期"></el-table-column>
+        <el-table-column prop="publisher" class="table_td" label="发布者"></el-table-column>
         <el-table-column prop="taskStatus" label="状态">
           <template slot-scope="scope">
             <el-popover
@@ -124,33 +91,19 @@
             >
               <template>
                 <span slot="reference">
-                  <span
-                    v-if="scope.row.taskStatus == '待审核'"
-                    class="executory"
-                  ></span>
-                  <span
-                    v-if="scope.row.taskStatus == '执行中'"
-                    class="inExecution"
-                  ></span>
-                  <span
-                    v-if="scope.row.taskStatus == '已完成'"
-                    class="done"
-                  ></span>
+                  <span v-if="scope.row.taskStatus == '待审核'" class="executory"></span>
+                  <span v-if="scope.row.taskStatus == '执行中'" class="inExecution"></span>
+                  <span v-if="scope.row.taskStatus == '已完成'" class="done"></span>
                   {{ scope.row.taskStatus }}
                 </span>
               </template>
               <div>
                 <p style="margin-top: 0; padding-left: 10px">操作历史</p>
                 <div v-for="(item, index) in historyList" class="flex">
-                  <div class="vertical-text vertical-text-left">
-                    {{ item.updateDate }}
-                  </div>
+                  <div class="vertical-text vertical-text-left">{{ item.updateDate }}</div>
                   <div>
                     <div class="vertical-circle"></div>
-                    <div
-                      v-if="index != historyList.length - 1"
-                      class="vertical-line"
-                    ></div>
+                    <div v-if="index != historyList.length - 1" class="vertical-line"></div>
                   </div>
                   <div class="vertical-text">
                     {{ item.operateUser }}
@@ -170,11 +123,7 @@
             />
           </template>
         </el-table-column>
-        <el-table-column
-          prop="establishDate"
-          class="table_td"
-          label="创建时间"
-        ></el-table-column>
+        <el-table-column prop="establishDate" class="table_td" label="创建时间"></el-table-column>
         <el-table-column prop="seller" label="操作" width="300">
           <template slot-scope="scope">
             <div
@@ -183,9 +132,7 @@
               v-hasPermission="
                 `warehouseManagement.warehouse.warehouseInfoTask.View`
               "
-            >
-              查看
-            </div>
+            >查看</div>
             <div
               v-hasPermission="
                 `warehouseManagement.warehouse.warehouseInfoTask.audit`
@@ -193,9 +140,7 @@
               v-if="scope.row.taskStatus == '待审核'"
               class="adjustment"
               @click="audit(scope.row)"
-            >
-              审核
-            </div>
+            >审核</div>
             <div
               v-hasPermission="
                 `warehouseManagement.warehouse.warehouseInfoTask.edit`
@@ -206,9 +151,7 @@
               "
               class="record"
               @click="delivery(scope.row)"
-            >
-              编辑
-            </div>
+            >编辑</div>
             <div
               v-hasPermission="
                 `warehouseManagement.warehouse.warehouseInfoTask.delete`
@@ -216,11 +159,10 @@
               v-if="
                 scope.row.taskId==null
               "
+              
               class="adjustment"
               @click="deleteclick(scope.row)"
-            >
-              删除
-            </div>
+            >删除</div>
           </template>
         </el-table-column>
       </el-table>
@@ -236,7 +178,7 @@
   </div>
 </template>
 <script>
-import { getoreditoutput, outdelete ,movestates} 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'
@@ -245,7 +187,7 @@ export default {
   name: 'viewSpareMoney',
   components: {
     WsUpload,
-    Pagination,
+    Pagination
   },
   watch: {
     vesselId(val) {
@@ -253,7 +195,7 @@ export default {
     },
     isShow(val) {
       this.showType = val
-    },
+    }
   },
   data() {
     return {
@@ -277,12 +219,12 @@ export default {
       searchTypeText: '待审核',
       searchKeyWord: '',
       contractType: 2,
-       taskTypeList: [
+      taskTypeList: [
         { value: '待审核', type: 1 },
         { value: '执行中', type: 3 },
-         { value: '已驳回', type: 2 },
+        { value: '已驳回', type: 2 },
         { value: '已完成', type: 4 },
-        { value: '全部任务', type: '' },
+        { value: '全部任务', type: '' }
       ],
       // 提交类型
       submitType: true,
@@ -294,11 +236,11 @@ export default {
       deptCircularPage: {},
       historyList: [],
       pickerBeginDateBefore: {
-        disabledDate: (time) => {
+        disabledDate: time => {
           return time.getTime() > Date.now()
-        },
+        }
       },
-      accessoryTFs: false,
+      accessoryTFs: false
     }
   },
   activated() {
@@ -329,17 +271,17 @@ export default {
       this.$confirm(text, {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
-        type: 'warning',
+        type: 'warning'
       })
         .then(() => {
           console.log(row)
           outdelete({
             id: row.id,
             relevanceId: row.relevanceId,
-            inOutFlag: row.inOutFlag,
+            inOutFlag: row.inOutFlag
           })
             .toPromise()
-            .then((response) => {
+            .then(response => {
               this.getList()
             })
         })
@@ -353,10 +295,10 @@ export default {
         currentPage: this.currentPage,
         pageSize: this.pageSize,
         searchType: this.searchType,
-        searchKeyWord: this.searchKeyWord,
+        searchKeyWord: this.searchKeyWord
       })
         .toPromise()
-        .then((response) => {
+        .then(response => {
           console.log(response)
           this.gainList = response
           this.currentPage = response.current
@@ -364,28 +306,13 @@ 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()
-    // },
     //编辑
     delivery(item) {
       this.$router.push({
         path: 'tranManagementWarehouseInOutTaskEdit',
         query: {
-          relevanceId: item.relevanceId,
-        },
+          relevanceId: item.relevanceId
+        }
       })
     },
     audit(item) {
@@ -393,8 +320,8 @@ export default {
         path: 'tranManagementWarehouseInOutTaskaudit',
         query: {
           relevanceId: item.relevanceId,
-          taskId:item.taskId
-        },
+          taskId: item.taskId
+        }
       })
     },
     getSpanArr(data) {
@@ -433,8 +360,8 @@ export default {
       this.$router.push({
         path: 'inOutWarehouseTaskEdit',
         query: {
-          relevanceId: row.relevanceId,
-        },
+          relevanceId: row.relevanceId
+        }
       })
     },
     dateFormat(fmt, date) {
@@ -443,7 +370,7 @@ export default {
         'Y+': date.getFullYear().toString(), // 年
         'm+': (date.getMonth() + 1).toString(), // 月
         'd+': date.getDate().toString(), // 日
-        'H+': date.getHours().toString(), // 时
+        'H+': date.getHours().toString() // 时
         // "M+": date.getMinutes().toString(),         // 分
         // "S+": date.getSeconds().toString()          // 秒
         // 有其他格式化字符需求可以继续添加，必须转化成字符串
@@ -483,19 +410,19 @@ export default {
       this.$confirm(`是否将状态改为${status}`, {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
-        type: 'warning',
+        type: 'warning'
       })
         .then(() => {
           movestates({ id: row.id })
             .toPromise()
-            .then((response) => {
+            .then(response => {
               this.$notify.success({
                 title: '成功',
-                message: '状态修改成功',
+                message: '状态修改成功'
               })
               this.getList()
             })
-            .catch((response) => {
+            .catch(response => {
               // EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
             })
         })
@@ -513,7 +440,7 @@ export default {
     handleExamine(row) {
       this.$router.push({
         name: 'salesContractExamine',
-        query: { id: row.id },
+        query: { id: row.id }
       })
     },
     // 关闭 dialog时 处理文件url 初始化upload组件
@@ -523,38 +450,15 @@ export default {
     history(row) {
       billoperatehis({ id: row.id })
         .toPromise()
-        .then((response) => {
+        .then(response => {
           this.historyList = response
         })
     },
     find() {
       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>
 <style lang="scss" scoped>
@@ -613,7 +517,7 @@ export default {
   display: block;
   top: 5px;
   right: -2px;
-  // width: 1px;
+  width: 1px;
   height: 12px;
   background: #e9ecf7;
 }
@@ -632,7 +536,7 @@ export default {
   margin-left: 766px;
 }
 .el-pagination {
- text-align: center;
+  text-align: center;
 }
 .winseaview-main {
   background: #e8ecf6;
@@ -664,11 +568,11 @@ export default {
 .done {
   background: #50cad4;
 }
-.el-select{
+.el-select {
   width: 30%;
-    margin-right: 10px;
+  margin-right: 10px;
 }
-/deep/.typeselect .el-input__inner{
-   color: #8890B1;
+/deep/.typeselect .el-input__inner {
+  color: #8890b1;
 }
 </style>

src/views/taskManagement/tranManagementWarehouseInOutTaskAdd.vue

@@ -347,7 +347,7 @@
           <!-- 货名 -->
           <el-form-item label="货名" class="huom">
             <el-select
-              :disabled="dataList.taskTypeKey != 3"
+            :disabled='dataList.taskTypeKey != 3 || dataList.taskTypeKey == 3'
               v-model="dataList.goodsName"
               placeholder="货名"
               class="huom"
@@ -926,8 +926,8 @@ export default {
         this.$set(this.dataList1, 'unitPrice', e)
       }
     },
-    changecontract(e) {
-      if (this.dataList.taskTypeKey != 3) {
+    changecontract(e){
+      if(this.dataList.taskTypeKey != 3 ){
         for (let i = 0; i < this.contractNoList.length; i++) {
           if (this.contractNoList[i].contractNo == e) {
             getGoodsName({
@@ -953,8 +953,8 @@ export default {
         }
       }
     },
-    changecontract1(e) {
-      if (this.dataList1.taskTypeKey != 3) {
+    changecontract1(e){
+      if(this.dataList1.taskTypeKey != 3 ){
         for (let i = 0; i < this.contractNoList.length; i++) {
           if (this.contractNoList[i].contractNo == e) {
             getGoodsName({

src/views/taskManagement/tranManagementWarehouseInOutTaskEdit.vue

@@ -32,12 +32,13 @@
         <div class="nav">
         <span class="ziti">
           任务类型：
-          <h1 class="ziti1">{{dataList.inOutType}}</h1>
+          <h1 v-if='dataList.inOutType' class="ziti1">{{dataList.inOutType}}</h1>
+          <h1 v-if='dataList1.inOutType' class="ziti1">{{dataList1.inOutType}}</h1>
         </span>
       </div>
       </div>
       <div class="ding"></div>
-       <div v-if="dataList.taskTypeKey != 2&&dataList.taskTypeKey != 4" class="center1">
+       <div v-if="dataList.taskTypeKey == 1&dataList.taskTypeKey == 3||dataList1.taskTypeKey == 1&dataList.taskTypeKey1 == 3" class="center1">
           <img
             style="position: relative; top: 40px; left: 300px;" 
             width="19"
@@ -241,7 +242,7 @@
           </el-form-item>
         </el-form>
       </div>
-      <div v-show="dataList.taskTypeKey != 1" class="center1">
+      <div v-show="dataList.taskTypeKey != 1||dataList1.taskTypeKey != 1" class="center1">
         <img
             style="position: relative; top: 40px; left: 300px;" 
             width="19"
@@ -922,7 +923,7 @@ export default {
           addoreditoutput(list)
             .toPromise()
             .then((response) => {
-              this.$message.success('添加成功')
+              this.$message.success('编辑成功')
               this.$router.push({ path: 'tranManagementWarehouseInOutTask' })
             })
     },
@@ -1093,12 +1094,17 @@ export default {
               this.dataList = response[0]
               this.dataList1 = response[1]
             } else {
+              console.log(response[0].taskTypeKey)
                if(response[0].taskTypeKey==3){
                 this.deletetask=true
                 this.dataList1.inOutTaskNo='YKR'+response[0].inOutTaskNo.substr(response[0].inOutTaskNo.indexOf("C") + 1,response[0].inOutTaskNo.length)
               }
+              if(response[0].taskTypeKey==2){
+              this.dataList1 = response[0]
+            }else{
               this.dataList = response[0]
             }
+            }
           })
       } else {
         this.tasknumber()

src/views/tranManagement/tranManagementShippingArrangemen.vue

@@ -20,9 +20,9 @@
     <div class="center">
       <ws-form ref="deptBudgetList" :model="deptBudgetList" :rules="rules" class="position">
         <div class="basicInformation">
-          <div class="small-title">任务详情</div>
+          <div class="small-title" style="font-size: 16px">任务详情</div>
           <ws-info-table>
-             <ws-form-item label="任务编号" span="1" prop="processNo">{{deptBudgetList.processNo}}</ws-form-item>
+            <ws-form-item label="任务编号" span="1" prop="processNo">{{deptBudgetList.processNo}}</ws-form-item>
             <ws-form-item label="货名" span="1" prop="goodsName">{{deptBudgetList.goodsName}}</ws-form-item>
             <ws-form-item label="重量（吨）" span="1" prop="weight">{{deptBudgetList.weight}}</ws-form-item>
             <ws-form-item
@@ -30,7 +30,7 @@
               span="1"
               prop="sendDetailedAddress"
             >{{deptBudgetList.sendDetailedAddress}}</ws-form-item>
-           <ws-form-item label="发货人" span="1" prop="sender">{{deptBudgetList.sender}}</ws-form-item>
+            <ws-form-item label="发货人" span="1" prop="sender">{{deptBudgetList.sender}}</ws-form-item>
             <ws-form-item label="发货人电话" span="1" prop="senderPhone">{{deptBudgetList.senderPhone}}</ws-form-item>
             <ws-form-item
               label="收货地址"
@@ -53,95 +53,98 @@
               span="1"
               prop="deliveryDateEnd"
             >{{deptBudgetList.deliveryDateEnd}}</ws-form-item>
-            <ws-form-item label="合同编号" span="1" prop="contractNo">{{deptBudgetList.contractNo}}</ws-form-item> 
+            <ws-form-item label="合同编号" span="1" prop="contractNo">{{deptBudgetList.contractNo}}</ws-form-item>
           </ws-info-table>
-          <div class="small-title">联络员及航次</div>
+          <div class="small-title" style="font-size: 16px">联络员及航次</div>
           <div
             class="position siji"
             v-for="(item, index) in deptBudgetList.tranCarInfoList"
             :key="index"
           >
             <div class="zhong">
-                <ws-form-item label="姓名" span="1" prop="driver" >
-                  <el-select
-                    v-model="item.driver"
-                    placeholder="请选择姓名"
-                    filterable
-                    :filter-method="dataFilter"
-                    @change="selectstaff"
-                     size="small"
-                  >
-                    <el-option
-                      v-for="item in options"
-                      :key="item.value"
-                      :label="item.staffName"
-                      :value="item.staffName"
-                       
-                    />
-                  </el-select>
-                </ws-form-item>
-                <ws-form-item label="电话" span="1" prop="driverPhone" class="biao">
-                  <ws-input
-                    
-                    :readonly="true"
-                    v-model="item.driverPhone"
-                    placeholder="请输入电话"
-                    maxlength="20"
-                    size="small"
-                    class="ys"
-                  />
-                </ws-form-item>
-                <ws-form-item label="发船日期" span="1" prop="sendDateStart" class="biao2">
-                  <ws-date-picker
-                    v-model="item.sendDateStart"
-                    type="date"
-                    placeholder="请选择发货日期"
-                    value-format="yyyy-MM-dd"
-                    class="small"
+              <ws-form-item label="姓名" span="1" prop="driver">
+                <el-select
+                  v-model="item.driver"
+                  placeholder="请选择姓名"
+                  filterable
+                  :filter-method="dataFilter"
+                  @change="selectstaff"
+                  size="small"
+                >
+                  <el-option
+                    v-for="item in options"
+                    :key="item.value"
+                    :label="item.staffName"
+                    :value="item.staffName"
                   />
-                </ws-form-item>
-                <ws-form-item label="预计到港日期" span="1" prop="receiveDateEnd" class="biao3">
-                  <ws-date-picker
-                    v-model="item.receiveDateEnd"
-                    type="date"
-                    placeholder="请选择发货日期"
-                    value-format="yyyy-MM-dd"
-                    class="small"
+                </el-select>
+              </ws-form-item>
+              <ws-form-item label="电话" span="1" prop="driverPhone" class="biao">
+                <ws-input
+                  :readonly="true"
+                  v-model="item.driverPhone"
+                  placeholder="请输入电话"
+                  maxlength="20"
+                  size="small"
+                  class="ys"
+                />
+              </ws-form-item>
+              <ws-form-item label="发船日期" span="1" prop="sendDateStart" class="biao2">
+                <ws-date-picker
+                  v-model="item.sendDateStart"
+                  type="date"
+                  placeholder="请选择发货日期"
+                  value-format="yyyy-MM-dd"
+                  class="small"
+                />
+              </ws-form-item>
+              <ws-form-item label="预计到港日期" span="1" prop="receiveDateEnd" class="biao3">
+                <ws-date-picker
+                  v-model="item.receiveDateEnd"
+                  type="date"
+                  placeholder="请选择发货日期"
+                  value-format="yyyy-MM-dd"
+                  class="small"
+                />
+              </ws-form-item>
+              <ws-form-item label="航次" span="1" prop="shipNo" class="biao4">
+                <ws-input
+                  v-model="item.shipNo"
+                  placeholder="请选择航次"
+                  maxlength="100"
+                  size="small"
+                  class="ys"
+                ></ws-input>
+              </ws-form-item>
+              <ws-form-item label="船名" span="1" prop="shipName" class>
+                <ws-input
+                  v-model="item.shipName"
+                  placeholder="请输入船名"
+                  maxlength="100"
+                  size="small"
+                  class="ys"
+                ></ws-input>
+              </ws-form-item>
+              <ws-form-item label="类型" span="1" prop="shipType" class="biao5">
+                <ws-select v-model="item.shipType" placeholder="请输入" class="ys">
+                  <ws-option
+                    v-for="items in shipType"
+                    :key="items.constKey"
+                    :label="items.constValue"
+                    :value="items.constValue"
                   />
-                </ws-form-item>
-                 <ws-form-item label="航次" span="1" prop="shipNo" class="biao4">
-                  <ws-input v-model="item.shipNo" placeholder="请选择航次" maxlength="100" size="small" class="ys"></ws-input>
-                </ws-form-item>
-                <ws-form-item label="船名" span="1" prop="shipName" class="">
-                  <ws-input
-                    v-model="item.shipName"
-                    placeholder="请输入船名"
-                    maxlength="100"
-                    size="small"
-                    class="ys"
-                  ></ws-input>
-                </ws-form-item>
-                <ws-form-item label="类型" span="1" prop="shipType" class="biao5">
-                  <ws-select v-model="item.shipType" placeholder="请输入" class="ys">
-                    <ws-option
-                      v-for="items in shipType"
-                      :key="items.constKey"
-                      :label="items.constValue"
-                      :value="items.constValue"
-                       
-                    />
-                  </ws-select>
-                </ws-form-item>
-                <ws-form-item
-                  label="数量"
-                  span="1"
-                  prop="boxNumber"
-                  class="biao6"
-                  v-show="item.shipType=='集装箱'"
-                >
-                  <ws-input v-model="item.boxNumber" placeholder="请输入数量" class="ys"></ws-input>
-                </ws-form-item>
-              </ws-info-table>
+                </ws-select>
+              </ws-form-item>
+              <ws-form-item
+                label="数量"
+                span="1"
+                prop="boxNumber"
+                class="biao6"
+                v-show="item.shipType=='集装箱'"
+              >
+                <ws-input v-model="item.boxNumber" placeholder="请输入数量" class="ys"></ws-input>
+              </ws-form-item>
+              <!-- </ws-info-table> -->
             </div>
             <div
               style=" width: 536px;"
@@ -151,13 +154,13 @@
               :key="index"
             >
               <ws-info-table>
-                <ws-form-item :label="'仓位号-'+ (index +1 )" span="1" prop="impurity"  class="bot" >
+                <ws-form-item :label="'仓位号-'+ (index +1 )" span="1" prop="impurity" class="bot">
                   <el-input v-model="items.impurity"></el-input>
                 </ws-form-item>
-                 <ws-form-item label="重量(吨)" span="1" prop="positionWeight" class="bot" >
+                <ws-form-item label="重量(吨)" span="1" prop="positionWeight" class="bot">
                   <el-input v-model="items.positionWeight"></el-input>
-                </ws-form-item> 
-                 <span
+                </ws-form-item>
+                <span
                   width="22"
                   height="22"
                   class="del"
@@ -181,7 +184,7 @@
             </div>
           </div>
         </div>
-      </ws-form> 
+      </ws-form>
       <div style="text-align: right; padding: 10px">
         <el-button class="bg-bottom-up" type="primary" size="small" @click="submit()">提交</el-button>
       </div>
@@ -290,8 +293,7 @@ export default {
   },
   activated() {
     this.loaddata()
-     this.getList()
-    
+    this.getList()
   },
   computed: {
     totalStorage: function() {
@@ -349,33 +351,37 @@ export default {
         .toPromise()
         .then(response => {
           this.deptBudgetList = response
-          if(response.tranCarInfoList.length>0) {
-            for (var i = 0; i < this.deptBudgetList.tranCarInfoList.length; i++) {
-              var num = this.deptBudgetList.tranCarInfoList[i].positionWeight.split(',')
-            for (var j = 0; j < num.length; j++) {
-              var num2 = num[j].split('/')
-              this.freightspace.push({
-                impurity: num2[i],
-                positionWeight: num2[num2.length - 1]
-              })
+          if (response.tranCarInfoList.length > 0) {
+            for (
+              var i = 0;
+              i < this.deptBudgetList.tranCarInfoList.length;
+              i++
+            ) {
+              var num = this.deptBudgetList.tranCarInfoList[
+                i
+              ].positionWeight.split(',')
+              for (var j = 0; j < num.length; j++) {
+                var num2 = num[j].split('/')
+                this.freightspace.push({
+                  impurity: num2[i],
+                  positionWeight: num2[num2.length - 1]
+                })
+              }
             }
-          }
-          }else{
+          } else {
             this.deptBudgetList.tranCarInfoList = [
               {
-                driver:'',
-                driverPhone:'',
-                sendDateStart:'',
+                driver: '',
+                driverPhone: '',
+                sendDateStart: '',
                 receiveDateEnd: '',
-                shipNo:'',
-                shipName:'',
-                shipType:'',
-                boxNumber:'',
-                positionWeight:'',
-                impurity:'',
-                tranType:'3'
-
-
+                shipNo: '',
+                shipName: '',
+                shipType: '',
+                boxNumber: '',
+                positionWeight: '',
+                impurity: '',
+                tranType: '3'
               }
             ]
           }
@@ -402,7 +408,7 @@ export default {
     },
     returnsales() {
       this.deptBudgetList = {}
-      this.freightspace =[]
+      this.freightspace = []
       this.selectedOptions = ''
       this.$router.push({ path: 'tranManagementShipping' })
     },
@@ -451,14 +457,14 @@ export default {
           })
           return
         }
-         if(this.deptBudgetList.tranCarInfoList[i].shipType == '集装箱'){
-        if (!this.deptBudgetList.tranCarInfoList[i].boxNumber) {
-          this.$message({
-            message: '数量不能为空',
-            type: 'warning'
-          })
-          return
-        }
+        if (this.deptBudgetList.tranCarInfoList[i].shipType == '集装箱') {
+          if (!this.deptBudgetList.tranCarInfoList[i].boxNumber) {
+            this.$message({
+              message: '数量不能为空',
+              type: 'warning'
+            })
+            return
+          }
         }
         if (!this.deptBudgetList.tranCarInfoList[i].shipType) {
           this.$message({
@@ -467,25 +473,24 @@ export default {
           })
           return
         }
-// console.log(this.freightspace,"仓位号")
-        for(var i = 0 ; i < this.freightspace.length ; i++){
+        // console.log(this.freightspace,"仓位号")
+        for (var i = 0; i < this.freightspace.length; i++) {
           if (!this.freightspace[i].impurity) {
-          this.$message({
-            message: '仓位号不能为空',
-            type: 'warning'
-          })
-          return
-        }
-        if (!this.freightspace[i].positionWeight) {
-          this.$message({
-            message: '重量不能为空',
-            type: 'warning'
-          })
-          return
+            this.$message({
+              message: '仓位号不能为空',
+              type: 'warning'
+            })
+            return
+          }
+          if (!this.freightspace[i].positionWeight) {
+            this.$message({
+              message: '重量不能为空',
+              type: 'warning'
+            })
+            return
+          }
         }
 
-        }
-        
         if (
           new Date(
             this.deptBudgetList.tranCarInfoList[0].sendDateStart
@@ -620,7 +625,6 @@ export default {
 
 .bot {
   width: 30%;
- 
 }
 //去边框
 /deep/.el-form-item {
@@ -672,7 +676,6 @@ export default {
   border-radius: 4px;
   /* border: 1px solid #d8dce6; */
   width: 1219px;
-  
 }
 /deep/.zi {
   width: 64px;
@@ -753,63 +756,58 @@ export default {
   width: 1000px;
 }
 /deep/.el-select .el-input__inner {
-    border: 1px solid #ccc !important;
-    padding: 0 15px !important;
-    font-size: 12px !important;
-    width: 150px;
+  border: 1px solid #ccc !important;
+  padding: 0 15px !important;
+  font-size: 12px !important;
+  width: 125px;
 }
 .zhong {
-    height: 111px;
-    background: #F6F7FC;
-    border-radius: 4px;
-    border: 1px solid #D8DCE6;
-    width: 99%;
-    margin: 0 2%;
-    // margin-left: -76px;
+  height: 111px;
+  background: #f6f7fc;
+  border-radius: 4px;
+  border: 1px solid #d8dce6;
+  width: 99%;
+  margin: 0 2%;
+  // margin-left: -76px;
 }
 .bg-left {
   padding-left: 30px;
 }
-/deep/.el-icon-arrow-up:before {
-    margin-left: 171px;
-    // display: none;
-}
 /deep/.el-input--prefix .el-input__inner {
-    padding-left: 30px;
-    width: 150px;
+  padding-left: 30px;
+  width: 150px;
 }
 .basicInformation .ws-info-table {
-    border: none;
-    width: 141%;
-    margin: 0 auto;
-    // margin-left: -89px;
+  border: none;
+  width: 141%;
+  margin: 0 auto;
+  // margin-left: -89px;
 }
-.ys{
+.ys {
   // margin-left: 300px;
   width: 100px;
-
 }
-.biao{
+.biao {
   margin-left: 240px;
   margin-top: -57px;
 }
-.biao2{
+.biao2 {
   margin-left: 441px;
   margin-top: -59px;
 }
-.biao3{
-   margin-left: 722px;
+.biao3 {
+  margin-left: 722px;
   margin-top: -60px;
 }
-.biao4{
+.biao4 {
   margin-left: 1016px;
   margin-top: -60px;
 }
-.biao5{
+.biao5 {
   margin-left: 200px;
   margin-top: -57px;
 }
-.biao6{
+.biao6 {
   margin-left: 450px;
   margin-top: -57px;
 }
@@ -1129,28 +1127,33 @@ export default {
 //   border-radius: 10px;
 //   right: 20px;
 // }
- /deep/.ws-info-table .el-form-item .el-form-item__label {
-    /* background-color: #fff; */
-    font-size: 14px;
-    font-weight: 400;
-    color: #8890b1;
-    line-height: 16px;
-    background: border-box;
-}
- /deep/.ws-info-table .el-form-item .el-form-item__content {
-    background: #f5f7fa;
-    border-radius: 4px;
-    /* border: 1px solid #d8dce6; */
-    border: none;
-}
- /deep/.basicInformation .el-form-item .el-form-item__label {
-    background: transparent;
-    border: none;
-    font-size: 14px;
-    font-family: PingFangSC-Regular, PingFang SC;
-    font-weight: 400;
-    color: #8890B1;
-    line-height: 16px;
-    margin-left: 22px;
+/deep/.ws-info-table .el-form-item .el-form-item__label {
+  /* background-color: #fff; */
+  font-size: 14px;
+  font-weight: 400;
+  color: #8890b1;
+  line-height: 16px;
+  background: border-box;
 }
+/deep/.ws-info-table .el-form-item .el-form-item__content {
+  background: #f5f7fa;
+  border-radius: 4px;
+  /* border: 1px solid #d8dce6; */
+  border: none;
+}
+/deep/.basicInformation .el-form-item .el-form-item__label {
+  background: transparent;
+  border: none;
+  font-size: 14px;
+  font-family: PingFangSC-Regular, PingFang SC;
+  font-weight: 400;
+  color: #8890b1;
+  line-height: 16px;
+  margin-left: 22px;
+}
+/deep/.el-form-item__content .el-select {
+  width: 42%;
+  
+}
+
 </style>

src/views/tranManagement/tranManagementTransporTrainNo.vue

@@ -130,11 +130,11 @@
             />
           </ws-form-item>
           <!--到站日期-->
-          <ws-form-item label="到站日期" span="1" prop="receiveDateEnd">
+          <ws-form-item label="预计到站日期" span="1" prop="receiveDateEnd">
             <ws-date-picker
               v-model="item.receiveDateEnd"
               type="date"
-              placeholder="请选择到站日期"
+              placeholder="请选择预计到站日期"
               value-format="yyyy-MM-dd"
             />
           </ws-form-item>

src/views/warehouse/warehouseManagementPut.vue

@@ -6,19 +6,15 @@
         <h2 class="bg-left title">入库登记</h2>
       </el-col>
       <el-col :span="4" class="bg-right">
-        <el-button
-          class="bg-bottom"
-          type="primary"
-          size="small"
-          @click="revert()"
-          ><img
+        <el-button class="bg-bottom" type="primary" size="small" @click="revert()">
+          <img
             width="6"
             height="10"
             style="vertical-align: bottom; margin-right: 3px"
             src="../../../public/img/lujing.png"
-            alt=""
-          />返回</el-button
-        >
+            alt
+          />返回
+        </el-button>
       </el-col>
     </el-row>
 
@@ -30,12 +26,13 @@
             width="19"
             height="19"
             src="../../../public/img/cangku.png"
-            alt=""
+            alt
           />
           {{ deptBudgetList.warehouseName }}库
-          <span class="position" v-show="this.$route.query.warehouseType == 1">
-            {{ deptBudgetList.binNumber }}仓位
-          </span>
+          <span
+            class="position"
+            v-show="this.$route.query.warehouseType == 1"
+          >{{ deptBudgetList.binNumber }}仓位</span>
           <span v-show="this.$route.query.warehouseType == 2">(临)</span>
         </h2>
         <ws-info-table>
@@ -43,7 +40,7 @@
           <ws-form-item label="货名" span="1">
             <ws-select
               v-model="deptBudgetList.goodsName"
-              placeholder=""
+              placeholder
               class="typeselect"
               @change="selectgoodsName"
             >
@@ -67,12 +64,7 @@
           </ws-form-item>
 
           <!--皮重（吨）-->
-          <ws-form-item
-            label="皮重（吨）"
-            span="1"
-            prop="tare"
-            class="readonly"
-          >
+          <ws-form-item label="皮重（吨）" span="1" prop="tare" class="readonly">
             <ws-input
               @input="tarechange"
               v-model="deptBudgetList.tare"
@@ -96,7 +88,7 @@
           <ws-form-item label="品级" span="1" class="readonly">
             <ws-select
               v-model="deptBudgetList.grade"
-              placeholder=""
+              placeholder
               class="typeselect"
               @change="selectpackingMethod"
             >
@@ -127,12 +119,7 @@
             </el-select>
           </ws-form-item>
           <!--出库日期-->
-          <ws-form-item
-            label="入库日期"
-            span="1"
-            prop="inOutDate"
-            class="deliverydate"
-          >
+          <ws-form-item label="入库日期" span="1" prop="inOutDate" class="deliverydate">
             <ws-date-picker
               v-model="deptBudgetList.inOutDate"
               type="date"
@@ -144,7 +131,7 @@
           <ws-form-item label="入库类型" span="1">
             <ws-select
               v-model="deptBudgetList.inOutType"
-              placeholder=""
+              placeholder
               class="typeselect"
               @change="selectstorageType"
             >
@@ -185,17 +172,11 @@
         </ws-info-table>
         <div v-show="this.$route.query.warehouseType == 2 && this.deptBudgetList.createType == 2">
           <el-checkbox v-model="checked" checked>退库并出库</el-checkbox>
-          <ws-info-table
-            v-show="checked == true && this.deptBudgetList.createType == 2"
-          >
+          <ws-info-table v-show="checked == true && this.deptBudgetList.createType == 2">
             <!-- 出库类型 -->
             <ws-form-item label="出库类型" span="1" prop="temporaryOutType">
-               <!-- v-model="deptBudgetList.deliveryType" -->
-              <ws-select
-                v-model="deptBudgetList.temporaryOutType"
-                placeholder=""
-                class="typeselect"
-              >
+              <!-- v-model="deptBudgetList.deliveryType" -->
+              <ws-select v-model="deptBudgetList.temporaryOutType" placeholder class="typeselect">
                 <ws-option
                   v-for="item in deliveryType"
                   :key="item.constKey"
@@ -306,20 +287,8 @@
         </ws-info-table>
       </div>
       <div style="text-align: right; padding: 10px">
-        <el-button
-          class="bg-bottom-up"
-          type="primary"
-          size="small"
-          @click="temporaryStorage()"
-          >暂存</el-button
-        >
-        <el-button
-          class="bg-bottom-up"
-          type="primary"
-          size="small"
-          @click="submit()"
-          >提交</el-button
-        >
+        <el-button class="bg-bottom-up" type="primary" size="small" @click="temporaryStorage()">暂存</el-button>
+        <el-button class="bg-bottom-up" type="primary" size="small" @click="submit()">提交</el-button>
       </div>
     </ws-form>
   </div>
@@ -329,7 +298,7 @@ import {
   pullDown,
   addstorageputList,
   xialaNo,
-  getstaff,
+  getstaff
 } from '@/model/warehouse/index'
 import Pagination from '@/components/Pagination'
 import WsUpload from '@/components/WsUpload'
@@ -339,7 +308,7 @@ export default {
   name: 'viewSpareMoney',
   components: {
     WsUpload,
-    Pagination,
+    Pagination
   },
   watch: {
     // vesselId(val) {
@@ -347,7 +316,7 @@ export default {
     // },
     isShow(val) {
       this.showType = val
-    },
+    }
   },
   data() {
     return {
@@ -393,9 +362,9 @@ export default {
             required: true,
             type: 'number',
             message: '请输入活动名称',
-            trigger: 'blur',
-          },
-        ],
+            trigger: 'blur'
+          }
+        ]
       },
       size: 10,
       compId: sessionStorage.getItem('ws-pf_compId'),
@@ -403,20 +372,20 @@ export default {
       packtypeList: {},
       date: {
         year: dayjs().format('YYYY'),
-        month: dayjs().format('MM'),
+        month: dayjs().format('MM')
       },
       contractList: [],
       deptBudgetList: {
-        warehouseInOutDetail: {},
+        warehouseInOutDetail: {}
       },
       historyList: [],
 
       pickerBeginDateBefore: {
-        disabledDate: (time) => {
+        disabledDate: time => {
           return time.getTime() > Date.now()
-        },
+        }
       },
-      accessoryTFs: false,
+      accessoryTFs: false
     }
   },
   mounted() {
@@ -426,7 +395,7 @@ export default {
     this.deptBudgetList.binNumber = this.$route.query.binNumber
     this.deptBudgetList.warehouseType = this.$route.query.warehouseType
     this.deptBudgetList.createType = this.$route.query.createType
- 
+
     this.getList()
     this.deptBudgetList.goodsName = '玉米'
     this.deptBudgetList.goodsNameKey = '1'
@@ -450,7 +419,7 @@ export default {
       this.deptBudgetList.staffList = val
       if (val) {
         //val存在
-        this.options = this.staffList.filter((item) => {
+        this.options = this.staffList.filter(item => {
           if (
             !!~item.staffName.indexOf(val) ||
             !!~item.staffName.toUpperCase().indexOf(val.toUpperCase())
@@ -475,14 +444,14 @@ export default {
       if (!this.deptBudgetList.goodsName) {
         this.$message({
           message: '货名不能为空',
-          type: 'warning',
+          type: 'warning'
         })
         return
       }
       if (!this.deptBudgetList.grossWeight) {
         this.$message({
           message: '毛重不能为空',
-          type: 'warning',
+          type: 'warning'
         })
         return
       }
@@ -496,14 +465,14 @@ export default {
       ) {
         this.$message({
           message: '毛重输入错误',
-          type: 'warning',
+          type: 'warning'
         })
         return
       }
       if (!this.deptBudgetList.tare) {
         this.$message({
           message: '皮重不能为空',
-          type: 'warning',
+          type: 'warning'
         })
         return
       }
@@ -517,14 +486,14 @@ export default {
       ) {
         this.$message({
           message: '皮重输入错误',
-          type: 'warning',
+          type: 'warning'
         })
         return
       }
       if (!this.deptBudgetList.agent) {
         this.$message({
           message: '经办人不能为空',
-          type: 'warning',
+          type: 'warning'
         })
         return
       }
@@ -534,49 +503,51 @@ export default {
       ) {
         this.$message({
           message: '经办人输入有误',
-          type: 'warning',
+          type: 'warning'
         })
         return
       }
       if (!this.deptBudgetList.grade) {
         this.$message({
           message: '品级不能为空！',
-          type: 'warning',
+          type: 'warning'
         })
         return
       }
       if (!this.deptBudgetList.inOutDate) {
         this.$message({
           message: '入库日期不能为空！',
-          type: 'warning',
+          type: 'warning'
         })
         return
       }
       if (!this.deptBudgetList.inOutType) {
         this.$message({
           message: '入库类型不能为空！',
-          type: 'warning',
+          type: 'warning'
         })
         return
       }
+
       if (!this.deptBudgetList.carNo) {
         this.$message({
           message: '车牌号不能为空',
-          type: 'warning',
+          type: 'warning'
         })
         return
       }
+
       if (this.deptBudgetList.carNo.length > 7) {
         this.$message({
           message: '车牌号输入错误,请输入7个字符之内',
-          type: 'warning',
+          type: 'warning'
         })
         return
       }
       if (!this.deptBudgetList.contractNo) {
         this.$message({
           message: '合同编号不能为空',
-          type: 'warning',
+          type: 'warning'
         })
         return
       }
@@ -586,7 +557,7 @@ export default {
       ) {
         this.$message({
           message: '合同编号长度不符合要求,请输入6-20个字符之内',
-          type: 'warning',
+          type: 'warning'
         })
         return
       }
@@ -599,7 +570,7 @@ export default {
         ) {
           this.$message({
             message: '质检员姓名长度错误！',
-            type: 'warning',
+            type: 'warning'
           })
           return
         }
@@ -608,7 +579,7 @@ export default {
         if (isNaN(this.deptBudgetList.warehouseInOutDetail.waterContent)) {
           this.$message({
             message: '水分（%）非数字!',
-            type: 'warning',
+            type: 'warning'
           })
           return
         }
@@ -628,7 +599,7 @@ export default {
         ) {
           this.$message({
             message: '水分（%）输入错误! 取值范围1-40之间且可以保留2小数',
-            type: 'warning',
+            type: 'warning'
           })
           return
         }
@@ -639,7 +610,7 @@ export default {
         if (isNaN(this.deptBudgetList.warehouseInOutDetail.impurity)) {
           this.$message({
             message: '杂质（%）非数字!',
-            type: 'warning',
+            type: 'warning'
           })
           return
         }
@@ -658,7 +629,7 @@ export default {
         ) {
           this.$message({
             message: '杂质（%）输入错误! 取值范围1-40之间且可以保留2小数',
-            type: 'warning',
+            type: 'warning'
           })
           return
         }
@@ -668,7 +639,7 @@ export default {
         if (isNaN(this.deptBudgetList.warehouseInOutDetail.mildewGrain)) {
           this.$message({
             message: '霉变粒（%）非数字!',
-            type: 'warning',
+            type: 'warning'
           })
           return
         }
@@ -688,7 +659,7 @@ export default {
         ) {
           this.$message({
             message: '霉变粒（%）输入错误! 取值范围1-40之间且可以保留2小数',
-            type: 'warning',
+            type: 'warning'
           })
           return
         }
@@ -699,7 +670,7 @@ export default {
         if (isNaN(this.deptBudgetList.warehouseInOutDetail.jiaorenli)) {
           this.$message({
             message: '热损伤（%）非数字!',
-            type: 'warning',
+            type: 'warning'
           })
           return
         }
@@ -718,7 +689,7 @@ export default {
         ) {
           this.$message({
             message: '热损伤（%）输入错误! 取值范围1-40之间且可以保留2小数',
-            type: 'warning',
+            type: 'warning'
           })
           return
         }
@@ -729,7 +700,7 @@ export default {
         if (isNaN(this.deptBudgetList.warehouseInOutDetail.imperfectGrain)) {
           this.$message({
             message: '不完整粒（%）非数字!',
-            type: 'warning',
+            type: 'warning'
           })
           return
         }
@@ -749,7 +720,7 @@ export default {
         ) {
           this.$message({
             message: '不完整粒（%）输入错误! 取值范围1-40之间且可以保留2小数',
-            type: 'warning',
+            type: 'warning'
           })
           return
         }
@@ -759,7 +730,7 @@ export default {
         if (isNaN(this.deptBudgetList.warehouseInOutDetail.bulkDensity)) {
           this.$message({
             message: '容重（克/升）非数字!',
-            type: 'warning',
+            type: 'warning'
           })
           return
         }
@@ -779,7 +750,7 @@ export default {
         ) {
           this.$message({
             message: '容重（克/升）输入错误! 取值范围1-40之间且是整数',
-            type: 'warning',
+            type: 'warning'
           })
           return
         }
@@ -788,18 +759,19 @@ export default {
       this.$confirm(`确定提交入库信息`, {
         cancelButtonText: '取消',
         confirmButtonText: '确定',
-        type: 'warning',
+        type: 'warning'
       })
         .then(() => {
-          this.$refs.deptBudgetList.validate((valid) => {
+          this.$refs.deptBudgetList.validate(valid => {
             if (valid) {
-              this.deptBudgetList.compId =
-                sessionStorage.getItem('ws-pf_compId')
+              this.deptBudgetList.compId = sessionStorage.getItem(
+                'ws-pf_compId'
+              )
               this.deptBudgetList.inOutFlag = 2
               this.deptBudgetList.statusFlag = 3
               addstorageputList(this.deptBudgetList)
                 .toPromise()
-                .then((response) => {
+                .then(response => {
                   this.$message.success('添加成功')
                   this.$router.push({ path: 'warehouseManagementList' })
                 })
@@ -817,14 +789,14 @@ export default {
       if (!this.deptBudgetList.goodsName) {
         this.$message({
           message: '货名不能为空',
-          type: 'warning',
+          type: 'warning'
         })
         return
       }
       if (!this.deptBudgetList.grossWeight) {
         this.$message({
           message: '毛重不能为空',
-          type: 'warning',
+          type: 'warning'
         })
         return
       }
@@ -838,14 +810,14 @@ export default {
       ) {
         this.$message({
           message: '毛重输入错误',
-          type: 'warning',
+          type: 'warning'
         })
         return
       }
       if (!this.deptBudgetList.tare) {
         this.$message({
           message: '皮重不能为空',
-          type: 'warning',
+          type: 'warning'
         })
         return
       }
@@ -859,14 +831,14 @@ export default {
       ) {
         this.$message({
           message: '皮重输入错误',
-          type: 'warning',
+          type: 'warning'
         })
         return
       }
       if (!this.deptBudgetList.agent) {
         this.$message({
           message: '经办人不能为空',
-          type: 'warning',
+          type: 'warning'
         })
         return
       }
@@ -876,28 +848,28 @@ export default {
       ) {
         this.$message({
           message: '经办人输入有误',
-          type: 'warning',
+          type: 'warning'
         })
         return
       }
       if (!this.deptBudgetList.carNo) {
         this.$message({
           message: '车牌号不能为空',
-          type: 'warning',
+          type: 'warning'
         })
         return
       }
       if (this.deptBudgetList.carNo.length > 7) {
         this.$message({
           message: '车牌号输入错误,请输入7个字符之内',
-          type: 'warning',
+          type: 'warning'
         })
         return
       }
       if (!this.deptBudgetList.contractNo) {
         this.$message({
           message: '合同编号不能为空',
-          type: 'warning',
+          type: 'warning'
         })
         return
       }
@@ -907,7 +879,7 @@ export default {
       ) {
         this.$message({
           message: '合同编号长度不符合要求,请输入6-20个字符之内',
-          type: 'warning',
+          type: 'warning'
         })
         return
       }
@@ -927,7 +899,7 @@ export default {
         ) {
           this.$message({
             message: '质检员姓名长度错误！',
-            type: 'warning',
+            type: 'warning'
           })
           return
         }
@@ -936,7 +908,7 @@ export default {
         if (isNaN(this.deptBudgetList.warehouseInOutDetail.waterContent)) {
           this.$message({
             message: '水分（%）非数字!',
-            type: 'warning',
+            type: 'warning'
           })
           return
         }
@@ -956,7 +928,7 @@ export default {
         ) {
           this.$message({
             message: '水分（%）输入错误! 取值范围1-40之间且可以保留2小数',
-            type: 'warning',
+            type: 'warning'
           })
           return
         }
@@ -967,7 +939,7 @@ export default {
         if (isNaN(this.deptBudgetList.warehouseInOutDetail.impurity)) {
           this.$message({
             message: '杂质（%）非数字!',
-            type: 'warning',
+            type: 'warning'
           })
           return
         }
@@ -986,7 +958,7 @@ export default {
         ) {
           this.$message({
             message: '杂质（%）输入错误! 取值范围1-40之间且可以保留2小数',
-            type: 'warning',
+            type: 'warning'
           })
           return
         }
@@ -996,7 +968,7 @@ export default {
         if (isNaN(this.deptBudgetList.warehouseInOutDetail.mildewGrain)) {
           this.$message({
             message: '霉变粒（%）非数字!',
-            type: 'warning',
+            type: 'warning'
           })
           return
         }
@@ -1016,7 +988,7 @@ export default {
         ) {
           this.$message({
             message: '霉变粒（%）输入错误! 取值范围1-40之间且可以保留2小数',
-            type: 'warning',
+            type: 'warning'
           })
           return
         }
@@ -1027,7 +999,7 @@ export default {
         if (isNaN(this.deptBudgetList.warehouseInOutDetail.jiaorenli)) {
           this.$message({
             message: '热损伤（%）非数字!',
-            type: 'warning',
+            type: 'warning'
           })
           return
         }
@@ -1046,7 +1018,7 @@ export default {
         ) {
           this.$message({
             message: '热损伤（%）输入错误! 取值范围1-40之间且可以保留2小数',
-            type: 'warning',
+            type: 'warning'
           })
           return
         }
@@ -1057,7 +1029,7 @@ export default {
         if (isNaN(this.deptBudgetList.warehouseInOutDetail.imperfectGrain)) {
           this.$message({
             message: '不完整粒（%）非数字!',
-            type: 'warning',
+            type: 'warning'
           })
           return
         }
@@ -1077,7 +1049,7 @@ export default {
         ) {
           this.$message({
             message: '不完整粒（%）输入错误! 取值范围1-40之间且可以保留2小数',
-            type: 'warning',
+            type: 'warning'
           })
           return
         }
@@ -1087,7 +1059,7 @@ export default {
         if (isNaN(this.deptBudgetList.warehouseInOutDetail.bulkDensity)) {
           this.$message({
             message: '容重（克/升）非数字!',
-            type: 'warning',
+            type: 'warning'
           })
           return
         }
@@ -1107,7 +1079,7 @@ export default {
         ) {
           this.$message({
             message: '容重（克/升）输入错误! 取值范围1-40之间且是整数',
-            type: 'warning',
+            type: 'warning'
           })
           return
         }
@@ -1115,18 +1087,19 @@ export default {
       this.$confirm(`暂存后可在待完成页面查看，确定暂存`, {
         cancelButtonText: '取消',
         confirmButtonText: '确定',
-        type: 'warning',
+        type: 'warning'
       })
         .then(() => {
-          this.$refs.deptBudgetList.validate((valid) => {
+          this.$refs.deptBudgetList.validate(valid => {
             if (valid) {
-              this.deptBudgetList.compId =
-                sessionStorage.getItem('ws-pf_compId')
+              this.deptBudgetList.compId = sessionStorage.getItem(
+                'ws-pf_compId'
+              )
               this.deptBudgetList.inOutFlag = 2
               this.deptBudgetList.statusFlag = 1
               addstorageputList(this.deptBudgetList)
                 .toPromise()
-                .then((response) => {
+                .then(response => {
                   this.$message.success('暂存成功')
                   this.$router.push({ path: 'warehouseManagementList' })
                 })
@@ -1192,47 +1165,47 @@ export default {
       // 货名
       pullDown({ constId: 'CON2' })
         .toPromise()
-        .then((response) => {
+        .then(response => {
           this.goodnameList = response
         })
       // 品级
       pullDown({ constId: 'CON3' })
         .toPromise()
-        .then((response) => {
+        .then(response => {
           this.gradeList = response
         })
       // 类型
       if (this.deptBudgetList.warehouseType == '1') {
         pullDown({ constId: 'CON5' })
           .toPromise()
-          .then((response) => {
+          .then(response => {
             this.storageType = response
           })
       } else if (this.deptBudgetList.warehouseType == '2') {
         pullDown({ constId: 'WARE1' })
           .toPromise()
-          .then((response) => {
+          .then(response => {
             this.storageType = response
           })
 
         pullDown({ constId: 'WARE2' })
           .toPromise()
-          .then((response) => {
+          .then(response => {
             this.deliveryType = response
           })
       }
       //合同编号
       xialaNo({ compId: sessionStorage.getItem('ws-pf_compId') })
         .toPromise()
-        .then((response) => {
+        .then(response => {
           this.outContractNo = response
         })
       //经办人
       getstaff({ compId: sessionStorage.getItem('ws-pf_compId') })
         .toPromise()
-        .then((response) => {
+        .then(response => {
           this.options = response
-           this.staffList = response
+          this.staffList = response
           //  this.agent = response
         })
     },
@@ -1260,10 +1233,10 @@ export default {
     handleExamine(row) {
       this.$router.push({
         name: 'salesContractExamine',
-        query: { id: row.id },
+        query: { id: row.id }
       })
-    },
-  },
+    }
+  }
 }
 </script>
 <style lang="scss" scoped>

vue.config.js

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