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

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

@@ -0,0 +1,51 @@
+<template>
+  <div>
+    <div style="margin-left:45%;margin-top:50px;font-size:40px">
+        <el-switch
+        v-model="value"
+        active-text="允许派车给无GPS车辆"
+        @change="updateSwitch">
+        </el-switch>
+    </div>
+    
+  </div>
+</template>
+<script>
+import { getCookie } from "@/utils/util.js";
+export default {
+  name: "dispacherSwitch",
+  data() {
+    return {
+      value: true
+    };
+  },
+  mounted() {
+   this.getSwitch();
+  },
+  methods: {
+    getSwitch(){
+        this.axios.post("api/v1/uc/getDispachSwitch").then((res)=>{
+            if(res.data.data.isOk==0){
+                this.value=false;
+            }else{
+                this.value=true;
+            }
+        });
+    },
+    updateSwitch(){
+        let map={};
+        if(this.value){
+            map.isOk=1;
+        }else{
+            map.isOk=0
+        }
+        this.axios.post("api/v1/uc/updateDispachSwitch",map).then((res)=>{
+           console.log(res);
+        });
+    }
+  }
+};
+</script>
+<style lang="scss" scoped>
+
+</style>

src/views/appoint/router/index.js

@@ -57,6 +57,7 @@ import saleOrderCoproductCarrier from '../components/saleContract/saleOrderCopro
 import saleOrderDetail from '../components/saleContract/saleOrderDetail.vue'
 import saleOrderDetailApproved from '../components/saleContract/saleOrderDetailApproved.vue'
 import saleOrderMaterial from '../components/saleContract/saleOrderMaterial.vue'
+import dispacherSwitch from '../components/saleContract/dispacherSwitch.vue'
 // import saleOrderSteel from "../components/saleContract/saleOrderSteel.vue";
 const saleOrderSteel = () =>
   import('../components/saleContract/saleOrderSteel.vue')
@@ -281,6 +282,12 @@ const constantRouterMap = [
         meta: { code: 'xtpzgl-jggl' },
         component: addSaleOrderSteelSend
       },
+      {
+        path: 'dispacherSwitch',
+        name: 'dispacherSwitch',
+        meta: { code: 'xtpzgl-jggl' },
+        component: dispacherSwitch
+      },
       {
         path: 'addSaleOrderSteelSendCarrier/:saleOrderId',
         name: 'addSaleOrderSteelSendCarrier',

src/views/queue/components/qmsEnFacotory/queueFStart.vue

@@ -191,7 +191,7 @@
             max-height="500px"
           >
             <el-table-column type="selection" width="55"></el-table-column>
-            <el-table-column width="80" align="center" prop="Nosort" label="序号"></el-table-column>
+            <el-table-column width="80" align="center" prop="Nosort"></el-table-column>
             <el-table-column prop="capacityNumber" label="车牌号" fit>
             </el-table-column>
             <el-table-column prop="resultStartTime" label="排队开始时间">