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

src/views/ADMINISTRATORS/components/ADMINISTRATORS1.vue

@@ -554,6 +554,13 @@
                     @change="selectLoadingIdRemark"
                   ></el-input>
                 </el-form-item>
+                <el-form-item label="车牌号:">
+                  <el-input
+                    class="inline-input"
+                    disabled
+                    v-model="loadDetail.capacityNumber"
+                  ></el-input>
+                </el-form-item>
                 <el-form-item label="物资:">
                   <el-autocomplete
                     class="inline-input"

src/views/inward/components/inwardFactory/timeTaskResult.vue

@@ -2,7 +2,12 @@
 <template>
   <div class="sale">
     <div class="top">
-      <!-- 框计算 -->
+       <el-input
+        v-model="con"
+        clearable
+        placeholder="查询内容"
+      >
+      </el-input>
       <span class="text">计时时间：</span>
       <el-date-picker
         v-model="startTime"
@@ -119,6 +124,7 @@ export default {
       stepList: [],
       tableTitle: "计时统计",
       exportAllList:[],
+      con:null,
       noSettleDetailsColumn:[]
     };
   },
@@ -330,6 +336,8 @@ export default {
               startTime +
               "&endTime=" +
               endTime +
+              "&con="+
+              this.con+
               "&i=" +
               new Date();
           } else {
@@ -340,6 +348,8 @@ export default {
               startTime +
               "&endTime=" +
               endTime +
+              "&con="+
+              this.con+
               "&i=" +
               new Date();
           }
@@ -349,6 +359,26 @@ export default {
           this.$message.warning("开始时间要比结束时间早");
         }
       } else {
+       if (
+            getCookie("orgCode") == "dagangadmin" ||
+            getCookie("orgCode") == "zidonghuabu" ||
+            getCookie("orgCode") == "wuliuchuyunzhongxin"
+          ) {
+            this.option.requestUrl =
+              "/api/v1/tms/getAllTimeTaskResult?apiId=458&orderType=21" +
+              "&con="+
+              this.con+
+              "&i=" +
+              new Date();
+          } else {
+            this.option.requestUrl =
+              "/api/v1/tms/getAllTimeTaskResult?apiId=458&orderType=21&userId=" +
+              getCookie("orgCode") +
+              "&con="+
+              this.con+
+              "&i=" +
+              new Date();
+          }
       }
     },
     getMaterial(orderId) {