Просмотр исходного кода

Merge remote-tracking branch 'origin/dev' into dev

lazhaoqian 3 лет назад
Родитель
Сommit
0a48ecc343

+ 29 - 0
src/api/index.js

@@ -31,3 +31,32 @@ export function inquiry(data){
     data:data
   })
 }
+//箱分布查询
+export function boxDistribution(){
+  return request({
+    url:'/shipping/homePage/homeBox',
+    method:'get'
+  })
+}
+
+//船动态查询
+export function shipDynamics(){
+  return request({
+    url:'shipping/homePage/shipDynamic',
+    method:'get'
+  })
+}
+//订舱排名查询
+export function bookingSpace(){
+  return request({
+    url:'shipping/homePage/bookingSpace',
+    method:'get'
+  })
+}
+//应收款排名查询
+export function locationRanking(){
+  return request({
+    url:'shipping/homePage/accountsDue',
+    method:'get'
+  })
+}

+ 1 - 1
src/views/Warehousing/cargoClearance/index.vue

@@ -835,7 +835,7 @@ export default {
         this.total = response.total;
         this.loading = false;
         // 根据浏览器高度设置初始高度
-        setInterval(() => {
+        setTimeout(() => {
           this.tableHeight = window.innerHeight - this.$refs.table.$el.offsetTop - 70
         }, 300)
       });

+ 1 - 1
src/views/Warehousing/goodsTransfer/index.vue

@@ -856,7 +856,7 @@ export default {
         this.total = response.total;
         this.loading = false;
         // 根据浏览器高度设置初始高度
-        setInterval(() => {
+        setTimeout(() => {
           this.tableHeight = window.innerHeight - this.$refs.table.$el.offsetTop - 70
         }, 1500)
       });

+ 1 - 1
src/views/Warehousing/inStock/index.vue

@@ -947,7 +947,7 @@ export default {
         this.loading = false;
         // 根据浏览器高度设置初始高度
 
-        setInterval(() => {
+        setTimeout(() => {
           this.tableHeight = window.innerHeight - this.$refs.table.$el.offsetTop - 70
         }, 300)
       });

+ 157 - 0
src/views/Warehousing/outStock/AddOrUpdate.vue

@@ -883,6 +883,7 @@
                 </el-button>
                 <el-dropdown-menu slot="dropdown">
                   <el-dropdown-item command="d">标准出库单</el-dropdown-item>
+                  <el-dropdown-item command="i">标准出库单(详情)</el-dropdown-item>
                   <!--                  <el-dropdown-item command="b">出库单</el-dropdown-item>-->
                   <!--                  <el-dropdown-item command="c">理货单</el-dropdown-item>-->
                   <!--                  <el-dropdown-item command="e">出库确认</el-dropdown-item>-->
@@ -1244,6 +1245,14 @@
                 type="warning"
             >计算仓储费
             </el-button>
+            <el-button
+              type="primary"
+              size="small"
+              v-if="browseStatus"
+              @click="feeChange"
+            >
+              费用变更
+            </el-button>
           </div>
         </div>
         <el-table
@@ -1767,6 +1776,14 @@
             >作业费协议
             </el-button
             >
+            <el-button
+              type="primary"
+              size="small"
+              v-if="browseStatus"
+              @click="feeChange"
+            >
+              费用变更
+            </el-button>
           </div>
         </div>
         <el-table
@@ -2752,6 +2769,110 @@
         <el-button @click="print_bzckd = false">取消 </el-button>
       </span>
     </el-dialog>
+<!--    出库单(详情)-->
+    <el-dialog
+      :visible.sync="print_xqckd"
+      width="70%"
+      :close-on-click-modal="false"
+      :modal="false"
+    >
+      <div id="print_areaDetail" class="print-div">
+        <div
+          class="print-title"
+          style="
+            display: flex;
+            justify-content: center;
+            font-size: 24px;
+            margin-bottom: 5px;
+          "
+        >
+          {{ company }}出库单
+        </div>
+        <div class="print_table" style="display: flex">
+          <table
+            border="0"
+            cellspacing="0"
+            cellpadding="0"
+            style="width: 100%; line-height: 30px"
+          >
+            <tr>
+              <td>公司名称</td>
+              <td colspan="3">{{ form.fCorpidName }}</td>
+              <td>出库日期</td>
+              <td colspan="4" v-if="Printinglist.length">
+                {{ Printinglist[0].fBsdate | fBsdateFormat }}{{ " " + ckTime }}
+              </td>
+              <td colspan="4" v-else></td>
+            </tr>
+            <tr>
+              <td style="width: 15%">货物名称</td>
+              <td>提单号</td>
+              <td>箱号</td>
+              <td>货物属性</td>
+              <td>属性详情</td>
+              <td>件数</td>
+              <td>吨位</td>
+              <td>车型</td>
+              <td>备注</td>
+            </tr>
+            <tr v-for="(item, index) in Printinglist" :key="index">
+              <td>{{ item.fGoodsid | goodsFormat(goodsOptions) }}</td>
+              <td>{{ item.fMblno }}</td>
+              <td>{{ item.fCntrno }}</td>
+              <td>{{ item.fBusinessType | fStorageTypeFormat(fStorageTypeOptions) }}</td>
+              <td>{{ item.fMarks }}</td>
+              <td>{{ item.fQty }}</td>
+              <td v-if="item.fGrossweight">
+                {{ (item.fGrossweight / 1000).toFixed(2) }}
+              </td>
+              <td v-else></td>
+              <td>{{ form.fCartype | fCartypeFormat(fCartypeOptions) }}</td>
+              <td>{{ item.remark }}</td>
+            </tr>
+            <tr>
+              <td>车号</td>
+              <td colspan="3" v-if="Printinglist.length">
+                {{ Printinglist[0].fTruckno }}
+              </td>
+              <td colspan="3" v-else></td>
+              <td colspan="2">身份证号</td>
+              <td colspan="3" v-if="Printinglist.length">{{ Printinglist[0].fDriverIdCar }}</td>
+              <td colspan="3" v-else></td>
+            </tr>
+            <tr>
+              <td>地址</td>
+              <td colspan="8">{{ stockaddr }}</td>
+            </tr>
+            <tr>
+              <td colspan="9">
+                雨/雪天装货司机自愿装车,出现货物水湿与仓库无关!数量准确无误,货物包装完好!
+              </td>
+            </tr>
+          </table>
+        </div>
+        <div
+          style="display: flex; justify-content: space-between; font-size: 12px"
+        >
+          <div>操作:</div>
+          <div>理货:</div>
+          <div>叉车:</div>
+          <div>司机:</div>
+          <div style="width: 200px">电话:</div>
+        </div>
+      </div>
+      <span slot="footer" class="dialog-footer">
+        <el-button
+          type="primary"
+          @click="
+            print_xqckd = false;
+            addprint('xqckd');
+          "
+        >打印
+        </el-button>
+        <el-button @click="print_xqckd = false">取消 </el-button>
+      </span>
+    </el-dialog>
+
     <el-dialog
         :visible.sync="print_lhd"
         width="70%"
@@ -3605,6 +3726,7 @@ export default {
       print_dcckd: false,
       print_zccdckd: false,
       print_bzckd: false,
+      print_xqckd: false,
       company: "",
       Printinglist: [],
       //库位
@@ -4144,6 +4266,15 @@ export default {
       });
       return name;
     },
+    fStorageTypeFormat(row, fStorageTypeOptions) {
+      let fStorageType;
+      fStorageTypeOptions.map((e) => {
+        if (row == e.dictValue) {
+          fStorageType = e.dictLabel;
+        }
+      });
+      return fStorageType;
+    },
   },
   methods: {
     init() {
@@ -4939,6 +5070,15 @@ export default {
       });
       return fStorageType;
     },
+    // fStorageTypeFormat(row, fStorageTypeOptions) {
+    //   let fStorageType;
+    //   fStorageTypeOptions.map((e) => {
+    //     if (row == e.dictValue) {
+    //       fStorageType = e.dictLabel;
+    //     }
+    //   });
+    //   return fStorageType;
+    // },
     fCntrtypeFormat(row) {
       let fCntrtype;
       this.cntrList.map((e) => {
@@ -5911,6 +6051,8 @@ export default {
               this.print_dcckd = true;
             } else if (command == "h") {
               this.print_zccdckd = true;
+            } else if (command == "i") {
+              this.print_xqckd = true;
             }
           }
         });
@@ -6366,6 +6508,14 @@ export default {
             scanStyles: false,
           });
           break;
+        case "xqckd":
+          print({
+            printable: "print_areaDetail",
+            type: "html",
+            style: style, // 亦可使用引入的外部css;
+            scanStyles: false,
+          });
+          break;
         case "lhd":
           print({
             printable: "print_area5",
@@ -6433,6 +6583,13 @@ export default {
             this.cancel();
           });
     },
+    feeChange() {
+      this.$router.push({
+        path: "/business/costModify",
+        // query: { id: this.form.id},
+        query: { id: 1},
+      });
+    },
   },
   watch: {
     // 监听 addOrUpdateVisible 改变

+ 1 - 1
src/views/Warehousing/outStock/index.vue

@@ -912,7 +912,7 @@ export default {
         this.total = response.total;
         this.loading = false;
         // 根据浏览器高度设置初始高度
-        setInterval(() => {
+        setTimeout(() => {
           this.tableHeight = window.innerHeight - this.$refs.table.$el.offsetTop - 70
         }, 300)
       });

+ 1 - 1
src/views/Warehousing/stockTransfer/index.vue

@@ -870,7 +870,7 @@ export default {
         this.total = response.total;
         this.loading = false;
         // 根据浏览器高度设置初始高度
-        setInterval(() => {
+        setTimeout(() => {
           this.tableHeight = window.innerHeight - this.$refs.table.$el.offsetTop - 70
         }, 300)
       });

+ 144 - 64
src/views/index.vue

@@ -621,53 +621,35 @@
         <div id="distribution" style="width: 100%;height: 300px;"></div>
       </div>
       <div style="width: 100%;margin: 20px auto;float: left">
-        <div style="width: 49%;float: left">
-          <el-table
-            :data="bookingData"
-            style="width: 100%">
-            <el-table-column
-              prop="acc"
-              align="center"
-              label="船名航次">
-            </el-table-column>
-            <el-table-column
-              prop="bcc"
-              align="center"
-              label="开船日期">
-            </el-table-column>
-            <el-table-column
-              prop="caa"
-              align="center"
-              label="预装TEU">
-            </el-table-column>
-            <el-table-column
-              prop="baa"
-              align="center"
-              label="装载TEU">
-            </el-table-column>
-          </el-table>
-        </div>
-        <div style="width: 47%;float: right">
-          <el-table
-            :data="bookingData"
-            style="width: 100%">
-            <el-table-column
-              prop="acc"
-              align="center"
-              label="船名航次">
-            </el-table-column>
-            <el-table-column
-              prop="bcc"
-              align="center"
-              label="开船日期">
-            </el-table-column>
-            <el-table-column
-              prop="bcc"
-              align="center"
-              label="到港日期">
-            </el-table-column>
-          </el-table>
-        </div>
+        <el-table :data="bookingData">
+          <el-table-column prop="fName" align="center" label="船名"/>
+          <el-table-column prop="fNo" align="center" label="航次"/>
+          <el-table-column prop="portofloadName" align="center" label="起运港"/>
+          <el-table-column prop="distinationName" align="center" label="目的港"/>
+          <el-table-column prop="fWeight" align="center" label="容量TEU"/>
+          <el-table-column prop="boxNumber" align="center" label="实装TEU"/>
+          <el-table-column prop="fETD" align="center" label="预计开船">
+            <template slot-scope="scope">
+              <span>{{ scope.row.fETD?scope.row.fETD.slice(0, 10):'' }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column prop="fETA" align="center" label="预计到港">
+            <template slot-scope="scope">
+              <span>{{ scope.row.fETA?scope.row.fETA.slice(0, 10):'' }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column prop="fATD" align="center" label="实际开船">
+            <template slot-scope="scope">
+              <span>{{ scope.row.fATD?scope.row.fATD.slice(0, 10):'' }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column prop="fATA" align="center" label="实际到港">
+            <template slot-scope="scope">
+              <span>{{ scope.row.fATA?scope.row.fATA.slice(0, 10):'' }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column prop="fDays" align="center" label="航程"/>
+        </el-table>
       </div>
       <div style="width: 100%;">
         <div style="width: 49%;float: left">
@@ -777,6 +759,9 @@
       <div style="width: 100%;margin: 10px auto;float: left">
         <div id="bookingRanking" style="width: 100%;height: 300px;"></div>
       </div>
+      <div style="width: 100%;margin: 10px auto;float: left">
+        <div id="bookingRankingTwo" style="width: 100%;height: 300px;"></div>
+      </div>
     </div>
   </div>
 </template>
@@ -789,18 +774,17 @@ import {
   information,
   warehouse,
   inquiry,
+  boxDistribution,
+  shipDynamics,
+  bookingSpace,
+  locationRanking
 } from "../../src/api/index";
 import Cookies from "js-cookie";
 export default {
   name: "index",
   data() {
     return {
-      bookingData:[
-        {acc:'T00345',bcc:'2020-5-12',caa:'BUGASD',baa:'ECCC-099897'},
-        {acc:'T00345',bcc:'2020-5-02',caa:'BUGASD',baa:'ECCC-099897'},
-        {acc:'T00345',bcc:'2020-5-05',caa:'BUGASD',baa:'ECCC-099897'},
-        {acc:'T00345',bcc:'2020-5-09',caa:'BUGASD',baa:'ECCC-099897'}
-      ],
+      bookingData:[],
       editModel: {},
       // 版本号
       version: "3.2.1",
@@ -808,6 +792,16 @@ export default {
       text: "",
       dialogVisible: false,
       tableData: [],
+      dataList:{
+        addressName:[],
+        boxNumber:[],
+        bookingRanking:{
+          text:[],
+          textTwo:[],
+          data:[],
+          dataTwo:[]
+        }
+      },
       chart: [],
       warehouse: [],
       master: [],
@@ -871,9 +865,48 @@ export default {
     this.getList();
     this.warehouses();
     this.inquiry();
+    this.dataList.addressName = []
+    this.dataList.boxNumber = []
+    this.dataList.bookingRanking.text = []
+    this.dataList.bookingRanking.textTwo = []
+    this.dataList.bookingRanking.data = []
+    this.dataList.bookingRanking.dataTwo = []
     if (Number(this.sysType) === 3){
-      this.boxDistribution()
-      this.ranking()
+      boxDistribution().then(res =>{
+        res.data.forEach(item =>{
+          this.dataList.addressName.push(item.addressName)
+          this.dataList.boxNumber.push(item.boxNumber)
+        })
+        this.boxDistribution()
+      })
+      bookingSpace().then(res=>{
+        res.data.forEach(item =>{
+          this.dataList.bookingRanking.text.push(item.corpName)
+          this.dataList.bookingRanking.data.push({
+            name: item.corpName,
+            type: 'line',
+            stack: '总量',
+            data: [item.January, item.February, item.March, item.April, item.May, item.June, item.July,item.August,item.September,item.October,item.November,item.December]
+          })
+        })
+        this.ranking()
+      })
+      locationRanking().then(res=>{
+        res.data.forEach(item =>{
+          this.dataList.bookingRanking.textTwo.push(item.corpName)
+          this.dataList.bookingRanking.dataTwo.push({
+            name: item.corpName,
+            type: 'line',
+            stack: '总量',
+            data: [item.January, item.February, item.March, item.April, item.May, item.June, item.July,item.August,item.September,item.October,item.November,item.December]
+          })
+        })
+        this.rankingTwo()
+      })
+      shipDynamics().then(res=>{
+        console.log(res)
+        this.bookingData = res.data
+      })
     }
   },
   methods: {
@@ -884,20 +917,67 @@ export default {
       // 绘制图表
       myChart.setOption({
         title: {
-          text: "订舱排名",
-          left: "center",
+          text: '订舱排名(前十)',
+          left: 'center'
+        },
+        tooltip: {
+          trigger: 'axis'
+        },
+        legend: {
+          orient: 'vertical',
+          left: 'right',
+          data: this.dataList.bookingRanking.text
+        },
+        grid: {
+          left: '3%',
+          right: '20%',
+          bottom: '3%',
+          containLabel: true
         },
         xAxis: {
           type: 'category',
-          data: ['中国国贸集团', '赛轮集团', '金宇集团', '利群集团', '中华集团', '腾讯集团', '网易公司']
+          boundaryGap: false,
+          data: ['一月', '二月', '三月', '四月', '五月', '六月', '七月', '八月', '九月', '十月', '十一月', '十二月']
         },
         yAxis: {
           type: 'value'
         },
-        series: [{
-          data: [150, 230, 224, 218, 135, 147, 260],
-          type: 'line'
-        }]
+        series: this.dataList.bookingRanking.data
+      });
+    },
+    //箱分布图表
+    rankingTwo() {
+      // 基于准备好的dom,初始化echarts实例,所以只能在mounted中调用
+      let myChart = this.$echarts.init(document.getElementById("bookingRankingTwo"));
+      // 绘制图表
+      myChart.setOption({
+        title: {
+          text: '应收款排名(前十)',
+          left: 'center'
+        },
+        tooltip: {
+          trigger: 'axis'
+        },
+        legend: {
+          orient: 'vertical',
+          left: 'right',
+          data: this.dataList.bookingRanking.textTwo
+        },
+        grid: {
+          left: '3%',
+          right: '20%',
+          bottom: '3%',
+          containLabel: true
+        },
+        xAxis: {
+          type: 'category',
+          boundaryGap: false,
+          data: ['一月', '二月', '三月', '四月', '五月', '六月', '七月', '八月', '九月', '十月', '十一月', '十二月']
+        },
+        yAxis: {
+          type: 'value'
+        },
+        series: this.dataList.bookingRanking.dataTwo
       });
     },
     //箱分布图表
@@ -912,7 +992,7 @@ export default {
         },
         xAxis: {
           type: 'category',
-          data: ['北京', '上海', '天津', '青岛', '深圳', '西安', '甘肃']
+          data: this.dataList.addressName
         },
         tooltip: {
           trigger: 'axis'
@@ -926,7 +1006,7 @@ export default {
           }
         },
         series: [{
-          data: [150, 230, 224, 218, 135, 147, 260],
+          data: this.dataList.boxNumber,
           type: 'line'
         }]
       });

+ 10 - 8
src/views/kaihe/domesticTrade/orderInformation/index.vue

@@ -922,12 +922,13 @@
           >
             <template slot-scope="scope">
               <span v-if="scope.row.fSrcTypeId === 0">录入</span>
-              <span v-if="scope.row.fSrcTypeId !== 0">协议</span>
+              <span v-if="scope.row.fSrcTypeId === 1">协议</span>
+              <span v-if="scope.row.fSrcTypeId === 2">订舱</span>
             </template>
           </el-table-column>
 
           <el-table-column
-            prop="remarks"
+            prop="remark"
             header-align="center"
             align="center"
             width="150px"
@@ -935,7 +936,7 @@
           >
             <template slot-scope="scope">
               <el-input
-                v-model="scope.row.Remarks"
+                v-model="scope.row.remark"
                 :disabled="modify || scope.row.fSrcTypeId !== 0"
                 placeholder="备注"
                 show-word-limit
@@ -1244,11 +1245,12 @@
           >
             <template slot-scope="scope">
               <span v-if="scope.row.fSrcTypeId === 0">录入</span>
-              <span v-if="scope.row.fSrcTypeId !== 0">协议</span>
+              <span v-if="scope.row.fSrcTypeId === 1">协议</span>
+              <span v-if="scope.row.fSrcTypeId === 2">订舱</span>
             </template>
           </el-table-column>
           <el-table-column
-            prop="remarks"
+            prop="remark"
             header-align="center"
             align="center"
             width="150px"
@@ -1256,7 +1258,7 @@
           >
             <template slot-scope="scope">
               <el-input
-                v-model="scope.row.remarks"
+                v-model="scope.row.remark"
                 :disabled="modify || scope.row.fSrcTypeId !== 0"
                 placeholder="备注"
                 show-word-limit
@@ -2111,7 +2113,7 @@ export default {
         fExrate: '1',
         fTaxrate: this.fTaxrate,
         fSrcTypeId: 0,
-        remarks: null
+        remark: null
       })
     },
     // 数量计算
@@ -2355,7 +2357,7 @@ export default {
         fExrate: '1',
         fTaxrate: this.fTaxrate,
         fSrcTypeId: 0,
-        remarks: null
+        remark: null
       })
     },
     //提交审批

+ 1 - 1
src/views/reportManagement/Statistics/index.vue

@@ -852,7 +852,7 @@ export default {
         this.total = response.total;
         this.loading = false;
         // 根据浏览器高度设置初始高度
-        setInterval(() => {
+        setTimeout(() => {
           this.tableHeight = window.innerHeight - this.$refs.table.$el.offsetTop - 70
         }, 300)
       });

+ 1 - 1
src/views/reportManagement/generalLedgerCr/index.vue

@@ -688,7 +688,7 @@ export default {
         this.total = response.total;
         this.loading = false;
         // 根据浏览器高度设置初始高度
-        setInterval(() => {
+        setTimeout(() => {
           this.tableHeight = window.innerHeight - this.$refs.table.$el.offsetTop - 70
         }, 300)
       });

+ 1 - 1
src/views/reportManagement/generalLedgerDr/index.vue

@@ -691,7 +691,7 @@ export default {
         this.total = response.total;
         this.loading = false;
         // 根据浏览器高度设置初始高度
-        setInterval(() => {
+        setTimeout(() => {
           this.tableHeight = window.innerHeight - this.$refs.table.$el.offsetTop - 70
         }, 300)
       });

+ 1 - 1
src/views/reportManagement/outExcel/index.vue

@@ -314,7 +314,7 @@ export default {
           this.total = res.total;
           this.loading = false;
           // 根据浏览器高度设置初始高度
-          setInterval(() => {
+          setTimeout(() => {
             this.tableHeight = window.innerHeight - this.$refs.table.$el.offsetTop - 70
           }, 300)
         }

+ 1 - 1
src/views/reportManagement/whgenleg/index.vue

@@ -907,7 +907,7 @@ export default {
         this.total = response.total;
         this.loading = false;
         // 根据浏览器高度设置初始高度
-        setInterval(() => {
+        setTimeout(() => {
           this.tableHeight = window.innerHeight - this.$refs.table.$el.offsetTop - 70
         }, 300)
       });

+ 23 - 15
src/views/warehouseBusiness/storageFeeCalculation/index.vue

@@ -139,17 +139,17 @@
         >修改
         </el-button>
       </el-col>
-      <el-col :span="1.5">
-        <el-button
-            type="danger"
-            icon="el-icon-delete"
-            size="mini"
-            :disabled="multiple"
-            @click="handleDelete"
-            v-hasPermi="['warehouseBusiness:storageFeeCalculation:remove']"
-        >删除
-        </el-button>
-      </el-col>
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--            type="danger"-->
+<!--            icon="el-icon-delete"-->
+<!--            size="mini"-->
+<!--            :disabled="multiple"-->
+<!--            @click="handleDelete"-->
+<!--            v-hasPermi="['warehouseBusiness:storageFeeCalculation:remove']"-->
+<!--        >删除-->
+<!--        </el-button>-->
+<!--      </el-col>-->
       <el-col :span="1.5">
         <el-button
             type="warning"
@@ -1648,7 +1648,7 @@ export default {
         this.total = response.total;
         this.loading = false;
         // 根据浏览器高度设置初始高度
-        setInterval(() => {
+        setTimeout(() => {
           this.tableHeight = window.innerHeight - this.$refs.table.$el.offsetTop - 70
         }, 300)
       });
@@ -2017,9 +2017,17 @@ export default {
     },
     /** 删除按钮操作 */
     handleDelete(row) {
-      const fIds = row.fId || this.ids.fId;
+      console.log(this.ids)
+      let ids_FId = [];
+      this.ids.forEach(item => {
+        ids_FId.push(item.fId)
+      })
+      // const fIds = row.fId || this.ids.fId;
+      const fIds = row.fId || ids_FId;
+      console.log(fIds)
       let tips = ''
       delstorageFeeCalculation_s(fIds).then(data => {
+        console.log(data)
         switch (data.msg) {
           case '0': {
             this.$message.error('当前数据已被其他操作员操作请刷新页面')
@@ -2027,12 +2035,12 @@ export default {
           }
           case '1': {
             tips = '当前主表有数据从表无数据是否删除'
-            this.delete_S(fIds, tips)
+            this.delete_s(fIds, tips)
             break
           }
           case '2': {
             tips = '当前主表有数据从表有数据是否删除'
-            this.delete_S(fIds, tips)
+            this.delete_s(fIds, tips)
             break
           }
           default: {

+ 2 - 2
vue.config.js

@@ -34,13 +34,13 @@ module.exports = {
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
-        target: `http://192.168.1.177:9010/`,
+        // target: `http://192.168.1.177:9010/`,
         // target: `https://test.fms.tubaosoft.com/prod-api/`,
         // target: `https://test.wms.tubaosoft.com/prod-api/`,
         // target: `https://test.tms.tubaosoft.com/prod-api/`,
         // target: `https://test.ke.tubaosoft.com/prod-api/`,
 
-        // target: `https://zd.tubaosoft.com/prod-api/`,
+        target: `https://zd.tubaosoft.com/prod-api/`,
         // target: `https://jianqiao.tubaosoft.com/prod-api/`,
         // target: `https://jiyong.tubaosoft.com/prod-api/`,
         // target: `https://dmu.tubaosoft.com/prod-api/`,