前端gjy

src/views/taskManagement/tranManagementTransport.vue

@@ -1,45 +1,34 @@
 <!--运输任务-->
 <template>
   <div>
-    <BaseHeaderLayout :leftSpan="20">
-      <template slot="right">
-        <ws-button class="but" type="primary" @click="handleAdd()"
-          >添加</ws-button
-        >
-      </template>
+    <BaseHeaderLayout :leftSpan="15">
       <template slot="left">
-        <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>
-      </template>
-      <template slot="left">
-        <ws-input
+        <span style='width: 134px;
+    display: inline-block;'>起点：</span>
+        <el-input
           label="起点"
           placeholder="请输入起点"
           clearable
           maxlength="200"
           type="input"
-          class="find"
-        ></ws-input>
-
-        <ws-input
+        ></el-input>
+        <span style='width: 134px;
+    display: inline-block;'>终点：</span>
+        <el-input
           label="终点"
           placeholder="请输入终点"
           clearable
           maxlength="200"
           type="input"
-          class="find"
-        ></ws-input>
-        <ws-input
+        ></el-input>
+        <el-input
           v-model="warehouseName"
           placeholder="可按合同编号或运输任务编号查找"
           clearable
           maxlength="500"
           type="input"
           class="findValue"
-        ></ws-input>
+        ></el-input>
         <!-- v-hasPermission="'procurement.sparepart.directShip'" -->
         <div class="search">
           <ws-button class="find" type="primary" @click="lookUp()"
@@ -57,21 +46,31 @@
           /></ws-button>
         </div>
       </template>
+      <template slot="right">
+        <ws-button class="but" type="primary" @click="handleAdd()"
+          >添加</ws-button
+        >
+      </template>
     </BaseHeaderLayout>
     <div>
+        <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>
       <el-table
         class="wenzi"
         :data="gainList.records"
         style="width: 100%; margin-top: 20px"
         height="780"
       >
-        <el-table-column type="index" label="序号">
+        <el-table-column type="index">
           <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="taskNo" label="运输任务编号" width="80">
+        <el-table-column prop="taskNo" label="运输任务编号" width="140">
         </el-table-column>
         <el-table-column prop="contractNo" label="合同编号"> </el-table-column>
         <el-table-column prop=" weight" class="table_td" label="货物（吨数）">
@@ -203,6 +202,7 @@ export default {
       year: '',
       gainList: [],
       currentPage: 1,
+      primary:1,
       pageSize: 10,
       searchType: 1,
       searchTypeText: '未完成',
@@ -274,6 +274,14 @@ export default {
     },
     handlestatus(status) {
       this.searchType = status
+      if(status==1){
+        this.primary=1
+      }else if(status==2){
+        this.primary=2
+      }else{
+        this.primary=3
+      }
+      
       this.getList()
     },
     //编辑
@@ -512,11 +520,6 @@ export default {
   background-color: #fff;
   color: #8890b1;
 }
-/deep/.el-table td,
-/deep/.el-table th.is-leaf {
-  border-right: 1px solid #e9ecf7;
-  text-align: center;
-}
 /deep/.el-table tr td:first-child,
 /deep/.el-table tr th.is-leaf:first-child {
   border-left: 1px solid #e9ecf7;
@@ -538,24 +541,20 @@ export default {
   height: 12px;
   background: #e9ecf7;
 }
-.el-row {
-  height: 150px;
-}
-.base_header_layout .grid-content {
-  margin-top: 80px;
+ /deep/.base_header_layout .grid-content {
+ margin-bottom: 60px;
 }
-.but {
-  margin-top: 150px;
+/deep/.el-table td, /deep/.el-table th.is-leaf {
+    border-right: 1px solid transparent; 
 }
-.findValue {
+.findValue.el-input {
   width: 50%;
-  margin-left: 25%;
+  margin:0;
 }
-/deep/.el-input--small .el-input__inner {
-  margin-left: -230px;
-  width: 300px;
+.el-input{
+  margin:0 10px;
 }
-.search {
-  margin-left: -100px;
+/deep/.search .el-button--small{
+  padding:0;
 }
 </style>

src/views/taskManagement/tranManagementWarehouseInOutTaskAdd.vue

@@ -74,7 +74,7 @@
             </el-select>
           </el-form-item>
           <!-- 合同编号 -->
-          <el-form-item label="合同编号">
+          <el-form-item v-if='dataList.taskTypeKey != 3' label="合同编号">
             <el-select
               v-model="dataList.contractNo"
               placeholder="请输入合同编号"
@@ -88,6 +88,21 @@
               ></el-option>
             </el-select>
           </el-form-item>
+          <el-form-item v-if='dataList.taskTypeKey == 3' label="移库任务编号">
+            <el-select
+            @change="selectTaskNo"
+              v-model="dataList.moveTaskNo"
+              placeholder="请输入移库任务编号"
+              class="typeselect"
+            >
+              <el-option
+                v-for="item in contractNoList"
+                :key="item.constKey"
+                :label="item.contractNo"
+                :value="item.contractNo"
+              ></el-option>
+            </el-select>
+          </el-form-item>
           <!-- 货名 -->
           <el-form-item label="货名">
             <el-select
@@ -242,7 +257,7 @@
             </el-select>
           </el-form-item>
           <!-- 合同编号 -->
-          <el-form-item label="合同编号">
+          <el-form-item v-if='dataList1.taskTypeKey != 3' label="合同编号">
             <el-select
               v-model="dataList1.contractNo"
               placeholder="请输入合同编号"
@@ -256,6 +271,21 @@
               ></el-option>
             </el-select>
           </el-form-item>
+          <el-form-item v-if='dataList1.taskTypeKey == 3' label="移库任务编号">
+            <el-select
+            disabled
+              v-model="dataList1.moveTaskNo"
+              placeholder="请输入移库任务编号"
+              class="typeselect"
+            >
+              <el-option
+                v-for="item in contractNoList"
+                :key="item.constKey"
+                :label="item.contractNo"
+                :value="item.contractNo"
+              ></el-option>
+            </el-select>
+          </el-form-item>
           <!-- 货名 -->
           <el-form-item label="货名">
             <el-select
@@ -525,6 +555,11 @@ export default {
 
       return arr.join('')
     },
+    selectTaskNo(e){
+      if(this.dataList.taskTypeKey==3){
+          this.dataList1.moveTaskNo=e
+      }
+    },
     dataFilter(val) {
       // console.log(val,"名")
       this.deptBudgetList.staffList = val