秀阿贵

src/views/appoint/components/ship/deliveryAttorney.vue

@@ -81,7 +81,7 @@
             label="操作"
             width="120"
           >
-            <template slot-scope="scope">
+            <!-- <template slot-scope="scope">
               <el-button
                 @click="modifyClick(scope.row.attorneyId)"
                 type="text"
@@ -90,7 +90,7 @@
               >
                 修改
               </el-button>
-            </template>
+            </template> -->
           </el-table-column>
         </dilTable>
       </el-tab-pane>

src/views/sale/components/dilNotice/carrierNotice.vue

@@ -18,14 +18,14 @@
 
     <div class="table">
       <dilTable v-bind.sync="options">
-        <el-table-column fixed="right" label="操作" width="150" header-align="center">
+        <el-table-column fixed="right" label="操作" width="200" header-align="center">
           <template slot-scope="scope">
             <el-button
               type="text"
               size="small"
-              @click="noticeDetail(scope)"
+              @click="showDetails(scope)"
             >
-              详情
+              阅读详情
             </el-button>
             <el-button
               type="text"
@@ -52,6 +52,13 @@
         </el-table-column>
       </dilTable>
     </div>
+    <el-dialog 
+    title="阅读详情"
+    :visible.sync="dialogVisible"
+    width="70%">
+      <dilTable v-bind.sync="detailOptions">
+      </dilTable>
+    </el-dialog>
   </div>
 </template>
 
@@ -70,7 +77,14 @@ export default {
         // first请求数据的地址
         requestUrl: "/api/v1/ams/getCarrierNoticeList?apiId=414",
       },
-      userId:""
+      userId:"",
+      dialogVisible:false,
+      detailOptions:{
+        requestUrl: "/api/v1/ams/getNoticeUser?apiId=520",
+        requestQuery:{
+          noticeId:0
+        }
+      }
     }
   },
   methods:{
@@ -78,6 +92,11 @@ export default {
       this.options.requestUrl = "/api/v1/ams/getCarrierNoticeList?apiId=414&con="+this.textInput;
     },
 
+    showDetails(scope) {
+      console.log(scope.row.noticeId)
+      this.detailOptions.requestQuery.noticeId=scope.row.noticeId;
+      this.dialogVisible=true;
+    },
     //发布
     releaseNotice(scope){
       console.log("发布")

src/views/statisticalReport/components/salesLogisticsStatistics/saleSteelReports.vue

@@ -702,6 +702,12 @@
                 "
                 >提交</el-button
               >
+              <span v-show="orgCode!='chengyunshang'">是否校验GPS:</span>
+              <el-switch
+                v-model="isCheckGPS"
+                v-show="orgCode!='chengyunshang'"
+                :disabled="orgCode=='chengyunshang'">
+              </el-switch>
             </div>
             <div class="steelMapClass33">
               <span>司机电话:</span>
@@ -1426,10 +1432,11 @@ export default {
   },
   data() {
     return {
-      userId: null,
-      orgCode: null,
-      taskAllNum: 0,
-      noticeInterval: null,
+      isCheckGPS:true,
+      userId:null,
+      orgCode:null,
+      taskAllNum:0,
+      noticeInterval:null,
       exceptionHandleVisible: false,
       batchCarrierName: null,
       batchCarrierVisible: false,
@@ -3048,6 +3055,8 @@ export default {
         this.$message.error('请输入正确格式的车牌号!')
         return
       }
+      //是否校验GPS
+      this.steelMap.isCheckGPS=this.isCheckGPS;
       if (this.steelMap.capacityIds != 0) {
         const loading = this.$loading({
           lock: true,