luobang %!s(int64=2) %!d(string=hai) anos
pai
achega
4062cff85a

+ 1 - 1
build/utils.js

@@ -16,7 +16,7 @@ const devPathSrc = path.resolve(__dirname, '../../../src') // node_modules应用
 //       统计报表       组织机构/系统管理 采购  仓储
 //  'statisticalReport','systemConfig','TMS','WMS','workFlow','ADMINISTRATORS']
 //let devModules = ["index", "statisticalReport", "appoint", "sale"];
-let devModules = ['all']
+let devModules = ['index', 'sale', 'statisticalReport']
 
 if (pathSrc.indexOf('node_modules') > -1) {
   devModules = require('../../../cors.js').devModules

+ 2 - 2
config/index.js

@@ -72,8 +72,8 @@ let proxyTable = {
   },
   // 所有数据的请求域名地址
   '/api/v1': {
-    target: 'http://172.16.33.166:80',
-    // target: 'http://localhost:8080',
+    // target: 'http://172.16.33.166:80',
+    target: 'http://localhost:8080',
     // target: 'http://192.168.1.102:8080',
     ws: true,
     pathRewrite: {

+ 180 - 317
src/views/sale/components/transportFreight/saleTruckSettlement/bmsTruckSteelDetails.vue

@@ -1,6 +1,6 @@
 // 计费详单
 <template>
-  <div class="steel_inbound">
+  <div class="steelDetailsOrder">
     <div class="sache">
       <el-date-picker
         v-model="startTime"
@@ -56,114 +56,49 @@
         </el-tab-pane>
       </el-tabs>
     </div>
-    <!-- 修改详单单价弹出框 -->
-      <!-- 内层单价选择弹出框 -->
-<!--      <el-dialog
-        width="40%"
-        title="地址筛选"
-        :visible.sync="addressDrawer"
-        append-to-body
-      >
-        <el-input
-          v-model="addresText"
-          placeholder="请输入内容"
-          style="margin-top: 10px; margin-left: 20px; width: 250px"
-        ></el-input>
-        <el-button
-          type="primary"
-          @click="selectAddresClick"
-          :loading="selectLineLoading"
-          ><i class="el-icon-search"></i>查询</el-button
-        >
-        &lt;!&ndash; 已选中 省市(区)县 &ndash;&gt;
-        <el-form :inline="true" style="margin-top: 0.5rem;">
-          <el-form-item>
-            <label class="el-form-item__label" style="width: auto;"
-              >已选中省市县(区):</label
-            >
-          </el-form-item>
-          <el-form-item>
-            <el-input
-              class="el-form-item__content"
-              v-model="address"
-              placeholder="请输入内容"
-              :disabled="true"
-            ></el-input>
-          </el-form-item>
-        </el-form>
-        &lt;!&ndash; 具体收货地址 &ndash;&gt;
-        <div v-if="address != null">
-          <el-form :inline="true" style="margin-top: 0.5rem;">
-            <el-form-item label="具体收货地址:">
-              <el-autocomplete
-                class="inline-input"
-                v-model="place"
-                :fetch-suggestions="querySearch1"
-                placeholder="请输入具体收货地址"
-                :trigger-on-focus="false"
-                @select="handleSelect1"
-              >
-              </el-autocomplete>
-            </el-form-item>
-
-            <el-button type="primary" @click="addAddressClick">确定</el-button>
-          </el-form>
-        </div>
-
-        <div class="tablecls">
-          &lt;!&ndash; 查询所有的运输单价 &ndash;&gt;
-          <dilTable
-            v-bind.sync="Address"
-            @radio-change="currentRadioChange2"
-          ></dilTable>
-        </div>
-      </el-dialog>-->
-      <!-- 内层单价选择弹出框 -->
-
-      <!--append-to-body-->
-      <el-drawer
-        title="修改详单地址"
-        :visible.sync="dialogFormVisible"
-        size="40%"
-        >
-<!--        <el-form-item label="原详单地址" :label-width="formLabelWidth">-->
-        原详单地址
-        <el-input
-            style="width:250px"
-            v-model="originalAddress"
-            disabled
-          ></el-input>
-          <label>原单价</label>
-          <el-input
-            style="width:100px"
-            v-model="originalPriceValue"
-            disabled
-          ></el-input>
-<!--        </el-form-item>-->
-        <!---->
-        <el-input
-          v-model="addresText"
-          placeholder="请输入内容"
-          style="margin-top: 10px; margin-left: 20px; width: 250px"
-          @keyup.native.enter="selectAddresClick"
-        ></el-input>
-        <el-button
-          type="primary"
-          @click="selectAddresClick"
-          :loading="selectLineLoading"
+    <el-drawer
+      title="修改详单地址"
+      :visible.sync="dialogFormVisible"
+      size="40%"
+    >
+      <!--        <el-form-item label="原详单地址" :label-width="formLabelWidth">-->
+      原详单地址
+      <el-input
+        style="width:250px"
+        v-model="originalAddress"
+        disabled
+      ></el-input>
+      <label>原单价</label>
+      <el-input
+        style="width:100px"
+        v-model="originalPriceValue"
+        disabled
+      ></el-input>
+      <!--        </el-form-item>-->
+      <!---->
+      <el-input
+        v-model="addresText"
+        placeholder="请输入内容"
+        style="margin-top: 10px; margin-left: 20px; width: 250px"
+        @keyup.native.enter="selectAddresClick"
+      ></el-input>
+      <el-button
+        type="primary"
+        @click="selectAddresClick"
+        :loading="selectLineLoading"
         ><i class="el-icon-search"></i>查询</el-button
-        >
-        <div class="tablecls">
-          <!-- 查询所有的运输单价 -->
-          <vue-scorll :ops="ops" style="width: 100%;height: 100%">
+      >
+      <div class="tablecls">
+        <!-- 查询所有的运输单价 -->
+        <vue-scorll :ops="ops" style="width: 100%;height: 100%">
           <dilTable
             v-bind.sync="Address"
             @radio-change="currentRadioChange2"
             :drawer="aaadrawer"
           ></dilTable>
-          </vue-scorll>
-        </div>
-<!--        <el-form-item label="新详单地址" :label-width="formLabelWidth">
+        </vue-scorll>
+      </div>
+      <!--        <el-form-item label="新详单地址" :label-width="formLabelWidth">
           <el-input
             style="width:250px"
             v-model="newAddress"
@@ -180,42 +115,22 @@
           >
         </el-form-item>-->
 
-        <!-- class="dialog-footer" slot="footer"-->
+      <!-- class="dialog-footer" slot="footer"-->
       <div class="opreation">
         <el-button @click="dialogFormVisible = false">取 消</el-button>
         <el-button type="primary" @click="makeSure">确 定</el-button>
       </div>
-
-      </el-drawer>
-    <!-- 增加途损 -->
-    <el-dialog title="增加途损" width="30%" :visible.sync="dialogDamage">
-      <el-form>
-        <el-form-item label="达钢的干基" :label-width="formLabelWidth">
-          <el-input v-model="DaDryBasis"></el-input>
-        </el-form-item>
-        <el-form-item label="九江收货的干基" :label-width="formLabelWidth">
-          <el-input v-model="JiuDryBasis"></el-input>
-        </el-form-item>
-        <el-form-item label="单价" :label-width="formLabelWidth">
-          <el-input v-model="Fee"></el-input>
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button @click="dialogDamage = false">取 消</el-button>
-        <el-button type="primary" @click="makeSureAdd">确 定</el-button>
-      </div>
-    </el-dialog>
+    </el-drawer>
   </div>
-
 </template>
 
 <script>
-import { getCookie } from "@/utils/util.js";
-import { sjTime } from "../../../../ADMINISTRATORS/app";
+import { getCookie } from '@/utils/util.js'
+import { sjTime } from '../../../../ADMINISTRATORS/app'
 export default {
   data() {
     return {
-      aaadrawer:false,
+      aaadrawer: false,
       ops: {
         vuescroll: {},
         scrollPanel: {},
@@ -225,12 +140,12 @@ export default {
         bar: {
           hoverStyle: true,
           onlyShowBarOnScroll: false, //是否只有滚动的时候才显示滚动条
-          background: "#5f9ea0", //滚动条颜色
+          background: '#5f9ea0', //滚动条颜色
           opacity: 0.8, //滚动条透明度
-          "overflow-x": "hidden"
+          'overflow-x': 'hidden'
         }
       },
-      tableTitle: "销售钢材汽运结算详单",
+      tableTitle: '销售钢材汽运结算详单',
       endTime: null,
       startTime: null,
       //已选中 省市县(区)
@@ -241,7 +156,7 @@ export default {
       addressId: null,
       //省市县(区)查询值
       addresText: null,
-      noSettleDetailsColumn:[],
+      noSettleDetailsColumn: [],
       //达钢的干基
       DaDryBasis: null,
       //九江收货的干基
@@ -252,18 +167,18 @@ export default {
       damageFee: null,
       //加载
       selectLineLoading: false,
-      input: "",
-      activeName: "first",
+      input: '',
+      activeName: 'first',
       ssoId: null,
       //详单Id
       detailsId: null,
       options1: {
         // first请求数据的地址
-        requestUrl: ""
+        requestUrl: ''
       },
       options2: {
         // second请求数据的地址
-        requestUrl: ""
+        requestUrl: ''
       },
       //是否打开修改详单地址弹出框
       dialogFormVisible: false,
@@ -283,53 +198,53 @@ export default {
       addressDrawer: false,
       //运输单价的表格
       Address: {
-        requestUrl: "/api/v1/ams/getAddressDeliveryAddress?apiId=511",
-        selectionType: "radio"
+        requestUrl: '/api/v1/ams/getAddressDeliveryAddress?apiId=511',
+        selectionType: 'radio'
       },
       // addressText:null,
       //缓存当前选中的运输单价
       priceMap: {},
-      formLabelWidth: "125px"
-    };
+      formLabelWidth: '125px'
+    }
   },
   created() {
-    this.options1GetRequestUrl();
-    this.options2GetRequestUrl();
+    this.options1GetRequestUrl()
+    this.options2GetRequestUrl()
   },
   methods: {
     //excel方法
     exportAllExcel() {
-      let startTime = null;
-      let endTime = null;
-      let carrierSsoId = null;
-      if (getCookie("orgCode") == "chengyunshang") {
-        carrierSsoId = getCookie("userId");
+      let startTime = null
+      let endTime = null
+      let carrierSsoId = null
+      if (getCookie('orgCode') == 'chengyunshang') {
+        carrierSsoId = getCookie('userId')
       }
       if (this.startTime && this.endTime) {
-        startTime = sjTime(this.startTime);
-        endTime = sjTime(this.endTime);
+        startTime = sjTime(this.startTime)
+        endTime = sjTime(this.endTime)
       }
       if (this.activeName == 'first') {
-        console.log("进入了first")
+        console.log('进入了first')
         this.tableTitle = '销售钢材汽运结算详单(未结算)'
         this.axios
           .post(
             '/api/v1/bms/getSteelTruckDetailsOrder?apiId=507&orderType=1&con=' +
-            this.input +
-            "&startTime=" +
-            startTime +
-            "&endTime=" +
-            endTime +
-            "&status=0" +
-            "&i=" +
-            new Date()
+              this.input +
+              '&startTime=' +
+              startTime +
+              '&endTime=' +
+              endTime +
+              '&status=0' +
+              '&i=' +
+              new Date()
           )
           .then(res => {
             console.log(res.data.data)
-            console.log("测试打印功能")
+            console.log('测试打印功能')
             console.log()
             this.exportAllList = res.data.data.list
-            this.noSettleDetailsColumn=res.data.data.columnData
+            this.noSettleDetailsColumn = res.data.data.columnData
             this.exportAllReportToExcel(
               this.tableTitle,
               this.exportAllList,
@@ -337,16 +252,16 @@ export default {
             )
           })
       } else if (this.activeName == 'second') {
-        console.log("进入了second")
+        console.log('进入了second')
         this.tableTitle = '销售钢材汽运结算详单(已结算)'
         this.axios
           .post(
             '/api/v1/bms/getSteelTruckDetailsOrder?apiId=507&orderType=1&carrierSsoId=' +
-            this.ssoId
+              this.ssoId
           )
           .then(res => {
             this.exportAllList = res.data.data
-            console.log("测试2")
+            console.log('测试2')
             console.log(res)
             this.exportAllReportToExcel(
               this.tableTitle,
@@ -361,7 +276,7 @@ export default {
       var title = tableTitle
       let tHeader = []
       let filterVal = []
-      console.log("进入了导出")
+      console.log('进入了导出')
       console.log(columnData)
       columnData.forEach(e1 => {
         if (tHeader.indexOf(e1.label) === -1) {
@@ -384,185 +299,129 @@ export default {
     },
     //未结算数据
     options1GetRequestUrl() {
-      if (getCookie("orgCode") == "chengyunshang") {
-        this.ssoId = getCookie("userId");
+      if (getCookie('orgCode') == 'chengyunshang') {
+        this.ssoId = getCookie('userId')
         this.options1.requestUrl =
-          "/api/v1/bms/getSteelTruckDetailsOrder?apiId=507&orderType=1&carrierSsoId=" +
-          getCookie("userId");
+          '/api/v1/bms/getSteelTruckDetailsOrder?apiId=507&orderType=1&carrierSsoId=' +
+          getCookie('userId')
       } else {
         this.options1.requestUrl =
-          "/api/v1/bms/getSteelTruckDetailsOrder?apiId=507&orderType=1&carrierSsoId=" +
-          this.ssoId;
+          '/api/v1/bms/getSteelTruckDetailsOrder?apiId=507&orderType=1&carrierSsoId=' +
+          this.ssoId
       }
     },
     //已结算数据
     options2GetRequestUrl() {
-      if (getCookie("orgCode") == "chengyunshang") {
+      if (getCookie('orgCode') == 'chengyunshang') {
         this.options2.requestUrl =
-          "/api/v1/bms/getSteelTruckDetailsOrder?apiId=507&orderType=1&carrierSsoId=" +
-          getCookie("userId");
+          '/api/v1/bms/getSteelTruckDetailsOrder?apiId=507&orderType=1&carrierSsoId=' +
+          getCookie('userId')
       } else {
         this.options2.requestUrl =
-          "/api/v1/bms/getSteelTruckDetailsOrder?apiId=507&orderType=1&carrierSsoId=" +
-          this.ssoId;
+          '/api/v1/bms/getSteelTruckDetailsOrder?apiId=507&orderType=1&carrierSsoId=' +
+          this.ssoId
       }
     },
     //收货地址弹出层
     handleSelect1(item) {
-      console.log("获取所有下拉值!");
+      console.log('获取所有下拉值!')
     },
     //查询全国省市县
     selectAddresClick() {
       if (this.addresText) {
         this.Address.requestUrl =
-          "/api/v1/ams/getAddressDeliveryAddress?apiId=511&con=" +
-          this.addresText;
+          '/api/v1/ams/getAddressDeliveryAddress?apiId=511&con=' +
+          this.addresText
       } else {
         this.Address.requestUrl =
-          "/api/v1/ams/getAddressDeliveryAddress?apiId=511&i=" + new Date();
+          '/api/v1/ams/getAddressDeliveryAddress?apiId=511&i=' + new Date()
       }
     },
     //以下是收货地址边输边查搜索
     querySearch1(queryString, cb) {
       this.axios
         .post(
-          "/api/v1/ams/getRealAddressByLike?addressId=" +
+          '/api/v1/ams/getRealAddressByLike?addressId=' +
             this.addressId +
-            "&index=" +
+            '&index=' +
             queryString
         )
         .then(res => {
-          if (res.data.code == "200") {
-            var restaurants = res.data.data;
+          if (res.data.code == '200') {
+            var restaurants = res.data.data
             var results = queryString
               ? restaurants.filter(this.createFilter1(queryString))
-              : restaurants;
+              : restaurants
             // 调用 callback 返回建议列表的数据
-            cb(results);
+            cb(results)
           }
-        });
+        })
     },
     createFilter1(queryString) {
       return restaurants => {
         return (
           restaurants.value.toLowerCase().indexOf(queryString.toLowerCase()) >
           -1
-        );
-      };
+        )
+      }
     },
     //以上是收货地址边输边查搜索
     toInsert() {
-      this.$router.push("/insertCheckInventory");
+      this.$router.push('/insertCheckInventory')
     },
     // getclick(scope){
     //   this.$router.push("/getTransportResult/"+scope.row.orderId)
     // },
     //增加途损
-    addDamage(row) {
-      this.detailsId = row.detailsId;
-      this.dialogDamage = true;
-    },
-    makeSureAdd() {
-      if (!this.DaDryBasis) {
-        this.$message.error("达钢的干基还未填!");
-      } else if (!this.JiuDryBasis) {
-        this.$message.error("九江收货的干基还未填!");
-      } else if (!this.Fee) {
-        this.$message.error("单价还未填!");
-      } else {
-        this.dialogDamage = false;
-        //计算途损 [(达钢的干基-九江收货的干基)/达钢的干基 - 0.03] * 单价 > 0, 扣除途损
-        this.damageFee =
-          ((this.DaDryBasis - this.JiuDryBasis) / this.DaDryBasis - 0.03) *
-          this.Fee;
-        if (this.damageFee > 0) {
-          let map = {
-            detailsId: this.detailsId,
-            lossFees: this.damageFee.toFixed(2)
-          };
-          //是否确定增加途损费!
-          this.$confirm("是否确定增加途损费", "提示", {
-            confirmButtonText: "确定",
-            cancelButtonText: "取消",
-            type: "warning",
-            center: true
-          })
-            .then(() => {
-              //初始化增加途损费对话框中的信息
-              (this.damageFee = null),
-                this.axios
-                  .post("/api/v1/bms/addLossFeeOfCoke", map)
-                  .then(res => {
-                    if (res.data.code == "0") {
-                      this.$message.success("增加途损费成功!");
-                      //重置未结算详单表单信息
-                      this.options1.requestUrl =
-                        "/api/v1/bms/getSteelTruckDetailsOrder?apiId=507&orderType=1&i=" +
-                        new Date();
-                    } else {
-                      this.$message.error("增加途损费失败,请联系管理员!");
-                    }
-                  });
-            })
-            .catch(() => {
-              this.$message({
-                type: "info",
-                message: "取消修改详单单价!"
-              });
-            });
-        }
-      }
-    },
     onclick() {
-
-      console.log("查询待定值");
-      let startTime = null;
-      let endTime = null;
-      let carrierSsoId = null;
-      if (getCookie("orgCode") == "chengyunshang") {
-        carrierSsoId = getCookie("userId");
+      console.log('查询待定值')
+      let startTime = null
+      let endTime = null
+      let carrierSsoId = null
+      if (getCookie('orgCode') == 'chengyunshang') {
+        carrierSsoId = getCookie('userId')
       }
       if (this.startTime && this.endTime) {
-        startTime = sjTime(this.startTime);
-        endTime = sjTime(this.endTime);
+        startTime = sjTime(this.startTime)
+        endTime = sjTime(this.endTime)
       }
       this.options1.requestUrl =
-        "/api/v1/bms/getSteelTruckDetailsOrder?apiId=507&orderType=1&con=" +
+        '/api/v1/bms/getSteelTruckDetailsOrder?apiId=507&orderType=1&con=' +
         this.input +
-        "&startTime=" +
+        '&startTime=' +
         startTime +
-        "&endTime=" +
+        '&endTime=' +
         endTime +
-        "&status=0" +
-        "&i=" +
-        new Date();
+        '&status=0' +
+        '&i=' +
+        new Date()
       this.options2.requestUrl =
-        "/api/v1/bms/getSteelTruckDetailsOrder?apiId=507&orderType=1&con=" +
+        '/api/v1/bms/getSteelTruckDetailsOrder?apiId=507&orderType=1&con=' +
         this.input +
-        "&startTime=" +
+        '&startTime=' +
         startTime +
-        "&endTime=" +
+        '&endTime=' +
         endTime +
-        "&status=1" +
-        "&i=" +
-        new Date();
+        '&status=1' +
+        '&i=' +
+        new Date()
     },
     //修改详单单价
     priceValueUpdate(row) {
-      this.originalAddress = row.realAddress;
-      this.originalPriceValue = row.priceValue;
-      this.detailsId = row.detailsId;
-      this.dialogFormVisible = true;
+      this.originalAddress = row.realAddress
+      this.originalPriceValue = row.priceValue
+      this.detailsId = row.detailsId
+      this.dialogFormVisible = true
     },
     //运输订单点击浏览的事件
     select() {
-      this.addressDrawer = true;
+      this.addressDrawer = true
     },
     //运输单价模态窗口的框计算
     selectAddressClick() {
       this.Price.requestUrl =
-        "/api/v1/ams/getAddressDeliveryAddress?apiId=255&con=" +
-        this.addressText;
+        '/api/v1/ams/getAddressDeliveryAddress?apiId=255&con=' +
+        this.addressText
     },
     //运输单价模态窗口的点击事件
     addAddressClick() {
@@ -570,31 +429,31 @@ export default {
       let map = {
         place: this.place,
         addressId: this.addressId
-      };
-      this.axios.post("/api/v1/ams/getPriceMap", map).then(res => {
+      }
+      this.axios.post('/api/v1/ams/getPriceMap', map).then(res => {
         if (res.data.data.priceId == -1) {
-          this.newPriceValue = "未录单价!";
-          this.priceId = null;
+          this.newPriceValue = '未录单价!'
+          this.priceId = null
         } else {
           //赋值运输单价和运输单价ID
-          this.newPriceValue = res.data.data.priceValue; //this.priceMap.priceValue
-          this.priceId = res.data.data.priceId; //this.priceMap.priceId
+          this.newPriceValue = res.data.data.priceValue //this.priceMap.priceValue
+          this.priceId = res.data.data.priceId //this.priceMap.priceId
         }
-      });
+      })
       //priceMap
-      this.newAddress = this.address + this.place;
-      this.addressDrawer = false;
+      this.newAddress = this.address + this.place
+      this.addressDrawer = false
     },
     //运输单价模态框单选选中的事件
     currentRadioChange2(val) {
-      console.log(val);
+      console.log(val)
       //若具体地址有值,清空值
       if (this.place != null) {
-        this.place = null;
+        this.place = null
       }
-      (this.address = val.address), (this.addressId = val.addressId);
+      ;(this.address = val.address), (this.addressId = val.addressId)
 
-      this.priceId=val.priceid
+      this.priceId = val.priceid
       // this.priceMap = {};
       // this.priceMap = val;
     },
@@ -602,73 +461,77 @@ export default {
     makeSure() {
       //若没有单价Id
       if (this.priceId == null) {
-        this.$message.error("该区域没有录入单价,不可修改!");
+        this.$message.error('该区域没有录入单价,不可修改!')
       } else {
-        this.dialogFormVisible = false;
+        this.dialogFormVisible = false
         let mapValue = {
           detailsId: this.detailsId,
           priceId: this.priceId
-        };
+        }
         //是否确定修改详单地址!
-        this.$confirm("是否确定修改详单地址", "提示", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning",
+        this.$confirm('是否确定修改详单地址', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning',
           center: true
         })
           .then(() => {
             //初始化修改详单地址对话框的信息
-            (this.newPriceValue = null),
+            ;(this.newPriceValue = null),
               (this.newAddress = null),
               (this.address = null),
               (this.addresText = null),
               (this.addressId = null),
               (this.priceId = null),
               this.axios
-                .post("/api/v1/bms/updateDetailsOrder", mapValue)
+                .post('/api/v1/bms/updateDetailsOrder', mapValue)
                 .then(res => {
-                  if (res.data.code == "0") {
-                    this.$message.success("修改详单单价成功!");
+                  if (res.data.code == '0') {
+                    this.$message.success('修改详单单价成功!')
                     //重置未结算详单表单信息
                     this.options1.requestUrl =
-                      "/api/v1/bms/getSteelTruckDetailsOrder?apiId=507&orderType=1&con=" +
+                      '/api/v1/bms/getSteelTruckDetailsOrder?apiId=507&orderType=1&con=' +
                       this.input +
-                      "&startTime=" +
+                      '&startTime=' +
                       startTime +
-                      "&endTime=" +
+                      '&endTime=' +
                       endTime +
-                      "&status=0" +
-                      "&i=" +
-                      new Date();
+                      '&status=0' +
+                      '&i=' +
+                      new Date()
                   } else {
-                    this.$message.error("修改详单单价失败,请联系管理员!");
+                    this.$message.error('修改详单单价失败,请联系管理员!')
                   }
-                });
+                })
           })
           .catch(() => {
             this.$message({
-              type: "info",
-              message: "取消修改详单单价!"
-            });
-          });
+              type: 'info',
+              message: '取消修改详单单价!'
+            })
+          })
       }
     }
   }
-};
+}
 </script>
 
 <style lang="scss" scode>
-.steel_inbound {
+.steelDetailsOrder {
   .sache {
-    padding: 1.25rem 0.375rem;
+    margin-left: 20px;
+    margin-top: 20px;
     .el-input {
-      width: 20%;
-      margin-right: 1.25rem;
+      width: 250px;
     }
   }
-}
-.opreation{
-  width: 300px;
-  height: 200px;
+  .table {
+    margin-left: 20px;
+    margin-top: 20px;
+  }
+  .opreation {
+    width: 300px;
+    height: 200px;
+  }
 }
 </style>

+ 5 - 1
src/views/statisticalReport/components/salesLogisticsStatistics/saleSteelReports.vue

@@ -861,7 +861,8 @@ export default {
         '收货客户电话',
         '是否自提',
         '订单日期',
-        '短信发送'
+        '短信发送',
+        '销售片区'
       ],
       //钢材多拼车辆线路ID
       //索引从1-10为1-10拼路线ID
@@ -1028,6 +1029,9 @@ export default {
     filterCapacity(value, row) {
       return row.capacityNo === value
     },
+    filtermaterialName(value, row) {
+      return row.materialName === value
+    },
     cellStyle({ row, column, rowIndex, columnIndex }) {
       if (
         column.property == 'arrivalAddress' ||