浏览代码

修改 pc运输任务 :状态筛选不可用,做成切换后自动筛选,不需要点搜索

achao 3 年之前
父节点
当前提交
aa38f2d47b

+ 0 - 1
src/utils/util.js

@@ -402,7 +402,6 @@ export const getValue = (route) => {
 
 
 // null赋值空字符串
 // null赋值空字符串
 export const nullToString = (obj) => {
 export const nullToString = (obj) => {
-
   Object.keys(obj).forEach(function(key) {
   Object.keys(obj).forEach(function(key) {
     console.log(key, obj[key])
     console.log(key, obj[key])
     if (obj[key] === null) {
     if (obj[key] === null) {

+ 2 - 3
src/views/taskManagement/tranManagementTransporTationFire.vue

@@ -3,9 +3,8 @@
   <div>
   <div>
     <BaseHeaderLayout :leftSpan="20">
     <BaseHeaderLayout :leftSpan="20">
       <template slot="left">
       <template slot="left">
-        <ws-button class="but" type="primary" @click="handleAdd()" v-hasPermission="
-            `${$permission('PERMISSIONS.PURSPAPPLINFO_CREATEINSTORE')}`
-          ">
+        <ws-button class="but" type="primary" @click="handleAdd()"
+          v-hasPermission="`${$permission('PERMISSIONS.PURSPAPPLINFO_CREATEINSTORE')}`">
           执行中</ws-button>
           执行中</ws-button>
         <ws-button class="but" @click="handleLook()" v-hasPermission="
         <ws-button class="but" @click="handleLook()" v-hasPermission="
             `${$permission('PERMISSIONS.PURSPAPPLINFO_CREATEINSTORE')}`
             `${$permission('PERMISSIONS.PURSPAPPLINFO_CREATEINSTORE')}`

+ 105 - 105
src/views/tranManagement/tranManagementDriver.vue

@@ -26,34 +26,34 @@
         </ws-button>
         </ws-button>
       </template>
       </template>
     </BaseHeaderLayout>
     </BaseHeaderLayout>
-      <el-table class="wenzi" :data="driverList.records" style="width: 100%; margin-top: 20px" fit ref="expandstable"
-        :expand-row-keys="expands" :row-key="getRowKeys" height="calc(100% - 110px)">
-        <el-table-column type="expand">
-          <template slot-scope="props">
-            <ws-form>
-              <div v-for="item in props.row.driverPayeeInfoList">
-                <ws-info-table>
-                  <ws-form-item :class="item.accountTypeFlag == 1 ? 'personage' : 'company'"
-                    v-if="item.accountTypeFlag == 1" label="收款人" span="1" prop="payeeName" class="el-car name">
-                    <div style="width: 100%">
-                      {{ item.payeeName }}
-                    </div>
-                  </ws-form-item>
-                  <ws-form-item :class="item.accountTypeFlag == 1 ? 'personage' : 'company'"
-                    v-if="item.accountTypeFlag == 2" label="企业名称" span="1" prop="compName" class="el-car">
-                    <div style="width: 100%">{{ item.compName }}</div>
-                  </ws-form-item>
-                  <ws-form-item :class="item.accountTypeFlag == 1 ? 'personage' : 'company'"
-                    v-if="item.accountTypeFlag == 1" label="身份证" span="1" prop="payeeNumberCard" class="el-car card">
-                    <div style="width: 100%">
-                      {{ item.payeeNumberCard }}
-                      <img width="12" height="13" src="../../../public/img/fujian-grey.png" alt=""
-                        @click="fujian1(item)" />
-                    </div>
-                  </ws-form-item>
-                  <ws-form-item :class="item.accountTypeFlag == 1 ? 'personage' : 'company'" label="开户行" span="1"
-                    prop="bankDeposit" class="el-car">
-                    <span style="
+    <el-table class="wenzi" :data="driverList.records" style="width: 100%; margin-top: 20px" fit ref="expandstable"
+      :expand-row-keys="expands" :row-key="getRowKeys" height="calc(100% - 110px)">
+      <el-table-column type="expand">
+        <template slot-scope="props">
+          <ws-form>
+            <div v-for="item in props.row.driverPayeeInfoList">
+              <ws-info-table>
+                <ws-form-item :class="item.accountTypeFlag == 1 ? 'personage' : 'company'"
+                  v-if="item.accountTypeFlag == 1" label="收款人" span="1" prop="payeeName" class="el-car name">
+                  <div style="width: 100%">
+                    {{ item.payeeName }}
+                  </div>
+                </ws-form-item>
+                <ws-form-item :class="item.accountTypeFlag == 1 ? 'personage' : 'company'"
+                  v-if="item.accountTypeFlag == 2" label="企业名称" span="1" prop="compName" class="el-car">
+                  <div style="width: 100%">{{ item.compName }}</div>
+                </ws-form-item>
+                <ws-form-item :class="item.accountTypeFlag == 1 ? 'personage' : 'company'"
+                  v-if="item.accountTypeFlag == 1" label="身份证" span="1" prop="payeeNumberCard" class="el-car card">
+                  <div style="width: 100%">
+                    {{ item.payeeNumberCard }}
+                    <img width="12" height="13" src="../../../public/img/fujian-grey.png" alt=""
+                      @click="fujian1(item)" />
+                  </div>
+                </ws-form-item>
+                <ws-form-item :class="item.accountTypeFlag == 1 ? 'personage' : 'company'" label="开户行" span="1"
+                  prop="bankDeposit" class="el-car">
+                  <span style="
                         margin: 10px;
                         margin: 10px;
                         display: inline-block;
                         display: inline-block;
                         border-right: 1px solid #e9ecf7;
                         border-right: 1px solid #e9ecf7;
@@ -66,91 +66,90 @@
                         line-height: 20px;
                         line-height: 20px;
                         white-space: normal;
                         white-space: normal;
                       ">{{ item.bankDepositBranch }}</span>
                       ">{{ item.bankDepositBranch }}</span>
-                  </ws-form-item>
-                  <ws-form-item :class="item.accountTypeFlag == 1 ? 'personage' : 'company'" label="账号" span="1"
-                    prop="bankCard" class="el-car">
-                    <div style="width: 100%">{{ item.bankCard }}</div>
-                  </ws-form-item>
-                </ws-info-table>
-              </div>
-            </ws-form>
-          </template>
-        </el-table-column>
-        <el-table-column type="index" label="序号" width="80">
-          <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="driverName" label="姓名" width="100">
-        </el-table-column>
-        <el-table-column prop="numberCard" label="身份证号" width="200">
-        </el-table-column>
-        <el-table-column prop="driverPhone" label="手机号" width="160">
-        </el-table-column>
-        <el-table-column prop="carNumber" label="车牌号" width="160">
-          <template scope="scope">
-            <ws-select v-model="scope.row.carNumber" placeholder="" class="typeselect"
-              @change="selectcar($event, scope.row)">
-              <ws-option v-for="item in scope.row.driverCarInfoList" :key="item.constKey" :label="item.carNumber"
-                :value="item.carNumber" />
-            </ws-select>
-          </template>
-        </el-table-column>
-        <el-table-column prop="binNumber" label="常驻城市" width="160">
-          <template slot-scope="scope">
-            {{ scope.row.residentCityProvincial
+                </ws-form-item>
+                <ws-form-item :class="item.accountTypeFlag == 1 ? 'personage' : 'company'" label="账号" span="1"
+                  prop="bankCard" class="el-car">
+                  <div style="width: 100%">{{ item.bankCard }}</div>
+                </ws-form-item>
+              </ws-info-table>
+            </div>
+          </ws-form>
+        </template>
+      </el-table-column>
+      <el-table-column type="index" label="序号" width="80">
+        <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="driverName" label="姓名" width="100">
+      </el-table-column>
+      <el-table-column prop="numberCard" label="身份证号" width="200">
+      </el-table-column>
+      <el-table-column prop="driverPhone" label="手机号" width="160">
+      </el-table-column>
+      <el-table-column prop="carNumber" label="车牌号" width="160">
+        <template scope="scope">
+          <ws-select v-model="scope.row.carNumber" placeholder="" class="typeselect"
+            @change="selectcar($event, scope.row)">
+            <ws-option v-for="item in scope.row.driverCarInfoList" :key="item.constKey" :label="item.carNumber"
+              :value="item.carNumber" />
+          </ws-select>
+        </template>
+      </el-table-column>
+      <el-table-column prop="binNumber" label="常驻城市" width="160">
+        <template slot-scope="scope">
+          {{ scope.row.residentCityProvincial
             }}{{ scope.row.residentCityMunicipal }}
             }}{{ scope.row.residentCityMunicipal }}
-          </template>
-        </el-table-column>
-        <el-table-column prop="carModel" label="车型" width="120">
-        </el-table-column>
-        <el-table-column prop="carLength" label="车长" width="120">
-        </el-table-column>
-        <el-table-column label="结款账户" width="120">
-          <template slot-scope="scope">
-            <el-button v-if="!scope.row.expandsStatus" size="medium" type="text" class="fs-16"
-              @click="expandsHandle(scope.row)">展开<img width="9" height="6"
-                style="vertical-align: middle; margin-left: 3px" src="../../../public/img/zhankai.png" alt="" />
-            </el-button>
-            <el-button v-if="scope.row.expandsStatus" size="medium" type="text" class="fs-16"
-              @click="expandsHandle(scope.row)">收起<img width="9" height="6"
-                style="vertical-align: middle; margin-left: 3px" src="../../../public/img/shouqi.png" alt="" />
-            </el-button>
-          </template>
-        </el-table-column>
-        <el-table-column prop="addressUrl" label="附件">
-          <template slot-scope="scope">
-            <img width="18" height="20" style="vertical-align: text-top; position: relative; top: -1px"
-              src="../../../public/img/fujian.png" @click="fujian(scope.row)" alt="" />
-            <span v-if="scope.row.addressUrlArray.length > 0">{{
+        </template>
+      </el-table-column>
+      <el-table-column prop="carModel" label="车型" width="120">
+      </el-table-column>
+      <el-table-column prop="carLength" label="车长" width="120">
+      </el-table-column>
+      <el-table-column label="结款账户" width="120">
+        <template slot-scope="scope">
+          <el-button v-if="!scope.row.expandsStatus" size="medium" type="text" class="fs-16"
+            @click="expandsHandle(scope.row)">展开<img width="9" height="6"
+              style="vertical-align: middle; margin-left: 3px" src="../../../public/img/zhankai.png" alt="" />
+          </el-button>
+          <el-button v-if="scope.row.expandsStatus" size="medium" type="text" class="fs-16"
+            @click="expandsHandle(scope.row)">收起<img width="9" height="6"
+              style="vertical-align: middle; margin-left: 3px" src="../../../public/img/shouqi.png" alt="" />
+          </el-button>
+        </template>
+      </el-table-column>
+      <el-table-column prop="addressUrl" label="附件">
+        <template slot-scope="scope">
+          <img width="18" height="20" style="vertical-align: text-top; position: relative; top: -1px"
+            src="../../../public/img/fujian.png" @click="fujian(scope.row)" alt="" />
+          <span v-if="scope.row.addressUrlArray.length > 0">{{
               scope.row.addressUrlArray.length
               scope.row.addressUrlArray.length
             }}</span>
             }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column prop="address" label="操作" width="300">
-          <template slot-scope="scope">
-            <el-button size="medium" type="text" class="record" @click="look(scope.row)">查看</el-button>
-            <el-button size="medium" type="text" class="record" @click="edit(scope.row)">编辑</el-button>
-            <el-button size="medium" type="text" class="record" @click="deletes(scope.row)">删除</el-button>
-            <el-button v-if="scope.row.disableStatusFlag != 1" class="record1" size="medium" type="text"
-              @click="stop(scope.row)">禁用</el-button>
-            <!-- <el-tooltip
+        </template>
+      </el-table-column>
+      <el-table-column prop="address" label="操作" width="300">
+        <template slot-scope="scope">
+          <el-button size="medium" type="text" class="record" @click="look(scope.row)">查看</el-button>
+          <el-button size="medium" type="text" class="record" @click="edit(scope.row)">编辑</el-button>
+          <el-button size="medium" type="text" class="record" @click="deletes(scope.row)">删除</el-button>
+          <el-button v-if="scope.row.disableStatusFlag != 1" class="record1" size="medium" type="text"
+            @click="stop(scope.row)">禁用</el-button>
+          <!-- <el-tooltip
               class="item record"
               class="item record"
               effect="dark"
               effect="dark"
               :content="scope.row.disableReasons"
               :content="scope.row.disableReasons"
               placement="right-start"
               placement="right-start"
             > -->
             > -->
-            <el-button v-if="scope.row.disableStatusFlag == 1" class="record1" size="medium" type="text"
-              style="font-size:14px;color:#F83535;" @click="relieve(scope.row)">已禁用</el-button>
-            <!-- </el-tooltip> -->
-          </template>
-        </el-table-column>
-      </el-table>
-      <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
-        :page-size="deptCircularPage.pageSize" layout="total, sizes, prev, pager, next, jumper"
-        :total="deptBudgetTotal">
-      </el-pagination>
+          <el-button v-if="scope.row.disableStatusFlag == 1" class="record1" size="medium" type="text"
+            style="font-size:14px;color:#F83535;" @click="relieve(scope.row)">已禁用</el-button>
+          <!-- </el-tooltip> -->
+        </template>
+      </el-table-column>
+    </el-table>
+    <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
+      :page-size="deptCircularPage.pageSize" layout="total, sizes, prev, pager, next, jumper" :total="deptBudgetTotal">
+    </el-pagination>
     <!-- <el-dialog v-model="outerVisible">
     <!-- <el-dialog v-model="outerVisible">
       <el-input
       <el-input
         type="textarea"
         type="textarea"
@@ -485,6 +484,7 @@
         this.residentCityProvincial = CodeToText[e[0]]
         this.residentCityProvincial = CodeToText[e[0]]
         this.residentCityMunicipal = CodeToText[e[1]]
         this.residentCityMunicipal = CodeToText[e[1]]
         // this.selectedOptions = e
         // this.selectedOptions = e
+        this.handleLook()
       },
       },
       fujian(row) {
       fujian(row) {
         if (row.addressUrl === null || row.addressUrl === '') {
         if (row.addressUrl === null || row.addressUrl === '') {

+ 82 - 80
src/views/tranManagement/tranManagementReceivingFeedback.vue

@@ -33,90 +33,90 @@
             " src="../../../public/img/sousuo.png" alt="" /></ws-button>
             " src="../../../public/img/sousuo.png" alt="" /></ws-button>
       </template>
       </template>
     </BaseHeaderLayout>
     </BaseHeaderLayout>
-      <el-table class="wenzi" :data="warehouseList.records" style="width: 100%" height="calc(100% - 110px)">
-        <el-table-column type="index" label="序号" width="80">
-          <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 class="table_td" prop="processNo" label="运输任务编号/合同编号" width="150">
-          <template scope="scope">
-            <span v-if='scope.row.processNo'>{{scope.row.processNo}}</span>
-            <span v-else>{{scope.row.contractNo}}</span>
-          </template>
-        </el-table-column>
-        <el-table-column prop="tranType" label="运输方式"> </el-table-column>
-        <el-table-column class="table_td" prop="goodsName" label="货名">
-        </el-table-column>
-        <el-table-column class="table_td" label="重量(吨)" prop="weight">
-        </el-table-column>
-        <el-table-column class="table_td" label="发货" prop="send" width="300">
-          <template scope="scope">
-            <span style='white-space :pre-wrap;' v-html="scope.row.send"></span>
-          </template>
-        </el-table-column>
-        <el-table-column class="table_td" label="收货" prop="receive" width="300">
-          <template scope="scope">
-            <span style='white-space :pre-wrap;' v-html="scope.row.receive"></span>
-          </template>
-        </el-table-column>
-        <el-table-column class="table_td" label="运输周期" prop="tranCycle" width="160">
-          <template scope="scope">
-            {{ scope.row.deliveryDateStart }} ~ {{ scope.row.deliveryDateEnd }}
-          </template>
-        </el-table-column>
-        <el-table-column prop="status" label="状态">
-          <template slot-scope="scope">
-            <el-popover placement="left" :width="285" trigger="click" visible-arrow="false" @show="history(scope.row)">
-              <template>
-                <span slot="reference">
-                  <span v-if="scope.row.receivingStatus == '待执行'" class="executory"></span>
-                  <span v-if="scope.row.receivingStatus == '执行中'" class="inExecution"></span>
-                  <span v-if="scope.row.receivingStatus == '已完货'" class="done"></span>{{ scope.row.receivingStatus }}
-                </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>
-                    <div class="vertical-circle"></div>
-                    <div v-if="index != historyList.length - 1" class="vertical-line"></div>
-                  </div>
-                  <div class="vertical-text">
-                    {{ item.operateUser }}<br />{{ item.dealMsg }}
-                  </div>
+    <el-table class="wenzi" :data="warehouseList.records" style="width: 100%" height="calc(100% - 110px)">
+      <el-table-column type="index" label="序号" width="80">
+        <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 class="table_td" prop="processNo" label="运输任务编号/合同编号" width="150">
+        <template scope="scope">
+          <span v-if='scope.row.processNo'>{{scope.row.processNo}}</span>
+          <span v-else>{{scope.row.contractNo}}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="tranType" label="运输方式"> </el-table-column>
+      <el-table-column class="table_td" prop="goodsName" label="货名">
+      </el-table-column>
+      <el-table-column class="table_td" label="重量(吨)" prop="weight">
+      </el-table-column>
+      <el-table-column class="table_td" label="发货" prop="send" width="300">
+        <template scope="scope">
+          <span style='white-space :pre-wrap;' v-html="scope.row.send"></span>
+        </template>
+      </el-table-column>
+      <el-table-column class="table_td" label="收货" prop="receive" width="300">
+        <template scope="scope">
+          <span style='white-space :pre-wrap;' v-html="scope.row.receive"></span>
+        </template>
+      </el-table-column>
+      <el-table-column class="table_td" label="运输周期" prop="tranCycle" width="160">
+        <template scope="scope">
+          {{ scope.row.deliveryDateStart }} ~ {{ scope.row.deliveryDateEnd }}
+        </template>
+      </el-table-column>
+      <el-table-column prop="status" label="状态">
+        <template slot-scope="scope">
+          <el-popover placement="left" :width="285" trigger="click" visible-arrow="false" @show="history(scope.row)">
+            <template>
+              <span slot="reference">
+                <span v-if="scope.row.receivingStatus == '待执行'" class="executory"></span>
+                <span v-if="scope.row.receivingStatus == '执行中'" class="inExecution"></span>
+                <span v-if="scope.row.receivingStatus == '已完货'" class="done"></span>{{ scope.row.receivingStatus }}
+              </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>
+                  <div class="vertical-circle"></div>
+                  <div v-if="index != historyList.length - 1" class="vertical-line"></div>
+                </div>
+                <div class="vertical-text">
+                  {{ item.operateUser }}<br />{{ item.dealMsg }}
                 </div>
                 </div>
               </div>
               </div>
-            </el-popover>
-            <img width="17" height="18" style="vertical-align: text-top; position: relative; top: -1px"
-              src="../../../public/img/edit.png" @click="editClick(scope.row)" alt="" />
+            </div>
+          </el-popover>
+          <img width="17" height="18" style="vertical-align: text-top; position: relative; top: -1px"
+            src="../../../public/img/edit.png" @click="editClick(scope.row)" alt="" />
+        </template>
+      </el-table-column>
+      <el-table-column class="table_td" label="接单时间" prop="createDate" width="90">
+      </el-table-column>
+      <el-table-column prop="seller" label="操作" width="160">
+        <template slot-scope="scope">
+          <template v-if="scope.row.receivingStatus != '已完货'">
+            <div class="record" @click="trainSee(scope.row)">查看</div>
+            <div class="adjustment" @click="feedback(scope.row)">反馈</div>
           </template>
           </template>
-        </el-table-column>
-        <el-table-column class="table_td" label="接单时间" prop="createDate" width="90">
-        </el-table-column>
-        <el-table-column prop="seller" label="操作" width="160">
-          <template slot-scope="scope">
-            <template v-if="scope.row.receivingStatus != '已完货'">
-              <div class="record" @click="trainSee(scope.row)">查看</div>
-              <div class="adjustment" @click="feedback(scope.row)">反馈</div>
-            </template>
-            <template v-else>
-              <div class="record1" @click="trainSee(scope.row)">查看</div>
-            </template>
+          <template v-else>
+            <div class="record1" @click="trainSee(scope.row)">查看</div>
           </template>
           </template>
-        </el-table-column>
-      </el-table>
-      <div>
-        <!-- 分页 -->
-        <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
-          :page-size="deptCircularPage.pageSize" layout="total, sizes, prev, pager, next, jumper"
-          :total="deptBudgetTotal">
-        </el-pagination>
-      </div>
+        </template>
+      </el-table-column>
+    </el-table>
+    <div>
+      <!-- 分页 -->
+      <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
+        :page-size="deptCircularPage.pageSize" layout="total, sizes, prev, pager, next, jumper"
+        :total="deptBudgetTotal">
+      </el-pagination>
+    </div>
   </div>
   </div>
 </template>
 </template>
 <script>
 <script>
@@ -444,6 +444,7 @@
         for (var i = 0; i < this.taskTypeList.length; i++) {
         for (var i = 0; i < this.taskTypeList.length; i++) {
           if (this.taskTypeList[i].value == e) {
           if (this.taskTypeList[i].value == e) {
             this.feedbackFlag = this.taskTypeList[i].type
             this.feedbackFlag = this.taskTypeList[i].type
+            this.find()
           }
           }
         }
         }
         this.getList()
         this.getList()
@@ -452,6 +453,7 @@
         for (var i = 0; i < this.tranTypeList.length; i++) {
         for (var i = 0; i < this.tranTypeList.length; i++) {
           if (this.tranTypeList[i].value == e) {
           if (this.tranTypeList[i].value == e) {
             this.tranTypeKey = this.tranTypeList[i].type
             this.tranTypeKey = this.tranTypeList[i].type
+            this.find()
           }
           }
         }
         }
         this.getList()
         this.getList()

+ 66 - 66
src/views/tranManagement/tranManagementShipping.vue

@@ -27,78 +27,77 @@
             " src="../../../public/img/sousuo.png" alt="" /></ws-button>
             " src="../../../public/img/sousuo.png" alt="" /></ws-button>
       </template>
       </template>
     </BaseHeaderLayout>
     </BaseHeaderLayout>
-      <el-table class="wenzi" :data="warehouseList.records" style="width: 100%" height="calc(100% - 110px)">
-        <el-table-column type="index" label="序号" width="80">
-        </el-table-column>
-        <el-table-column class="table_td" prop="processNo" label="运输任务编号">
-        </el-table-column>
-        <el-table-column class="table_td" prop="goodsName" label="货名">
-        </el-table-column>
-        <el-table-column class="table_td" label="重量(吨)" prop="weight">
-        </el-table-column>
-        <el-table-column class="table_td" label="发货" prop="send" width="300">
-          <template scope="scope">
-            <span style='white-space :pre-wrap;' v-html="scope.row.send"></span>
-          </template>
-        </el-table-column>
-        <el-table-column class="table_td" label="收货" prop="receive" width="300">
-          <template scope="scope">
-            <span style='white-space :pre-wrap;' v-html="scope.row.receive"></span>
-          </template>
-        </el-table-column>
-        <el-table-column class="table_td" label="运输周期" prop="tranCycle" width="160">
-          <template scope="scope">
-            {{ scope.row.deliveryDateStart }} ~ {{ scope.row.deliveryDateEnd }}
-          </template>
-        </el-table-column>
-        <el-table-column prop="status" label="状态">
-          <template slot-scope="scope">
-            <el-popover placement="left" :width="285" trigger="click" visible-arrow="false" @show="history(scope.row)">
-              <template>
-                <span slot="reference">
-                  <span v-if="scope.row.processStatus == '待执行'" class="executory"></span>
-                  <span v-if="scope.row.processStatus == '执行中'" class="inExecution"></span>
-                  <span v-if="scope.row.processStatus == '已完成'" class="done"></span>{{ scope.row.processStatus }}
-                </span>
-              </template>
-              <div>
-                <p style="margin-top: 0; padding-left: 10px">历史记录</p>
-                <div v-for="(item, index) in historyList" class="flex" :key="index">
-                  <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>
-                  <div class="vertical-text">
-                    {{ item.operateUser }}<br />{{ item.dealMsg }}
-                  </div>
+    <el-table class="wenzi" :data="warehouseList.records" style="width: 100%" height="calc(100% - 110px)">
+      <el-table-column type="index" label="序号" width="80">
+      </el-table-column>
+      <el-table-column class="table_td" prop="processNo" label="运输任务编号">
+      </el-table-column>
+      <el-table-column class="table_td" prop="goodsName" label="货名">
+      </el-table-column>
+      <el-table-column class="table_td" label="重量(吨)" prop="weight">
+      </el-table-column>
+      <el-table-column class="table_td" label="发货" prop="send" width="300">
+        <template scope="scope">
+          <span style='white-space :pre-wrap;' v-html="scope.row.send"></span>
+        </template>
+      </el-table-column>
+      <el-table-column class="table_td" label="收货" prop="receive" width="300">
+        <template scope="scope">
+          <span style='white-space :pre-wrap;' v-html="scope.row.receive"></span>
+        </template>
+      </el-table-column>
+      <el-table-column class="table_td" label="运输周期" prop="tranCycle" width="160">
+        <template scope="scope">
+          {{ scope.row.deliveryDateStart }} ~ {{ scope.row.deliveryDateEnd }}
+        </template>
+      </el-table-column>
+      <el-table-column prop="status" label="状态">
+        <template slot-scope="scope">
+          <el-popover placement="left" :width="285" trigger="click" visible-arrow="false" @show="history(scope.row)">
+            <template>
+              <span slot="reference">
+                <span v-if="scope.row.processStatus == '待执行'" class="executory"></span>
+                <span v-if="scope.row.processStatus == '执行中'" class="inExecution"></span>
+                <span v-if="scope.row.processStatus == '已完成'" class="done"></span>{{ scope.row.processStatus }}
+              </span>
+            </template>
+            <div>
+              <p style="margin-top: 0; padding-left: 10px">历史记录</p>
+              <div v-for="(item, index) in historyList" class="flex" :key="index">
+                <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>
+                <div class="vertical-text">
+                  {{ item.operateUser }}<br />{{ item.dealMsg }}
                 </div>
                 </div>
               </div>
               </div>
-            </el-popover>
-            <img width="17" height="18" style="vertical-align: text-top; position: relative; top: -1px"
-              src="../../../public/img/edit.png" @click="editClick(scope.row)" alt="" />
-          </template>
-        </el-table-column>
-        <el-table-column class="table_td" label="接单时间" prop="createDate">
-        </el-table-column>
-        <el-table-column prop="seller" label="操作" width="200">
-          <template slot-scope="scope">
-            <div v-hasPermission="
+            </div>
+          </el-popover>
+          <img width="17" height="18" style="vertical-align: text-top; position: relative; top: -1px"
+            src="../../../public/img/edit.png" @click="editClick(scope.row)" alt="" />
+        </template>
+      </el-table-column>
+      <el-table-column class="table_td" label="接单时间" prop="createDate">
+      </el-table-column>
+      <el-table-column prop="seller" label="操作" width="200">
+        <template slot-scope="scope">
+          <div v-hasPermission="
                 'tranManager.shippingDispatching.view'
                 'tranManager.shippingDispatching.view'
               " class="record" @click="handleLook(scope.row)">查看</div>
               " class="record" @click="handleLook(scope.row)">查看</div>
-            <div v-hasPermission="
+          <div v-hasPermission="
                 'tranManager.shippingDispatching.car'
                 'tranManager.shippingDispatching.car'
               " class="adjustment" @click="shipping(scope.row)">船次</div>
               " class="adjustment" @click="shipping(scope.row)">船次</div>
-          </template>
-        </el-table-column>
-      </el-table>
-      <!-- 页数 -->
-      <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
-        :page-size="deptCircularPage.pageSize" layout="total, sizes, prev, pager, next, jumper"
-        :total="deptBudgetTotal">
-      </el-pagination>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 页数 -->
+    <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
+      :page-size="deptCircularPage.pageSize" layout="total, sizes, prev, pager, next, jumper" :total="deptBudgetTotal">
+    </el-pagination>
   </div>
   </div>
 </template>
 </template>
 <script>
 <script>
@@ -345,6 +344,7 @@
         for (var i = 0; i < this.taskTypeList.length; i++) {
         for (var i = 0; i < this.taskTypeList.length; i++) {
           if (this.taskTypeList[i].value == e) {
           if (this.taskTypeList[i].value == e) {
             this.searchType = this.taskTypeList[i].type
             this.searchType = this.taskTypeList[i].type
+            this.find()
           }
           }
         }
         }
       },
       },

+ 77 - 75
src/views/tranManagement/tranManagementTransporHairRespond.vue

@@ -33,85 +33,85 @@
             " src="../../../public/img/sousuo.png" alt="" /></ws-button>
             " src="../../../public/img/sousuo.png" alt="" /></ws-button>
       </template>
       </template>
     </BaseHeaderLayout>
     </BaseHeaderLayout>
-      <el-table class="wenzi" :data="tranManagementList.records" style="width: 100%; margin-top: 20px" height="calc(100% - 110px)">
-        <el-table-column type="index" label="序号" width="80">
-          <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="processNo" label="运输任务编号/合同编号" width="140">
-          <template scope="scope">
-            <span v-if="scope.row.processNo">{{ scope.row.processNo }}</span>
-            <span v-else>{{ scope.row.contractNo }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column prop="tranType" label="运输方式"> </el-table-column>
-        <el-table-column prop="goodsName" label="货名"> </el-table-column>
-        <el-table-column prop="weight" label="重量(吨)"> </el-table-column>
-        <el-table-column prop="send" label="发货" width="300">
-          <template scope="scope">
-            <span style='white-space :pre-wrap;' v-html="scope.row.send"></span>
-          </template>
-        </el-table-column>
-        <el-table-column prop="receive" label="收货" width="300">
-          <template scope="scope">
-            <span style='white-space :pre-wrap;' v-html="scope.row.receive"></span>
-          </template>
-        </el-table-column>
-        <el-table-column prop="tranCycle" label="运输周期" width="160">
-          <template scope="scope">
-            {{ scope.row.deliveryDateStart }} ~ {{ scope.row.deliveryDateEnd }}
-          </template>
-        </el-table-column>
-        <el-table-column prop="feedbackStatus" label="状态">
-          <template slot-scope="scope">
-            <el-popover placement="left" :width="285" trigger="click" visible-arrow="false" @show="history(scope.row)">
-              <template>
-                <span slot="reference">
-                  <span v-if="scope.row.feedbackStatus == '待执行'" class="executory"></span>
-                  <span v-if="scope.row.feedbackStatus == '执行中'" class="inExecution"></span>
-                  <span v-if="scope.row.feedbackStatus == '已完货'" class="done"></span>{{ scope.row.feedbackStatus }}
-                </span>
-              </template>
-              <div>
-                <p style="margin-top: 0; padding-left: 10px">XXXXX</p>
-                <div v-for="(item, index) in historyList" class="flex" :key="index">
-                  <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>
-                  <div class="vertical-text">
-                    {{ item.operateUser }}<br />{{ item.dealMsg }}
-                  </div>
+    <el-table class="wenzi" :data="tranManagementList.records" style="width: 100%; margin-top: 20px"
+      height="calc(100% - 110px)">
+      <el-table-column type="index" label="序号" width="80">
+        <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="processNo" label="运输任务编号/合同编号" width="140">
+        <template scope="scope">
+          <span v-if="scope.row.processNo">{{ scope.row.processNo }}</span>
+          <span v-else>{{ scope.row.contractNo }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="tranType" label="运输方式"> </el-table-column>
+      <el-table-column prop="goodsName" label="货名"> </el-table-column>
+      <el-table-column prop="weight" label="重量(吨)"> </el-table-column>
+      <el-table-column prop="send" label="发货" width="300">
+        <template scope="scope">
+          <span style='white-space :pre-wrap;' v-html="scope.row.send"></span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="receive" label="收货" width="300">
+        <template scope="scope">
+          <span style='white-space :pre-wrap;' v-html="scope.row.receive"></span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="tranCycle" label="运输周期" width="160">
+        <template scope="scope">
+          {{ scope.row.deliveryDateStart }} ~ {{ scope.row.deliveryDateEnd }}
+        </template>
+      </el-table-column>
+      <el-table-column prop="feedbackStatus" label="状态">
+        <template slot-scope="scope">
+          <el-popover placement="left" :width="285" trigger="click" visible-arrow="false" @show="history(scope.row)">
+            <template>
+              <span slot="reference">
+                <span v-if="scope.row.feedbackStatus == '待执行'" class="executory"></span>
+                <span v-if="scope.row.feedbackStatus == '执行中'" class="inExecution"></span>
+                <span v-if="scope.row.feedbackStatus == '已完货'" class="done"></span>{{ scope.row.feedbackStatus }}
+              </span>
+            </template>
+            <div>
+              <p style="margin-top: 0; padding-left: 10px">XXXXX</p>
+              <div v-for="(item, index) in historyList" class="flex" :key="index">
+                <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>
+                <div class="vertical-text">
+                  {{ item.operateUser }}<br />{{ item.dealMsg }}
                 </div>
                 </div>
               </div>
               </div>
-            </el-popover>
-            <img width="17" height="18" style="vertical-align: text-top; position: relative; top: -1px"
-              src="../../../public/img/edit.png" @click="editClick(scope.row)" alt="" />
+            </div>
+          </el-popover>
+          <img width="17" height="18" style="vertical-align: text-top; position: relative; top: -1px"
+            src="../../../public/img/edit.png" @click="editClick(scope.row)" alt="" />
+        </template>
+      </el-table-column>
+      <el-table-column prop="createDate" class="table_td" label="接单时间" width="90">
+      </el-table-column>
+      <el-table-column prop="seller" label="操作" width="160">
+        <template slot-scope="scope">
+          <template v-if="scope.row.feedbackStatus != '已完货'">
+            <div class="record" @click="trainSee(scope.row)">查看</div>
+            <div class="adjustment" @click="feedback(scope.row)">反馈</div>
           </template>
           </template>
-        </el-table-column>
-        <el-table-column prop="createDate" class="table_td" label="接单时间" width="90">
-        </el-table-column>
-        <el-table-column prop="seller" label="操作" width="160">
-          <template slot-scope="scope">
-            <template v-if="scope.row.feedbackStatus != '已完货'">
-              <div class="record" @click="trainSee(scope.row)">查看</div>
-              <div class="adjustment" @click="feedback(scope.row)">反馈</div>
-            </template>
-            <template v-else>
-              <div class="record1" @click="trainSee(scope.row)">查看</div>
-            </template>
+          <template v-else>
+            <div class="record1" @click="trainSee(scope.row)">查看</div>
           </template>
           </template>
-        </el-table-column>
-      </el-table>
-      <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
-        :page-size="deptCircularPage.pageSize" layout="total, sizes, prev, pager, next, jumper"
-        :total="deptBudgetTotal">
-      </el-pagination>
+        </template>
+      </el-table-column>
+    </el-table>
+    <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
+      :page-size="deptCircularPage.pageSize" layout="total, sizes, prev, pager, next, jumper" :total="deptBudgetTotal">
+    </el-pagination>
   </div>
   </div>
 </template>
 </template>
 <script>
 <script>
@@ -420,6 +420,7 @@
         for (var i = 0; i < this.taskTypeList.length; i++) {
         for (var i = 0; i < this.taskTypeList.length; i++) {
           if (this.taskTypeList[i].value == e) {
           if (this.taskTypeList[i].value == e) {
             this.feedbackFlag = this.taskTypeList[i].type
             this.feedbackFlag = this.taskTypeList[i].type
+            this.find()
           }
           }
         }
         }
         this.getList()
         this.getList()
@@ -428,6 +429,7 @@
         for (var i = 0; i < this.tranTypeList.length; i++) {
         for (var i = 0; i < this.tranTypeList.length; i++) {
           if (this.tranTypeList[i].value == e) {
           if (this.tranTypeList[i].value == e) {
             this.tranTypeKey = this.tranTypeList[i].type
             this.tranTypeKey = this.tranTypeList[i].type
+            this.find()
           }
           }
         }
         }
         this.getList()
         this.getList()

+ 1 - 0
src/views/tranManagement/tranManagementTransporTationFire.vue

@@ -330,6 +330,7 @@
         for (var i = 0; i < this.taskTypeList.length; i++) {
         for (var i = 0; i < this.taskTypeList.length; i++) {
           if (this.taskTypeList[i].value == e) {
           if (this.taskTypeList[i].value == e) {
             this.searchType = this.taskTypeList[i].type
             this.searchType = this.taskTypeList[i].type
+            this.find()
           }
           }
         }
         }
       },
       },

+ 1 - 0
src/views/tranManagement/tranManagementVehicle.vue

@@ -300,6 +300,7 @@
         for (var i = 0; i < this.taskTypeList.length; i++) {
         for (var i = 0; i < this.taskTypeList.length; i++) {
           if (this.taskTypeList[i].value == e) {
           if (this.taskTypeList[i].value == e) {
             this.searchType = this.taskTypeList[i].type
             this.searchType = this.taskTypeList[i].type
+            this.find()
           }
           }
         }
         }
       },
       },