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

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

@@ -0,0 +1,106 @@
+//公告管理
+<template>
+  <div class="notice">
+    <div class="sache">
+      <el-input
+        placeholder="请输入内容"
+        v-model="textInput"
+        clearable>
+      </el-input>
+      <el-button type="primary" class="btn"  @click="onclick">
+        <i class="el-icon-search"></i>查询
+      </el-button>
+      <el-button type="primary" class="btn" @click="toInsert">
+        <i class="el-icon-plus"></i>新增
+      </el-button>
+    </div>
+
+
+    <div class="table">
+      <dilTable v-bind.sync="detailOptions">
+      </dilTable>
+    </div>
+  </div>
+</template>
+
+
+
+
+<script>
+import { getCookie } from '@/utils/util.js'
+export default {
+  name:"homeworkPath",
+  data(){
+    return{
+      textInput: "" ,
+      restaurants: [],
+      userId:"",
+      dialogVisible:false,
+      orgcode:'',
+      detailOptions:{
+        requestUrl: "/api/v1/ams/getNoticeUser?apiId=520",
+        requestQuery:{
+          userId:getCookie('userId')
+        }
+      }
+    }
+  },
+  methods:{
+    onclick(){
+      this.options.requestUrl = "/api/v1/ams/getCarrierNoticeList?apiId=520&con="+this.textInput;
+    },
+    deleteNotice(scope){
+      console.log(scope)
+      this.$confirm("是否删除", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+        center: true,
+      })
+        .then(() => {
+          console.log("enter")
+          this.axios
+            .post("/api/v1/ams/deleteNotice/" + scope.row.noticeId)
+            .then((res) => {
+              console.log("res.data.code",res.data.code);
+              if (res.data.code == 200) {
+                this.$message({
+                  type: "success",
+                  message: "删除成功!",
+                });
+                this.$router.go(0);
+              } else {
+                this.$message({
+                  message: "删除失败",
+                  type: "warning",
+                });
+              }
+            });
+        })
+        .catch(() => {
+          this.$message({
+            type: "info",
+            message: "删除操作已取消!",
+          });
+        });
+    },
+  },
+ created() {
+    this.userId= getCookie('userId')
+    this.orgcode=getCookie('orgCode')
+  }
+}
+
+</script>
+
+<style lang="scss" scode>
+.notice{
+  .sache{
+    padding: 1.25rem 0.375rem;
+    .el-input {
+      width: 20%;
+      margin-right: 1.25rem;
+    }
+  }
+}
+</style>

src/views/sale/router/index.js

@@ -44,6 +44,7 @@ const openDistribution = () => import( "../components/transport_appointment/open
 const openDistributionSection = () => import( "../components/transport_appointment/openDistributionSection.vue");
 const orderGrabbing = () => import( "../components/transport_appointment/orderGrabbing.vue");
 
+const selfNotice = () => import( "../components/dilNotice/selfNotice.vue");
 const add_sale_dilNotice = () => import( "../components/dilNotice/add_sale_dilNotice.vue");
 const Carrier_dilNotice = () => import( "../components/dilNotice/Carrier_dilNotice.vue");
 const sale_dilNotice = () => import( "../components/dilNotice/sale_dilNotice.vue");
@@ -364,6 +365,12 @@ const constantRouterMap = [
         meta: { code: "xtpzgl-yhgl" },
         component: add_sale_dilNotice
       },
+      {
+        path: "selfNotice",
+        name: "selfNotice",
+        meta: { code: "xtpzgl-yhgl" },
+        component: selfNotice
+      },
       {
         path: "Carrier_dilNotice",
         name: "Carrier_dilNotice",

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

@@ -1102,7 +1102,7 @@
             list-type="picture-card"
             :file-list="arriavlList"
             action="/api/v1/otms/addtmstruckArrivalResult"
-            :limit="2"
+            :limit="12"
             :on-change="fileChange1"
             :on-preview="handlePictureCardPreview"
             :on-exceed="exceed"
@@ -1249,6 +1249,24 @@
           >提交</el-button
         >
       </div>
+      <div class="batchCapacityClass" style="margin:30px">
+        <el-form :inline="true">
+          <el-form-item>
+             <span>批量修改收货客户电话:</span>
+              <el-input
+                v-model="consigneeTel"
+                style="width:150px"
+                :disabled="notRoutList.includes('consigeeTel')"
+              ></el-input>
+              <el-button
+                type="success"
+                circle
+                @click="batchUpdateconsigneeTel"
+                v-if="!notRoutList.includes('consigeeTel')"
+                >提交</el-button>
+          </el-form-item>
+        </el-form>
+      </div>
     </el-dialog>
     <div class="dialog">
       <el-dialog
@@ -1506,6 +1524,7 @@ export default {
       toggleRowIds: [],
       capacityNo: null,
       capacityId: null,
+      consigneeTel:null,
       batchCapacityList: [],
       batchCapacityVisible: false,
       isShowSaleLog: false,
@@ -2481,6 +2500,7 @@ export default {
         this.onchangeProvince()
         this.onchangeCity()
         this.addressId = this.steelMap.shipperAddressId
+        this.consigneeTel = this.steelMap.consigneeTel
       } else {
         this.$message({
           type: 'warning',
@@ -2596,19 +2616,20 @@ export default {
         )
         return
       }
-      if (this.fileListArrival.length < 2) {
-        this.$message.warning('抵达图至少两张')
+      if (this.fileListArrival.length < 3) {
+        this.$message.warning('抵达图至少三张')
         return
       }
-      if (this.fileListReceive.length < 3) {
-        this.$message.warning('签收图最少三张')
+      if (this.fileListReceive.length < 2) {
+        this.$message.warning('签收图最少两张')
         return
       }
       this.isLoading = true
       //上传抵达
       let formData = new window.FormData()
-      formData.append('file1', this.fileListArrival[0].raw)
-      formData.append('file2', this.fileListArrival[1].raw)
+      this.fileListArrival.forEach((item, index) => {
+          formData.append('file' + index, item.raw)
+      })
       formData.append('orderNumber', this.orderNumber)
       formData.append('resultArrivalAddress', this.location)
       let options = {
@@ -3496,6 +3517,41 @@ export default {
           loading.close()
         })
     },
+    //批量修改收货客户电话
+    batchUpdateconsigneeTel() {
+      const loading = this.$loading({
+        lock: true,
+        text: '修改电话号码中',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      if (!this.consigneeTel) {
+        this.$message.error('电话号码不能为空')
+        loading.close()
+        return
+      }
+      this.batchCapacityList.forEach(row => {
+        this.axios
+        .post('/api/v1/ams/updateConsigneeTel', {
+          saleOrderNo: row.saleOrderNo,
+          saleOrderMaterialId: row.saleOrderMaterialId,
+          consigneeTel: this.consigneeTel
+        })
+        .then(res => {
+          if (res.data.code == '200') {
+            this.$message.success('修改成功')
+          } else {
+            this.$message.error('修改失败')
+          }
+        })
+        .catch(() => {
+          this.$message.error('修改失败')
+        })
+      })
+      this.getSteelReport()
+      loading.close()
+      this.batchCarrierVisible = false
+    },
     //关闭车辆金蝶分录
     deleteEasEntryId() {
       this.$confirm('确定关闭该车金蝶分录吗?', '提示', {