Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU/icore-pass

src/views/RMS/components/addCapacity.vue

@@ -43,6 +43,14 @@ export default {
   data() {
     return {
       form1: {},
+      form1Initialization : {
+        capacityTypeId : '汽车',
+        capacityNumber : '',
+        capacityCorlor : '黄',
+        capacityOwneris : '否',
+        capacityVip : '否',
+        capacityBlacklist : '否'
+      },
       value: undefined,
       carrierIds: null,
       state:null,
@@ -56,6 +64,7 @@ export default {
   },
   created(){
       this.carrierUserId = getCookie("userId");
+      this.form1 = this.form1Initialization;
       console.log(this.carrierUserId ,'carrierUserId')
       
   },

src/views/appoint/components/saleContract/addSaleOrderSend.vue

@@ -575,6 +575,16 @@ export default {
       if (num == 1) {
         this.drawer = true;
       }else if(num == 2){
+        //再度初始化选择车辆表头
+        if (getCookie("orgCode") == "chengyunshang") {
+          this.truck.requestUrl =
+            "/api/v1/uc/getAllCapacityByCarrierLike?apiId=248&carrierSsoId=" +
+            getCookie("userId") + "&i=" + new Date();
+        } else {
+          this.truck.requestUrl =
+            "/api/v1/uc/getAllCapacityByCarrierLike?apiId=248&carrierSsoId=" + null + "&i=" + new Date();;
+        }
+        //后续操作
         if(!this.materialId){
           this.$message.warning('请选择物资后，再点击')
         }else if(!this.lineId){

src/views/appoint/components/saleContract/saleOrder.vue

@@ -11,43 +11,38 @@
       </el-button>
     </div>
     <el-tabs v-model="activeName" @tab-click="handleClick">
-      <el-tab-pane label="未上报" name="first">
-        <dilTable v-bind.sync="option" ref="table3">
-          <el-table-column fixed="right" label="操作" align="center" width="200">
+      <!-- 已审批 -->
+       <el-tab-pane label="已审批" name="four">
+        <dilTable v-bind.sync="option4" ref="table">
+          <el-table-column fixed="right" label="操作" width="200">
             <template slot-scope="scope">
               <el-button
-                @click="uploadclick(scope.row.saleOrderId)"
-                type="text"
-                size="small"
-                >上传</el-button
-              >
-              <el-button
-                @click="click(scope.row.saleOrderId)"
+                @click="sendClick(scope.row.saleOrderId)"
                 type="text"
                 size="small"
-                >修改</el-button
+                >派车</el-button
               >
               <el-button
+                @click="addClick(scope.row.saleOrderId)"
                 type="text"
                 size="small"
-                @click="deleteclick(scope.row.saleOrderId)"
-                >删除</el-button
+                >排车</el-button
               >
               <el-button
-                @click="detailclick3(scope.row)"
+                @click="detailclick(scope.row)"
                 type="text"
                 size="small"
                 >物资详情</el-button
               >
             </template>
           </el-table-column>
-        <!-- 物资详情抽屉 -->
+          <!-- 物资详情抽屉 -->
         <el-table-column type="expand" width="1">
           <template slot-scope="props">
             <el-form label-position="center" inline class="demo-table-expand">
               <div v-if="false">{{ props }}</div>
               <div>
-                <el-table :data="tableData3" border >
+                <el-table :data="tableData" border >
                   <el-table-column
                     v-for="(item, i) in tableHead"
                     :key="i"
@@ -63,13 +58,31 @@
 
         </dilTable>
       </el-tab-pane>
-      <!-- 已下发 -->
-      <el-tab-pane label="已上报" name="second">
-        <dilTable v-bind.sync="option2" ref="table2">
-        <el-table-column fixed="right" label="操作" width="70">
+      <!-- 未上报 -->
+      <el-tab-pane label="未上报" name="first">
+        <dilTable v-bind.sync="option" ref="table3">
+          <el-table-column fixed="right" label="操作" align="center" width="200">
             <template slot-scope="scope">
               <el-button
-                @click="detailclick2(scope.row)"
+                @click="uploadclick(scope.row.saleOrderId)"
+                type="text"
+                size="small"
+                >上传</el-button
+              >
+              <el-button
+                @click="click(scope.row.saleOrderId)"
+                type="text"
+                size="small"
+                >修改</el-button
+              >
+              <el-button
+                type="text"
+                size="small"
+                @click="deleteclick(scope.row.saleOrderId)"
+                >删除</el-button
+              >
+              <el-button
+                @click="detailclick3(scope.row)"
                 type="text"
                 size="small"
                 >物资详情</el-button
@@ -82,7 +95,7 @@
             <el-form label-position="center" inline class="demo-table-expand">
               <div v-if="false">{{ props }}</div>
               <div>
-                <el-table :data="tableData2" border >
+                <el-table :data="tableData3" border >
                   <el-table-column
                     v-for="(item, i) in tableHead"
                     :key="i"
@@ -98,38 +111,26 @@
 
         </dilTable>
       </el-tab-pane>
-      <!-- 已审批 -->
-       <el-tab-pane label="已审批" name="four">
-        <dilTable v-bind.sync="option4" ref="table">
-          <el-table-column fixed="right" label="操作" width="200">
+      <!-- 已下发 -->
+      <el-tab-pane label="已上报" name="second">
+        <dilTable v-bind.sync="option2" ref="table2">
+        <el-table-column fixed="right" label="操作" width="70">
             <template slot-scope="scope">
               <el-button
-                @click="sendClick(scope.row.saleOrderId)"
-                type="text"
-                size="small"
-                >派车</el-button
-              >
-              <el-button
-                @click="addClick(scope.row.saleOrderId)"
-                type="text"
-                size="small"
-                >排车</el-button
-              >
-              <el-button
-                @click="detailclick(scope.row)"
+                @click="detailclick2(scope.row)"
                 type="text"
                 size="small"
                 >物资详情</el-button
               >
             </template>
           </el-table-column>
-          <!-- 物资详情抽屉 -->
+        <!-- 物资详情抽屉 -->
         <el-table-column type="expand" width="1">
           <template slot-scope="props">
             <el-form label-position="center" inline class="demo-table-expand">
               <div v-if="false">{{ props }}</div>
               <div>
-                <el-table :data="tableData" border >
+                <el-table :data="tableData2" border >
                   <el-table-column
                     v-for="(item, i) in tableHead"
                     :key="i"
@@ -145,6 +146,7 @@
 
         </dilTable>
       </el-tab-pane>
+      
     </el-tabs>
   </div>
 </template>
@@ -153,7 +155,7 @@ export default {
   name: "saleOrder",
   data() {
     return {
-      activeName: "first",
+      activeName: "four",
       input: "",
       option: {
         // 表格请求数据的地址