付延余
2022-08-19 b7b4cb32f94622fbb91a8a5b1c7ea22bdbb19995
正式域名配置
6个文件已修改
1 文件已重命名
870 ■■■■ 已修改文件
api/global.js 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
manifest.json 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/edit-my-application/edit-my-application.vue 804 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/home/home.vue 38 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/login/login.vue 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
static/groupAppTotalImg/banner.png 补丁 | 查看 | 原始文档 | blame | 历史
utils/request.js 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
api/global.js
@@ -27,7 +27,9 @@
    });
}
const baseUrl = 'http://192.168.3.159:9999'
// const baseUrl = 'http://192.168.3.159:9999'
// const baseUrl = 'https://mx.jzeg.cn:443/app';
const baseUrl = "https://mx.jzeg.cn:9998";
// POST请求
function apiLogin({
manifest.json
@@ -50,9 +50,11 @@
    "quickapp": {},
    /* 小程序特有相关 */
    "mp-weixin": {
        "appid": "wx237b782d02abc154",
        "appid" : "wx69ae2830c7d22d5a",
        "setting": {
            "urlCheck": false
            "urlCheck" : false,
            "es6" : true,
            "minified" : true
        },
        "usingComponents": true
    },
pages/edit-my-application/edit-my-application.vue
@@ -1,14 +1,7 @@
<template>
  <!-- 新增申请表单 -->
  <view class="new-application-form-data">
    <!-- page-mete的page-style属性相当于HTML的body属性 -->
    <!-- <page-meta :page-style="spanStyle"></page-meta> -->
    <!-- 表单 -->
    <combination-title class="newApplicationTitle" title="新增"></combination-title>
    <!-- 注意,如果需要兼容微信小程序,最好通过setRules方法设置rules规则 -->
    <!-- <u-notify :message="accountMsg" :show="trueMsg" :type="accountMsgType"></u-notify> -->
    <!-- <u-alert :title="accountMsg" :type="accountMsgType" :description="accountMsgType"></u-alert> -->
    <view class="formDataContaniner">
      <u--form labelPosition="left" :model="newFormData"  ref="formRef">
        <u-form-item labelWidth="20%" label="结算客户"  borderBottom ref="customerNameRef">
@@ -21,12 +14,10 @@
          <u--input disabled disabledColor="#ffffff" v-model="newFormData.contractName" border="none"></u--input>
        </u-form-item>
        <u-form-item labelWidth="20%" label="付款方式" borderBottom ref="payTypeRef">
          <u--input :value="newFormData.payType == '0' ? '现汇':'承兑'" disabled disabledColor="#ffffff"
                    placeholder="请选择付款方式" border="none"></u--input>
                    <u--input :value="newFormData.payType == '0' ? '现汇' : '承兑'" disabled disabledColor="#ffffff" placeholder="请选择付款方式" border="none"></u--input>
          <u-icon slot="right" name="arrow-right"></u-icon>
        </u-form-item>
        <u-form-item @click="timeShow = true" labelWidth="20%" label="日期" borderBottom
                     ref="timeDataRef">
                <u-form-item @click="timeShow = true" labelWidth="20%" label="日期" borderBottom ref="timeDataRef">
          <u--input v-model="timeDataStr" disabled disabledColor="#ffffff" border="none" placeholder="请选择范围日期"></u--input>
          <u-icon slot="right" name="arrow-right"></u-icon>
        </u-form-item>
@@ -37,214 +28,7 @@
    </view>
    <!-- 申请日历、范围时间 -->
    <u-calendar :show="timeShow" :mode="mode" @confirm="confirmTime" @close="timeClose" rowHeight="110"
                :maxDate="maxDate"></u-calendar>
    <!-- 申请付款方式弹出菜单 -->
    <!-- <u-action-sheet :show="showPayType" :actions="actions" title="请选择付款方式" @close="showPayType = false" @select="sexSelect"></u-action-sheet> -->
    <!-- 选择客户弹框 -->
    <!--  @touchmove.stop.prevent="moveHandleCustomer":防止图层穿透 -->
    <!-- <view class="selectCustomerPopup">
      <u-popup :show="selectCustomerShow" @close="selectCustomerClose" @open="selectCustomerOpen" mode="bottom" round="22">
        <scroll-view scroll-y="true" style="height:100%;">
          <combination-title class="selectCustomerTitle" title="选择客户"></combination-title>
          <view class="selectCustomerContainer">
            <view class="searchContainer">
              <u--form labelPosition="left" :model="searchCustomerForm" ref="selectformRef">
                <u-form-item labelWidth="12%" label="单位" borderBottom ref="compRef">
                  <u--input @focus="selectCustomerCompShow = true" v-model="searchCustomerForm.compName" placeholder="点击选择单位" border="none"></u--input>
                  <u-icon slot="right" name="close-circle-fill" v-show="searchCustomerForm.compName != ''" @click="searchCustomerForm.compName = ''"></u-icon>
                </u-form-item>
                <u-form-item labelWidth="20%" label="客户名称" borderBottom ref="timeDataRef">
                  <u--input v-model="selectCustomerData.customerName" border="none" placeholder="输入客户名称"></u--input>
                  <u-icon slot="right" name="close-circle-fill" v-show="selectCustomerData.customerName != ''" @click="selectCustomerData.customerName = ''"></u-icon>
                </u-form-item>
                <u-form-item labelWidth="20%" label="客户级别" borderBottom>
                  <u--input @focus="selectLevelShow = true" border="none" v-model="searchCustomerForm.levelText" placeholder="点击选择级别"></u--input>
                  <u-icon slot="right" name="close-circle-fill" v-show="searchCustomerForm.levelText != ''" @click="searchCustomerForm.levelText = ''"></u-icon>
                </u-form-item>
              </u--form>
            </view>
            <view class="searchCustomerBtn">
              <u-button text="搜索" type="primary" @click="selectCustomer()"></u-button>
              <u-button text="清空" @click="selectCustomerResetFields"></u-button>
            </view> -->
    <!-- 客户列表 -->
    <!-- <view class="searchResultList">
      <u-cell-group :right-icon="false">
        <u-cell v-for="(item, index) in customerData" :title="item.customerFullName" :arrow="false">
          <text slot="value" class="u-slot-value">
            <button
              class="mini-btn"
              type="default"
              size="mini"
              style="background: #007aff;
              color: #ffffff;
              margin: auto 0;
              height: 20px;
              line-height:20px;
              width: 43px;
              font-size: 10px;
              padding: 0;"
              @click="selectCustomerOkClick(item)"
            >
              选择
            </button>
          </text>
        </u-cell>
      </u-cell-group>
    </view>
    <view class="loadmoreClass">
      <u-loadmore loadmoreText="点击加载更多" nomoreText="无更多数据!!!" :status="status" @loadmore="loadingCustomer" fontSize="20" height="30px"/>
    </view> -->
    <!-- 选择用户菜单项 -->
    <!-- <view class="selectCustomerCompSheet">
      <u-action-sheet
        :show="selectCustomerCompShow"
        :actions="selectCustomerActions"
        title="请选择单位"
        @close="selectCustomerCompShow = false"
        @select="selectCustomerSelect"
      ></u-action-sheet>
    </view> -->
    <!-- 级别菜单项 -->
    <!-- <view class="selectLevelSheet">
      <u-action-sheet :show="selectLevelShow" :actions="levelList" title="请选择级别" @close="selectLevelShow = false" @select="selectLevelSelect"></u-action-sheet>
    </view>
  </view>
</scroll-view>
</u-popup>
</view> -->
    <!-- 选择合同 -->
    <!-- @touchmove.stop.prevent="moveHandleContract" -->
    <!-- <view class="selectCustomerPopup">
      <u-popup :show="selectContractShow" @close="selectContractClose" @open="selectContractOpen" mode="bottom" round="22">
        <scroll-view scroll-y="true" style="height:100%;">
          <combination-title class="selectCustomerTitle" title="选择合同"></combination-title>
          <view class="selectCustomerContainer">
            <view class="searchContainer">
              <u--form labelPosition="left" :model="searchContractForm" ref="selectformRef">
                <u-form-item labelWidth="18%" label="合同编号" borderBottom ref="compRef">
                  <u--input v-model="searchContractForm.num" placeholder="请输入合同编号" border="none"></u--input>
                  <u-icon slot="right" name="close-circle-fill" v-show="searchContractForm.num != ''" @click="searchContractForm.num = ''"></u-icon>
                </u-form-item>
                <u-form-item labelWidth="18%" label="客户名称" borderBottom ref="compRef">
                  <u--input v-model="searchContractForm.customerName" placeholder="请输入客户名称" border="none"></u--input>
                  <u-icon slot="right" name="close-circle-fill" v-show="searchContractForm.customerName != ''" @click="searchContractForm.customerName = ''"></u-icon>
                </u-form-item>
                <u-form-item labelWidth="18%" label="合同类型" borderBottom ref="compRef">
                  <u--input v-model="searchContractForm.type" placeholder="请输入合同类型" border="none" @focus="searchContractFormTypeFocus"></u--input>
                  <u-icon slot="right" name="close-circle-fill" v-show="searchContractForm.type != ''" @click="searchContractForm.type = ''"></u-icon>
                </u-form-item>
                <u-form-item labelWidth="18%" label="签订日期" borderBottom ref="compRef">
                  <u--input @focus="selectContractStartTimeShow = true" v-model="searchContractForm.startDate" placeholder="点击选择签订日期" border="none"></u--input>
                  <u-icon slot="right" name="close-circle-fill" v-show="searchContractForm.startDate != ''" @click="searchContractForm.startDate = ''"></u-icon>
                </u-form-item>
                <u-form-item labelWidth="18%" label="结束日期" borderBottom ref="compRef">
                  <u--input @focus="selectContractEndTimeShow = true" v-model="searchContractForm.endDate" placeholder="点击选择结束日期" border="none"></u--input>
                  <u-icon slot="right" name="close-circle-fill" v-show="searchContractForm.endDate != ''" @click="searchContractForm.endDate = ''"></u-icon>
                </u-form-item>
              </u--form>
            </view>
            <view class="searchCustomerBtn">
              <u-button text="搜索" type="primary" @click="selectContractOpen()"></u-button>
              <u-button text="清空" @click="selectContractResetFields"></u-button>
            </view> -->
    <!-- 合同列表 -->
    <!-- <view class="tableContract">
      <view class="tableBody">
        <uni-table border emptyText="暂无更多数据">
          <uni-tr>
            <uni-th width="100" align="center">组织结构</uni-th>
            <uni-th width="250" align="center">客户名称</uni-th>
            <uni-th width="180" align="center">煤种名称</uni-th>
            <uni-th width="220" align="center">合同编号</uni-th>
            <uni-th width="90" align="center">合同类型</uni-th>
            <uni-th width="130" align="center">签订日期</uni-th>
            <uni-th width="130" align="center">终止日期</uni-th>
            <uni-th width="100" align="center">合同总量</uni-th>
            <uni-th width="100" align="center">合同金额</uni-th>
            <uni-th width="70" align="center">状态</uni-th>
          </uni-tr>
          <uni-tr v-for="(item, index) in contractData" :key="index">
            <uni-td align="center">
              <view :style="tdStyle">{{ item.compName }}</view>
            </uni-td>
            <uni-td align="left">
              <view :style="tdStyle">{{ item.customerName }}</view>
            </uni-td>
            <uni-td align="center">
              <view :style="tdStyle">{{ item.coalNames }}</view>
            </uni-td>
            <uni-td align="left">
              <view :style="tdStyle">{{ item.num }}</view>
            </uni-td>
            <uni-td align="center">
              <view :style="tdStyle">{{ item.type }}</view>
            </uni-td>
            <uni-td align="center">
              <view :style="tdStyle">{{ item.startDate }}</view>
            </uni-td>
            <uni-td align="center">
              <view :style="tdStyle">{{ item.endDate }}</view>
            </uni-td>
            <uni-td align="center">
              <view :style="tdStyle">{{ item.countExecutive }}</view>
            </uni-td>
            <uni-td align="center">
              <view :style="tdStyle">{{ item.executive }}</view>
            </uni-td>
            <uni-td align="center">
              <view :style="tdStyle">{{ item.status }}</view>
            </uni-td>
          </uni-tr>
        </uni-table>
      </view>
      <view class="TableUtilBtn">
        <uni-table border emptyText="暂无更多数据">
          <uni-tr><uni-th align="center">操作</uni-th></uni-tr>
          <uni-tr v-for="(item, index) in contractData" :key="index">
            <uni-td align="center"> -->
    <!-- 选择合同 -->
    <!-- <view class="TableUtilBtnContainer"><u-button type="primary" @click="selectContractClick(item)" icon="checkbox-mark" size="mini"></u-button></view>
  </uni-td>
</uni-tr>
</uni-table>
</view>
</view> -->
    <!-- 合同类型选择器 -->
    <!-- <view class="selectContractTypePicker">
      <u-picker
        :closeOnClickOverlay="true"
        @close="selectContractTypeClose"
        @cancel="selectContractTypeShow = false"
        @confirm="selectContractTypeConfirm"
        :show="selectContractTypeShow"
        :columns="selectContractTypeData"
      ></u-picker>
    </view> -->
    <!-- 时间选择器 -->
    <!-- <view class="selectContractStartTime">
      <u-calendar
        :show="selectContractStartTimeShow"
        @close="selectContractStartTimeClose"
        :mode="selectContractTimeMode"
        @confirm="selectContractStartTimeConfirm"
      ></u-calendar>
    </view>
    <view class="selectContractEndTime">
      <u-calendar :show="selectContractEndTimeShow" @close="selectContractEndTimeClose" :mode="selectContractTimeMode" @confirm="selectContractEndTimeConfirm"></u-calendar>
    </view>
  </view>
</scroll-view>
</u-popup>
</view>
-->
        <u-calendar :show="timeShow" :mode="mode" @confirm="confirmTime" @close="timeClose" rowHeight="110" :maxDate="maxDate"></u-calendar>
    <!-- 添加合同子项 -->
    <view class="addContractContainer">
      <u-popup :show="addContractShow" @close="addContractClose" @open="addContractOpen" mode="bottom" round="22">
@@ -255,8 +39,7 @@
            <u--form labelPosition="left" :model="addContractFormdata" :rules="addContractRules" ref="form1">
              <view class="formUpCard">
                <u-form-item label="矿厂" labelWidth="20%"  ref="item1">
                  <u--input v-model="addContractFormdata.filedName" disabled disabledColor="#ffffff"
                            border="none"></u--input>
                                    <u--input v-model="addContractFormdata.filedName" disabled disabledColor="#ffffff" border="none"></u--input>
                </u-form-item>
                <u-form-item @click="coalFiledSelectShow = true" label="煤厂" labelWidth="20%" ref="item1">
                  <u--input v-model="addContractFormdata.compName" disabled disabledColor="#ffffff"></u--input>
@@ -275,24 +58,19 @@
                      <view class="currentPriceBox">
                        <u--form :model="currentCoal" labelPosition="left">
                          <u-form-item label="煤种" labelWidth="35%">
                            <u--input v-model="currentCoal.coalName" disabled disabledColor="#ffffff"
                                      border="none"></u--input>
                                                        <u--input v-model="currentCoal.coalName" disabled disabledColor="#ffffff" border="none"></u--input>
                          </u-form-item>
                          <u-form-item :label="currentCoal.type == 1 ? '钢厂长协' : '基准价'" labelWidth="35%">
                            <u--input v-model="currentCoal.steelMillPrice" disabled disabledColor="#ffffff"
                                      border="none"></u--input>
                                                        <u--input v-model="currentCoal.steelMillPrice" disabled disabledColor="#ffffff" border="none"></u--input>
                          </u-form-item>
                          <u-form-item :label="currentCoal.type == 1 ? '焦化长协' : '电厂基准'" labelWidth="35%">
                            <u--input v-model="currentCoal.cokingPrice" disabled disabledColor="#ffffff"
                                      border="none"></u--input>
                                                        <u--input v-model="currentCoal.cokingPrice" disabled disabledColor="#ffffff" border="none"></u--input>
                          </u-form-item>
                          <u-form-item :label="currentCoal.type == 1 ? '非长协' : '区域外电厂价'" labelWidth="35%">
                            <u--input v-model="currentCoal.noImportantPrice" disabled disabledColor="#ffffff"
                                      border="none"></u--input>
                                                        <u--input v-model="currentCoal.noImportantPrice" disabled disabledColor="#ffffff" border="none"></u--input>
                          </u-form-item>
                          <u-form-item label="挂牌价" labelWidth="35%">
                            <u--input v-model="currentCoal.quotePrice" disabled disabledColor="#ffffff"
                                      border="none"></u--input>
                                                        <u--input v-model="currentCoal.quotePrice" disabled disabledColor="#ffffff" border="none"></u--input>
                          </u-form-item>
                        </u--form>
                      </view>
@@ -302,42 +80,32 @@
                      <view class="selectPricebox">
                        <u--form labelPosition="left">
                          <u-form-item label="煤种" labelWidth="35%">
                            <u--input v-model="currentCoal.coalName" disabled disabledColor="#ffffff"
                                      border="none"></u--input>
                                                        <u--input v-model="currentCoal.coalName" disabled disabledColor="#ffffff" border="none"></u--input>
                          </u-form-item>
                          <u-radio-group v-model="addContractFormdata.priceMode" placement="column"
                                         @change="groupChange">
                                                    <u-radio-group v-model="addContractFormdata.priceMode" placement="column" @change="groupChange">
                            <view class="selectPriceboxItem">
                              <u-form-item :label="currentCoal.type == 1 ? '钢厂长协' : '基准价'" labelWidth="35%">
                                <u--input v-model="afterPrice.steelMillPrice" disabled disabledColor="#ffffff"
                                          border="none"></u--input>
                                                                <u--input v-model="afterPrice.steelMillPrice" disabled disabledColor="#ffffff" border="none"></u--input>
                              </u-form-item>
                              <u-radio shape="square" size="30" :customStyle="{ marginBottom: '8px' }" name="0"
                                       @change="changePriceMode"></u-radio>
                                                            <u-radio shape="square" size="30" :customStyle="{ marginBottom: '8px' }" name="0" @change="changePriceMode"></u-radio>
                            </view>
                            <view class="selectPriceboxItem">
                              <u-form-item :label="currentCoal.type == 1 ? '焦化长协' : '电厂基准'" labelWidth="35%">
                                <u--input v-model="afterPrice.cokingPrice" disabled disabledColor="#ffffff"
                                          border="none"></u--input>
                                                                <u--input v-model="afterPrice.cokingPrice" disabled disabledColor="#ffffff" border="none"></u--input>
                              </u-form-item>
                              <u-radio shape="square" size="30" :customStyle="{ marginBottom: '8px' }" name="1"
                                       @change="changePriceMode"></u-radio>
                                                            <u-radio shape="square" size="30" :customStyle="{ marginBottom: '8px' }" name="1" @change="changePriceMode"></u-radio>
                            </view>
                            <view class="selectPriceboxItem">
                              <u-form-item :label="currentCoal.type == 1 ? '非长协' : '区域外电厂价'" labelWidth="35%">
                                <u--input v-model="afterPrice.noImportantPrice" disabled disabledColor="#ffffff"
                                          border="none"></u--input>
                                                                <u--input v-model="afterPrice.noImportantPrice" disabled disabledColor="#ffffff" border="none"></u--input>
                              </u-form-item>
                              <u-radio shape="square" size="30" :customStyle="{ marginBottom: '8px' }" name="2"
                                       @change="changePriceMode"></u-radio>
                                                            <u-radio shape="square" size="30" :customStyle="{ marginBottom: '8px' }" name="2" @change="changePriceMode"></u-radio>
                            </view>
                            <view class="selectPriceboxItem">
                              <u-form-item label="挂牌价" labelWidth="35%">
                                <u--input v-model="afterPrice.quotePrice" disabled disabledColor="#ffffff"
                                          border="none"></u--input>
                                                                <u--input v-model="afterPrice.quotePrice" disabled disabledColor="#ffffff" border="none"></u--input>
                              </u-form-item>
                              <u-radio shape="square" size="30" :customStyle="{ marginBottom: '8px' }" name="3"
                                       @change="changePriceMode"></u-radio>
                                                            <u-radio shape="square" size="30" :customStyle="{ marginBottom: '8px' }" name="3" @change="changePriceMode"></u-radio>
                            </view>
                          </u-radio-group>
                        </u--form>
@@ -346,11 +114,7 @@
                    <view class="selectFavouredPolicy">
                      <u-divider text="选择优惠政策"></u-divider>
                      <view class="selectFavouredPolicyBox">
                        <u-checkbox-group
                            v-model="selectOKfavouredpolicyValue"
                            placement="column"
                            @change="checkboxChangeFavouredpolicy"
                        >
                                                <u-checkbox-group v-model="selectOKfavouredpolicyValue" placement="column" @change="checkboxChangeFavouredpolicy">
                          <uni-table ref="priceTableRef" :loading="loading" border stripe emptyText="暂无更多数据">
                            <uni-tr>
                              <uni-th width="10" align="center">选项</uni-th>
@@ -361,21 +125,13 @@
                            </uni-tr>
                            <uni-tr v-for="(item, index) in favouredpolicyList" :key="index">
                              <uni-td align="center">
                                <view class="">
                                  <u-checkbox
                                      :customStyle="{marginBottom: '8px'}"
                                      :key="index"
                                      :name="item.id" size="30"
                                  >
                                  </u-checkbox>
                                </view>
                                                                <view class=""><u-checkbox :customStyle="{ marginBottom: '8px' }" :key="index" :name="item.id" size="30"></u-checkbox></view>
                              </uni-td>
                              <uni-td>{{ item.type }}</uni-td>
                              <uni-td align="center">{{ operator[item.method].label }}</uni-td>
                              <uni-td align="center">{{ item.val }}</uni-td>
                              <uni-td align="center">{{ item.price }}</uni-td>
                            </uni-tr>
                          </uni-table>
                        </u-checkbox-group>
                      </view>
@@ -388,34 +144,23 @@
              </view>
              <view class="formDownCard">
                <u-form-item label="单价" labelWidth="20%" ref="item1">
                  <u--input v-model="addContractFormdata.price" disabled disabledColor="#ffffff"
                            border="none"></u--input>
                                    <u--input v-model="addContractFormdata.price" disabled disabledColor="#ffffff" border="none"></u--input>
                </u-form-item>
                <u-form-item label="订单金额" labelWidth="20%" ref="item1">
                  <u--input :disabled="addContractFormdata.trainType == 2" v-show="currentRowComputed"
                            v-model="addContractFormdata.amount"></u--input>
                                    <u--input :disabled="addContractFormdata.trainType == 2" v-show="currentRowComputed" v-model="addContractFormdata.amount"></u--input>
                </u-form-item>
                <u-form-item label="订单数量" labelWidth="20%" ref="item1">
                  <u--input :disabled="addContractFormdata.trainType == 1" @input="jisuanAmount"
                            v-model="addContractFormdata.quant"></u--input>
                                    <u--input :disabled="addContractFormdata.trainType == 1" @input="jisuanAmount" v-model="addContractFormdata.quant"></u--input>
                </u-form-item>
              </view>
              <!-- <u-form-item label="发站" labelWidth="18%" borderBottom ref="item1"><u--input v-model="addContractFormdata.fromStation" border="none"></u--input></u-form-item>
              <u-form-item label="到站" labelWidth="18%" borderBottom ref="item1"><u--input v-model="addContractFormdata.toStation" border="none"></u--input></u-form-item>
              <u-form-item label="运费" labelWidth="18%" borderBottom ref="item1"><u--input v-model="addContractFormdata.cost1" border="none"></u--input></u-form-item>
              <u-form-item label="抑尘费" labelWidth="18%" borderBottom ref="item1"><u--input v-model="addContractFormdata.cost2" border="none"></u--input></u-form-item> -->
            </u--form>
            <view class="addContractConfirm">
              <u-button text="添加" type="primary" @click="addContractSanConfirm"></u-button>
            </view>
                        <view class="addContractConfirm"><u-button text="添加" type="primary" @click="addContractSanConfirm"></u-button></view>
          </view>
          <!-- 选择煤厂 -->
          <view class="coalFiledSelectPopup">
            <u-popup :show="coalFiledSelectShow" @close="coalFiledSelectClose" @open="coalFiledSelectOpen" mode="bottom"
                     round="22">
                        <u-popup :show="coalFiledSelectShow" @close="coalFiledSelectClose" @open="coalFiledSelectOpen" mode="bottom" round="22">
              <scroll-view scroll-y="true" style="height:100%;">
                <combination-title class="selectCustomerTitle" title="选择煤厂"></combination-title>
                <view class="coalFiledSelectSearch"></view>
@@ -447,16 +192,11 @@
                  <view class="TableUtilBtn">
                    <uni-table border emptyText="暂无更多数据">
                      <uni-tr>
                        <uni-th align="center">操作</uni-th>
                      </uni-tr>
                                            <uni-tr><uni-th align="center">操作</uni-th></uni-tr>
                      <uni-tr v-for="(item, index) in coalfiledData" :key="index">
                        <uni-td align="center">
                          <!-- 选择合同 -->
                          <view class="TableUtilBtnContainer">
                            <u-button type="primary" @click="coalFiledSelectClick(item)" icon="checkbox-mark"
                                      size="mini"></u-button>
                          </view>
                                                    <view class="TableUtilBtnContainer"><u-button type="primary" @click="coalFiledSelectClick(item)" icon="checkbox-mark" size="mini"></u-button></view>
                        </uni-td>
                      </uni-tr>
                    </uni-table>
@@ -468,30 +208,23 @@
          <!-- 选择收货人 -->
          <view class="selectCustomerPopup">
            <u-popup :show="addContractConsigneeShow" @close="addContractConsigneeClose"
                     @open="addContractConsigneeOpen" mode="bottom" round="22">
                        <u-popup :show="addContractConsigneeShow" @close="addContractConsigneeClose" @open="addContractConsigneeOpen" mode="bottom" round="22">
              <scroll-view scroll-y="true" style="height:100%;">
                <combination-title class="selectCustomerTitle" title="选择收货人"></combination-title>
                <view class="selectCustomerContainer">
                  <view class="searchContainer">
                    <u--form labelPosition="left" :model="searchCustomerForm" ref="selectformRef">
                      <u-form-item labelWidth="12%" label="单位" borderBottom ref="compRef">
                        <u--input @focus="selectCustomerCompShow = true" v-model="searchCustomerForm.compName"
                                  placeholder="点击选择单位" border="none"></u--input>
                        <u-icon slot="right" name="close-circle-fill" v-show="searchCustomerForm.compName != ''"
                                @click="searchCustomerForm.compName = ''"></u-icon>
                                                <u--input @focus="selectCustomerCompShow = true" v-model="searchCustomerForm.compName" placeholder="点击选择单位" border="none"></u--input>
                                                <u-icon slot="right" name="close-circle-fill" v-show="searchCustomerForm.compName != ''" @click="searchCustomerForm.compName = ''"></u-icon>
                      </u-form-item>
                      <u-form-item labelWidth="20%" label="客户名称" borderBottom ref="timeDataRef">
                        <u--input v-model="selectCustomerData.customerFullName" border="none"
                                  placeholder="输入客户名称"></u--input>
                        <u-icon slot="right" name="close-circle-fill" v-show="selectCustomerData.customerFullName != ''"
                                @click="selectCustomerData.customerFullName = ''"></u-icon>
                                                <u--input v-model="selectCustomerData.customerFullName" border="none" placeholder="输入客户名称"></u--input>
                                                <u-icon slot="right" name="close-circle-fill" v-show="selectCustomerData.customerFullName != ''" @click="selectCustomerData.customerFullName = ''"></u-icon>
                      </u-form-item>
                      <u-form-item labelWidth="20%" label="客户级别" borderBottom>
                        <u--input @focus="selectLevelShow = true" border="none" v-model="searchCustomerForm.levelText"
                                  placeholder="点击选择级别"></u--input>
                        <u-icon slot="right" name="close-circle-fill" v-show="searchCustomerForm.levelText != ''"
                                @click="searchCustomerForm.levelText = ''"></u-icon>
                                                <u--input @focus="selectLevelShow = true" border="none" v-model="searchCustomerForm.levelText" placeholder="点击选择级别"></u--input>
                                                <u-icon slot="right" name="close-circle-fill" v-show="searchCustomerForm.levelText != ''" @click="searchCustomerForm.levelText = ''"></u-icon>
                      </u-form-item>
                    </u--form>
                  </view>
@@ -525,8 +258,7 @@
                    </u-cell-group>
                  </view>
                  <view class="loadmoreClass">
                    <u-loadmore loadmoreText="点击加载更多" nomoreText="无更多数据!!!" :status="status" @loadmore="loadingCustomer"
                                fontSize="20" height="30px"/>
                                        <u-loadmore loadmoreText="点击加载更多" nomoreText="无更多数据!!!" :status="status" @loadmore="loadingCustomer" fontSize="20" height="30px" />
                  </view>
                  <!-- 选择用户菜单项 -->
                  <view class="selectCustomerCompSheet">
@@ -540,8 +272,7 @@
                  </view>
                  <!-- 级别菜单项 -->
                  <view class="selectLevelSheet">
                    <u-action-sheet :show="selectLevelShow" :actions="levelList" title="请选择级别"
                                    @close="selectLevelShow = false" @select="selectLevelSelect"></u-action-sheet>
                                        <u-action-sheet :show="selectLevelShow" :actions="levelList" title="请选择级别" @close="selectLevelShow = false" @select="selectLevelSelect"></u-action-sheet>
                  </view>
                </view>
              </scroll-view>
@@ -580,41 +311,17 @@
    <!-- 申请表格 -->
    <view class="newApplicationTable">
      <!-- <uni-table border stripe emptyText="暂无更多数据">
        <uni-tr v-for="(item, index) in 12" :key="index">
          <uni-th align="center">字段标题</uni-th>
          <uni-td>
            <view class="text">输入/选择内容</view>
            <view class="icon"><image src="@/static/icon/select.png" mode=""></image></view>
          </uni-td>
        </uni-tr>
        <uni-tr>
          <uni-th align="center">操作</uni-th>
          <uni-td>
            <view class="newApplicationTableUtil">
              <u-button type="primary" text="修改" size="mini"></u-button>
              <u-button type="error" text="删除" size="mini"></u-button>
            </view>
          </uni-td>
        </uni-tr>
      </uni-table> -->
      <view class="balanceNo" v-if="accountDetails.balanceTotal < 0">
        <text style="color:red;">客户账户当前处于欠款状态</text>
      </view>
            <view class="balanceNo" v-if="accountDetails.balanceTotal < 0"><text style="color:red;">客户账户当前处于欠款状态</text></view>
      <view class="messageCustomerBalance" v-if="accountDetails.balanceTotal >= 0">
        <text style="color: #FFA500;;">客户账户现汇余额:{{
            accountDetails.balance == null ? 0 : accountDetails.balance
          }},承兑余额:{{ accountDetails.balance2 == null ? 0 : accountDetails.balance2 }}
                <text style="color: #FFA500;;">
                    客户账户现汇余额:{{ accountDetails.balance == null ? 0 : accountDetails.balance }},承兑余额:{{ accountDetails.balance2 == null ? 0 : accountDetails.balance2 }}
        </text>
      </view>
      <u-swipe-action>
        <u-swipe-action-item @click="deleteContractCardClick" :options="options1"
                             v-for="(item, index) in newFormData.contractOrders" :key="index">
                <u-swipe-action-item @click="deleteContractCardClick" :options="options1" v-for="(item, index) in newFormData.contractOrders" :key="index">
          <view class="cardList">
            <view class="" class="cardListIcon" @click="editApplicationClick(index)">
              <u-icon name="edit-pen" color="#2979ff" size="35"></u-icon>
            </view>
                        <view class="" class="cardListIcon" @click="editApplicationClick(index)"><u-icon name="edit-pen" color="#2979ff" size="35"></u-icon></view>
            <view class="cardList-container">
              <view class="cardList_item">
                收货人:
@@ -650,9 +357,6 @@
                  订单金额:
                  <text>{{ item.amount }}</text>
                </view>
                <!-- <view class="">
                      订单数量:<text>218.899</text>
                    </view> -->
              </view>
            </view>
          </view>
@@ -660,9 +364,7 @@
      </u-swipe-action>
      <view class="addCard" @click="addContractClick">
        <view class="addCard-icon">
          <u-icon name="plus" size="100"></u-icon>
        </view>
                <view class="addCard-icon"><u-icon name="plus" size="100"></u-icon></view>
      </view>
    </view>
@@ -692,68 +394,17 @@
      applicationOrderIndex: null,
      tdStyle: 'max-height: 30px;overflow: scroll;',
      spanStyle: 'overflow:auto',
      newFormData: {
        // amount: null,
        // coalId: '',
        // coalName: '',
        // contractId: 169,
        // contractName: '',
        // contractNum: '',
        // contractOrders: [],
        // customerAddressId: '',
        // customerId: 236,
        // customerName: '',
        // endDate: '',
        // executiveQuant: null,
        // id: null,
        // number: '',
        // payType: '',
        // price: null,
        // quant: null,
        // remark: '',
        // startDate: '',
        // type: '外销'
      },
            newFormData: {},
      accountDetails: {},
      // 时间
      timeDataStr: '',
      menuShow: false,
      // 表单
      // selectCustomerShow: false, // 选择用户弹框
      showPayType: false, // 付款方式弹框
      payData: [],
      actions: [],
      selectValue: '',
      rules: {
        // customerName: [
        //   {
        //     required: true,
        //     message: '请选择结算客户',
        //     trigger: ['blur', 'change']
        //   }
        // ],
        // contractNum: [
        //   {
        //     required: true,
        //     message: '请选择合同编号',
        //     trigger: ['blur', 'change']
        //   }
        // ],
        // payType: [
        //   {
        //     required: true,
        //     message: '请选择付款方式',
        //     trigger: ['blur', 'change']
        //   }
        // ],
        // startDate: [
        //   {
        //     required: true,
        //     message: '请选择时间',
        //     trigger: ['blur', 'change']
        //   }
        // ]
      },
            rules: {},
      // 时间
      timeShow: false,
      mode: 'range',
@@ -782,30 +433,16 @@
      selectCustomerActions: [],
      // 级别
      selectLevelShow: false,
      levelList: [{name: '一星级', value: 'A'}, {name: '二星级', value: 'B'}, {name: '三星级', value: 'C'}, {
            levelList: [
                { name: '一星级', value: 'A' },
                { name: '二星级', value: 'B' },
                { name: '三星级', value: 'C' },
                {
        name: '四星级',
        value: 'D'
      }, {name: '五星级', value: 'E'}],
      // 选择合同
      // selectContractShow: false,
      // searchContractForm: {
      //     current: 1,
      //     size: 10,
      //     num: '',
      //     startDate: '',
      //     endDate: '',
      //     result: 2,
      //     type: '',
      //     customerName: ''
      // },
      // contractData: [],
      // 类型
      // selectContractTypeShow: false,
      // selectContractTypeData: [[]],
      // 时间
      // selectContractTimeMode: 'single',
      // selectContractStartTimeShow: false,
      // selectContractEndTimeShow: false,
                },
                { name: '五星级', value: 'E' }
            ],
      // 添加合同
      addContractShow: false,
      // 添加合同表单
@@ -817,35 +454,8 @@
        //     trigger: ['blur', 'change']
        //   }
        // ],
      },
      addContractFormdata: {
        // id:null,
        // amount: null,
        // coalId: null,
        // coalName: '',
        // compId: null,
        // compName: '',
        // cost1: '',
        // cost2: '',
        // customerId: null,
        // customerName: '',
        // edit: true,
        // favouredpolicyIds: '',
        // filedId: null,
        // filedName: '',
        // fromStation: '',
        // modifyId: null,
        // modifyInfoId: null,
        // customerAddressId: null,
        // price: null,
        // priceMode: '',
        // quant: '',
        // toStation: '',
        // trainType: 1,
        // type: ''
      },
            addContractFormdata: {},
      contractDetails: [], // 选择的合同详情
      // 选择煤厂
      coalFiledSelectShow: false,
@@ -869,27 +479,7 @@
      // 品种价格表格
      loading: false,
      // 价格请求参数
      getNewPriceData: {
        // compId: 133,
        // compName: '邢台矿',
        // customerAddressName: '邢台国泰发电有限责任公司',
        // customerAddressId: 236,
        // coalId: 45,
        // coalName: '',
        // trainType: 1,
        // fromStation: '小康庄',
        // toStation: '小康庄',
        // quant: '',
        // price: '',
        // amount: '',
        // priceMode: null,
        // filedName: '邢台矿主煤场',
        // filedId: 4,
        // type: '',
        // cost1: '',
        // cost2: '',
        // edit: true
      },
            getNewPriceData: {},
      dust: null, // 抑尘费
      trainfreight: {}, //路运运费
      // 运输类型
@@ -982,7 +572,6 @@
      return true;
    },
    async currentRowComputed() {
      //变价格用的
      this.changePriceMode(this.addContractFormdata.priceMode);
@@ -990,7 +579,6 @@
      if (this.addContractFormdata.id != null) {
                console.log('进入计算之前',this.addContractFormdata);
        if (this.addContractFormdata.price > 0 && (this.addContractFormdata.amount > 0 || this.addContractFormdata.quant > 0)) {
                    // console.log('进入类型前计算');
          let price = this.addContractFormdata.price;
          if (this.addContractFormdata.trainType == 1) {
            let q = this.addContractFormdata.amount / price;
@@ -1005,7 +593,6 @@
                            price += this.dust;
                            this.addContractFormdata.cost1 = (this.addContractFormdata.quant * cost1Price).toFixed(2); //运费
                            this.addContractFormdata.cost2 = (this.addContractFormdata.quant * this.dust).toFixed(2); //抑尘费
                            let amount = Number(price * this.addContractFormdata.quant) + Number(this.addContractFormdata.cost1) + Number(this.addContractFormdata.cost2);
                            this.addContractFormdata.amount = amount.toFixed(2);
          }
@@ -1015,31 +602,6 @@
      }
      return true;
    }
    // accountMsg() {
    //     this.accountMsgType = 'error';
    //     if (this.accountDetails) {
    //         if (this.accountDetails.balanceType == '贷') {
    //             return '客户账户余额当前处于欠款状态!';
    //         } else {
    //             let amount = 0;
    //             this.newFormData.contractOrders.forEach(e => {
    //                 amount += Number(e.amount);
    //             });
    //             if (this.newFormData.payType == '0') {
    //                 if (this.accountDetails.balance < amount) {
    //                     return '客户账户现汇余额不足,现汇余额:' + this.accountDetails.balance;
    //                 }
    //             } else {
    //                 if (this.accountDetails.balance2 < amount) {
    //                     return '客户账户承兑余额不足,承兑余额:' + this.accountDetails.balance2;
    //                 }
    //             }
    //         }
    //         this.accountMsgType = 'warning';
    //         return '客户账户现汇余额:' + this.accountDetails.balance + ',承兑余额:' + (this.accountDetails.balance2 ? this.accountDetails.balance2 : 0);
    //     }
    //     return null;
    // }
  },
  watch: {
    // 立即处理 进入页面就触发 // immediate: true,
@@ -1054,9 +616,7 @@
      if (newV == '') {
        this.selectCustomerData.level = '';
      }
    },
    // 'selectOKfavouredpolicyValue'(newV,oleV){
    // }
        }
  },
  components: {
    popupMenu,
@@ -1091,14 +651,14 @@
    async editApplicationFormData() {
      uni.showLoading({
        title:'加载中...'
      })
            });
      // 通过申请id获取表单
      await this.$reqGet('formData', {}, this.editApplicationTableId).then(res => {
        uni.hideLoading();
        console.log('整体详情', res.data);
        this.newFormData = res.data;
        this.timeDataStr = this.newFormData.startDate;
      })
            });
      // 获取合同详情,煤种
      await this.getContractDetails();
@@ -1122,9 +682,7 @@
        });
      }
      // 获取价格
      // this.getNewPriceData = this.addContractFormdata;
      this.getNewPriceData.compName = this.newFormData.contractOrders[this.applicationOrderIndex].compName;
      this.getNewPriceData.traninType = this.newFormData.contractOrders[this.applicationOrderIndex].traninType;
      this.getNewPriceData.compId = this.newFormData.contractOrders[this.applicationOrderIndex].compId;
@@ -1141,19 +699,16 @@
      this.getNewPrice();
      // 初始化第一次优惠价格计算
      // this.$nextTick(()=>{
      if (this.selectOKfavouredpolicyValue.length == 0) {
        this.multipleSelection = [];
      } else {
        this.multipleSelection = [];
        this.favouredpolicyList.forEach((item) => {
                this.favouredpolicyList.forEach(item => {
          if (this.selectOKfavouredpolicyValue.indexOf(item.id) != -1) {
            this.multipleSelection.push(item);
          }
        })
                });
      }
      // })
      // 订单运输类型
      switch (this.addContractFormdata.trainType) {
        case 1:
@@ -1164,22 +719,20 @@
          break;
      }
      this.$nextTick(() => {
        this.addContractShow = true;
      })
            });
    },
    getContractDetails() {
      uni.showLoading({
        title: '加载中...'
      })
            });
      this.$reqGet('getByContractId', {}, this.newFormData.contractId).then(res => {
        uni.hideLoading();
        if (res.code == 0) {
          this.contractDetails = res.data;
        }
      })
            });
      this.$nextTick(() => {
        this.contractDetails.forEach(item => {
          let a = [{label: '', id: ''}];
@@ -1190,10 +743,9 @@
          }
          this.addContractCoalData.push(a);
        });
      })
            });
    },
    checkboxChangeFavouredpolicy(e) {
      // this.selectOKfavouredpolicyValue = e;
      if (e.length == 0) {
        this.multipleSelection = [];
      } else {
@@ -1202,9 +754,8 @@
          if (e.indexOf(item.id) != -1) {
            this.multipleSelection.push(item);
          }
        })
                });
      }
    },
    // 选择客户
    selectCustomer() {
@@ -1223,14 +774,6 @@
        }
      });
    },
    // 客户选择弹框打开了
    // selectCustomerOpen() {
    //     // this.spanStyle = 'overflow:hidden'; //当蒙层弹起时,固定界面禁止滚动,当蒙层关闭时,允许滚动
    // },
    // selectCustomerClose() {
    //     // this.spanStyle = 'overflow:auto'; // 让html的body可滑动
    //     // this.selectCustomerShow = false;
    // },
    // 获取单位树
    fetchCompTree() {
      this.selectCustomerActions = [];
@@ -1266,8 +809,6 @@
      uni.hideKeyboard();
      this.selectValue = v.name;
      this.newFormData.payType = v.value;
      // this.newFormData.payType = e.name;
      // this.$refs.form1.validateField('userInfo.sex');
    },
    // 清空选择客户表单
    selectCustomerResetFields() {
@@ -1285,9 +826,6 @@
        this.searchContractForm.customerName = res.data.customerName;
      });
      this.$nextTick(() => {
        // this.selectCustomerShow = false;
      });
    },
    loadingCustomer() {
      if (this.selectCustomerData.current >= this.customerDataAllNum / 10) return;
@@ -1296,7 +834,7 @@
      this.$reqGet('customer', this.selectCustomerData).then(res => {
        if (this.selectCustomerData.current >= this.customerDataAllNum / 10) {
          this.status = 'nomore';
          this.$u.toast('没有更多数据了!')
                    this.$u.toast('没有更多数据了!');
        }
        uni.hideLoading();
        if (res.code == 0) {
@@ -1315,133 +853,8 @@
        this.timeDataStr = v[0] + ' 至 ' + v[v.length - 1];
      });
    },
    // 选择合同
    // selectContract() {
    //     if (this.newFormData.customerName != '') {
    //         if (this.newFormData.contractOrders != []) {
    //             uni.showToast({
    //                 title: '添加订单后,不能修改合同!',
    //                 icon: 'error',
    //                 duration: 2000
    //             });
    //         }
    //         this.selectContractShow = true;
    //     } else {
    //         this.$refs.formRef
    //             .validate()
    //             .then(res => {
    //                 uni.$u.toast('校验成功');
    //             })
    //             .catch(err => {
    //                 uni.$u.toast('请选择结算客户');
    //             });
    //     }
    // },
    // 选择合同类型输入框获取焦点触发
    // searchContractFormTypeFocus() {
    //     // 类型弹出框
    //     this.selectContractTypeShow = true;
    //     // 弹出框类型请求
    //     this.$nextTick(() => {
    //         this.$reqGet('contract_type').then(res => {
    //             res.data.forEach(item => {
    //                 this.selectContractTypeData[0].push(item.value);
    //             });
    //         });
    //     });
    // },
    // 选择合同弹框
    // selectContractOpen() {
    //     uni.showLoading({
    //         title: '加载中...'
    //     });
    //     this.$reqGet('contract_status').then(res => {
    //         // console.log('状态', res);
    //     });
    //     this.$reqGet('contract', this.searchContractForm).then(res => {
    //         uni.hideLoading();
    //         if (res.code == 0) {
    //             // console.log('合同', res);
    //             this.contractData = res.data.records;
    //         }
    //     });
    // },
    // selectContractClose() {
    //     this.selectContractShow = false;
    // },
    // 合同类型选择器
    // selectContractTypeConfirm(v) {
    //     this.searchContractForm.type = v.value[0];
    //     this.selectContractTypeShow = false;
    //     console.log('选择器确定后的值', v, this.searchContractForm.type);
    // },
    // selectContractTypeClose(v) {
    //     // 初始化合同类型选择器
    //     this.selectContractTypeData[0] = [];
    //     this.selectContractTypeShow = false;
    //     if (v) {
    //         this.searchContractForm.type = v.value[0];
    //     }
    // },
    // 合同时间选择器
    // selectContractStartTimeConfirm(e) {
    //     this.selectContractStartTimeShow = false;
    //     this.searchContractForm.startDate = e[0];
    // },
    // selectContractStartTimeClose() {
    //     this.selectContractStartTimeShow = false;
    // },
    // selectContractEndTimeConfirm(e) {
    //     this.selectContractEndTimeShow = false;
    //     this.searchContractForm.endDate = e[0];
    // },
    // selectContractEndTimeClose() {
    //     this.selectContractEndTimeShow = false;
    // },
    // 重置表单所有字段
    // selectContractResetFields() {
    //     this.searchContractForm.num = '';
    //     this.searchContractForm.startDate = '';
    //     this.searchContractForm.endDate = '';
    //     this.searchContractForm.customerName = '';
    //     this.searchContractForm.type = '';
    // },
    // selectContractClick(e) {
    //     console.log('选择合同', e);
    //     this.newFormData.contractName = e.contractName;
    //     this.newFormData.contractNum = e.num;
    //     this.newFormData.contractId = e.id;
    //     this.selectContractShow = false;
    //     // 价格参数赋值
    //     this.getNewPriceData.type = e.type;
    //     // 选定合同详情
    //     uni
    //         .request({
    //             url: `/yunxiao/contractitem/getByContractId/${e.id}`,
    //             method: 'GET',
    //             header: {
    //                 'TENANT-ID': 5,
    //                 Authorization: 'Bearer ' + uni.getStorageSync('access_token'),
    //                 VERSION: 'zzl'
    //             }
    //         })
    //         .then(res => {
    //             this.contractDetails = res[1].data.data;
    //             console.log('合同详情', res, this.contractDetails);
    //         })
    //         .catch(err => {
    //             console.log(err);
    //         });
    // },
    // 添加订单按钮
    addContractClick() {
      // 打印true或false
      // this.$refs.formRef
      //     .validate()
      //     .then(res => {
            if (this.accountDetails.balanceType == '贷') {
              uni.showToast({
                title: '客户账户余额当前处于欠款状态!',
@@ -1482,16 +895,6 @@
                  trainType: 1,
                  type: ''
                };
                // this.getNewPriceData.type = this.newFormData.type;
                // this.getNewPriceData.customerAddressName = this.addContractFormdata.customerFullName;
                // this.getNewPriceData.customerAddressId = this.addContractFormdata.id;
                // this.getNewPriceData.toStation = this.addContractFormdata.toStation;
                // this.getNewPriceData.coalId = this.addContractFormdata.coalId;
                // this.getNewPriceData.coalName =this.addContractFormdata.coalName;
                // 获取合同煤种价格
                // this.getNewPrice();
                // 运输类型初始化
                switch (this.addContractFormdata.trainType) {
                  case 1:
@@ -1508,10 +911,6 @@
                this.multipleSelection = [];
              }
            }
          // })
          // .catch(err => {
          //   uni.$u.toast('效验失败');
          // });
    },
    // 添加合同弹出框
    addContractClose() {
@@ -1523,9 +922,7 @@
      console.log('添加订单打开');
    },
    // 选择煤厂
    coalFiledSelectOpen(e) {
      // console.log('coalfiledSelect: ', e);
    },
        coalFiledSelectOpen(e) {},
    coalFiledSelectClose() {
      this.coalFiledSelectShow = false;
    },
@@ -1547,7 +944,7 @@
    },
    // 添加合同子项收货人打开
    addContractConsigneeOpen() {
      this.selectCustomer()
            this.selectCustomer();
    },
    addContractConsignee() {
      this.addContractConsigneeShow = true;
@@ -1586,7 +983,6 @@
        }
        this.addContractCoalData.push(a);
      });
    },
    // 品种选择器
    addContractCoalConfirm(e) {
@@ -1780,19 +1176,9 @@
    menushow(e) {
      this.menuShow = e;
    },
    // 选择客户
    // moveHandleCustomer() {
    //     return true;
    // },
    // moveHandleContract(){
    //     return true;
    // },
    // 新建发运申请
    newApplicationFormDataClick() {
      console.log('提交申请按钮');
      // this.$refs.formRef
      //     .validate()
      //     .then(res => {
            let amount = 0;
            this.newFormData.contractOrders.forEach(e => {
              amount += Number(e.amount);
@@ -1803,7 +1189,7 @@
                return false;
              } else if (this.accountDetails.balance < amount) {
                let msg = this.accountDetails.balance == null ? 0 : this.accountDetails.balance;
                                this.$u.toast('客户账户承兑余额不足,承兑余额:' + msg)
                    this.$u.toast('客户账户承兑余额不足,承兑余额:' + msg);
              } else {
                uni.showLoading({
                  title:'加载中...'
@@ -1817,44 +1203,40 @@
                return false;
              } else if (this.accountDetails.balance2 < amount) {
                let msg = this.accountDetails.balance2 == null ? 0 : this.accountDetails.balance2;
                                this.$u.toast('客户账户承兑余额不足,承兑余额:' + msg)
                    this.$u.toast('客户账户承兑余额不足,承兑余额:' + msg);
              } else {
                uni.showLoading({
                  title:'加载中...'
                });
                this.editShenQing();
                // this.xswaybill();
              }
            }
          // })
          // .catch(err => {
          //   uni.$u.toast('校验失败');
          // });
    },
    // 修改申请信息
    editShenQing() {
      uni.request({
            uni
                .request({
        url: this.baseUrl + '/yunxiao/xswaybill',
        method: "PUT",
                    method: 'PUT',
        data: this.newFormData,
        header: {
          'TENANT-ID': 5,
          Authorization: 'Bearer ' + uni.getStorageSync('access_token'),
          VERSION: 'zzl'
        }
      }).then(res => {
                })
                .then(res => {
        uni.hideLoading();
        this.$u.toast('修改成功');
        this.$nextTick(() => {
          uni.navigateBack({
            delta: 1
          });
        })
      })
                    });
                });
    },
    // 删除订单卡片
    deleteContractCardClick(e) {
      // console.log('删除订单卡片', e);
      this.newFormData.contractOrders.splice(e, 1);
    },
    xswaybill() {
@@ -1871,12 +1253,6 @@
            icon: 'success',
            duration: 2000
          });
          // this.$nextTick(() => {
          //     uni.navigateBack({
          //         // url: '/pages/my-application/my-application'
          //         delta: 2
          //     });
          // });
        }
      });
    },
@@ -1940,14 +1316,6 @@
          .selectCustomerContainer {
            padding: 0 4%;
            // .loadmoreClass{
            //     .u-loadmore{
            //         .u-loadmore__content{
            //             .u-loadmore__content__text{
            //             }
            //         }
            //     }
            // }
            .searchContainer {
            }
@@ -2165,24 +1533,6 @@
          .addContractForm {
            width: 92%;
            margin: 0 auto;
            // 表单
            // .u-form{
            //     .u-form-item{
            //         .u-form-item__body{
            //             .u-form-item__body__right{
            //                 .u-form-item__body__right__content__slot{
            //                     .u-input{
            //                         border:1px solid #dddddd;
            //                         .u-input__content{
            //                         }
            //                     }
            //                 }
            //             }
            //         }
            //     }
            // }
            .formUpCard {
              margin-top: vww(10);
pages/home/home.vue
@@ -4,7 +4,15 @@
        <view class="home_swipe"><u-swiper :list="list3" indicator indicatorMode="line" circular></u-swiper></view>
        <!-- 图表 -->
        <combined-title title="煤仓库存明细"></combined-title>
        <view class="charts-box"><qiun-data-charts type="pie" :opts="opts" :chartData="chartData" /></view>
        <view class="charts-box">
            <qiun-data-charts type="pie" :opts="opts" :chartData="chartData" v-if="uchartsData.length > 0" />
            <u-empty
                    mode="data"
                    icon="http://cdn.uviewui.com/uview/empty/data.png"
                            v-if="uchartsData.length == 0"
            >
            </u-empty>
        </view>
        <!-- 我的申请 -->
        <combined-title title="我的申请" detailsPath="/pages/my-application/my-application" v-if="shenqingMenu"></combined-title>
        <view class="card-group">
@@ -303,6 +311,7 @@
<script>
import { timeConsuming } from '@/utils/nowDate.js';
import { BaseUrl } from '@/utils/request.js';
// import popupMenu from '@/components/common/popup-menu/popup-menu.vue';
import combinedTitle from '@/components/common/combined-title/combined-title.vue';
import combinationCard from '@/components/common/combination-card/combination-card.vue';
@@ -344,7 +353,7 @@
            statusColor: ['#dd8b8c', '#FF9900', '#007AFF', '#06BE00'],
            result: ['未提交', '处理中', '通过', '驳回'],
            resultColor: ['#dd8b8c', '#FF9900', '#06BE00', '#be2b2d'],
            list3: ['https://cdn.uviewui.com/uview/swiper/swiper3.png', 'https://cdn.uviewui.com/uview/swiper/swiper2.png', 'https://cdn.uviewui.com/uview/swiper/swiper1.png'],
            list3: ['../../../../static/groupAppTotalImg/banner.png'],
            // 撤回模态框
            withDrawShow: false,
            fyData: [],
@@ -423,8 +432,27 @@
    // },
    // 点击导航栏菜单后
    onNavigationBarButtonTap(e) {
        console.log(e);
        console.log('退出导航栏按钮事件',e);
        // this.$refs.menuRef.menuClick();
    },
    // 监听左上角的回退事件
    onUnload(event){ //多层级跳转之后,监听左上角返回事件,直接退回到index
        console.log('监听左上角',event);
        uni.request({
          url: `${BaseUrl}/auth/token/logout`,
          method: 'DELETE',
          header: {
            'TENANT-ID': 5,
            Authorization: 'Bearer ' + uni.getStorageSync('access_token'),
            VERSION: 'zzl'
          }
        }).then(res=>{
            console.log('缓存清理成功');
        }).catch(err => {
          uni.showToast({
            title: '缓存清理失败!',
          })
        })
    },
    onShow() {
        // 菜单注释(app待用)
@@ -458,6 +486,7 @@
            });
        },
        getServerData() {
            console.log('加载图表',this.uchartsData);
            //模拟从服务器获取数据时的延时
            setTimeout(() => {
                //模拟服务器返回数据,如果数据格式和标准格式不同,需自行按下面的格式拼接
@@ -791,6 +820,9 @@
        width: 91%;
        height: vww(330);
        margin: 0 auto;
        .u-empty{
            height:100%;
        }
    }
    .u-input {
pages/login/login.vue
@@ -22,10 +22,10 @@
    data() {
        return {
            formData:{
                username:'fyy',
                password:'123456!@#'
        // username:'anjianwei',
        // password:'123456'
                // username:'dongpang',
                // password:'dongpang!@#'
                username:'',
                password:''
            }
        };
    },
static/groupAppTotalImg/banner.png

utils/request.js
@@ -82,14 +82,17 @@
    500: responseError
}
// let BaseUrl = 'http://192.168.3.159:9999';
// const BaseUrl = 'https://mx.jzeg.cn:443/app';
const BaseUrl = "https://mx.jzeg.cn:9998";
// 请求拦截
const fetch = (url, opt ,urlParam) => {
    let baseUrl = 'http://192.168.3.159:9999';
    let urls = (api[opt.url]?.url || api[url]?.url || jihua[opt.url]?.url || jihua[url]?.url);
    let params = opt.params ? ('?' + Object.keys(opt.params).map(key => key + '=' + opt.params[key]).join('&')) :
    '';
    opt.url = urlParam ? baseUrl + urls + `/${urlParam}` + params : baseUrl + urls + params
    opt.url = urlParam ? BaseUrl + urls + `/${urlParam}` + params : BaseUrl + urls + params
    opt.method = opt.method || "GET";
    var header = {}
    if (uni.getStorageSync('access_token')) {
@@ -149,5 +152,6 @@
export {
    fetch
    fetch,
    BaseUrl
}