zhangxiaoxu123
2022-07-28 5596cc695d444d9ef13661148d6e227f8ed3171e
'冲突解决'
2个文件已修改
1563 ■■■■■ 已修改文件
pages/edit-my-application/edit-my-application.vue 1537 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/home/home.vue 26 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/edit-my-application/edit-my-application.vue
@@ -10,35 +10,32 @@
    <!-- <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">
            <u--form labelPosition="left" :model="newFormData" :rules="rules" ref="formRef">
                <u-form-item labelWidth="20%" label="结算客户" prop="customerName" borderBottom ref="customerNameRef">
          <u--input v-model="newFormData.customerName" disabled disabledColor="#ffffff" border="none"></u--input>
        </u-form-item>
        <u-form-item labelWidth="20%" label="合同编号"  borderBottom ref="contractNumRef">
                <u-form-item  labelWidth="20%" label="合同编号" prop="contractNum" borderBottom ref="contractNumRef">
          <u--input v-model="newFormData.contractNum" disabled disabledColor="#ffffff" border="none"></u--input>
        </u-form-item>
        <u-form-item labelWidth="20%" label="合同名称" borderBottom ref="contractNameRef">
          <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" prop="startDate" labelWidth="20%" label="日期" borderBottom ref="timeDataRef">
          <u--input v-model="timeDataStr" border="none" placeholder="请选择范围日期"></u--input>
          <u-icon slot="right" name="arrow-right"></u-icon>
        </u-form-item>
        <u-form-item labelWidth="20%" label="编号"  borderBottom>
          <u--input border="none" disabled disabledColor="#ffffff" v-model="newFormData.number" placeholder="请输入编号"></u--input>
                    <u--input border="none" disabled disabledColor="#ffffff" value="自动生成" placeholder="请输入编号"></u--input>
        </u-form-item>
      </u--form>
    </view>
    <!-- 申请日历、范围时间 -->
    <u-calendar :show="timeShow" :mode="mode" @confirm="confirmTime" @close="timeClose" rowHeight="110"
                :maxDate="maxDate"></u-calendar>
        <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> -->
@@ -245,6 +242,11 @@
-->
    <!-- 添加合同子项 -->
    <view class="addContractContainer">
      <u-popup :show="addContractShow" @close="addContractClose" @open="addContractOpen" mode="bottom" round="22">
@@ -255,8 +257,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 +276,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 +298,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>
@@ -382,22 +368,15 @@
                    </view>
                  </view>
                </template>
                <u-form-item @click="addContractTransportShow = true" label="运输" labelWidth="20%" ref="item1">
                  <u--input v-model="addContractTransport"></u--input>
                </u-form-item>
                                <u-form-item @click="addContractTransportShow = true" label="运输" labelWidth="20%" ref="item1"><u--input v-model="addContractTransport"></u--input></u-form-item>
              </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-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-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>
@@ -407,15 +386,12 @@
              <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 +423,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 +439,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.customerName" border="none"
                                  placeholder="输入客户名称"></u--input>
                        <u-icon slot="right" name="close-circle-fill" v-show="selectCustomerData.customerName != ''"
                                @click="selectCustomerData.customerName = ''"></u-icon>
                                                <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--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>
@@ -516,166 +480,6 @@
                                                        width: 43px;
                                                        font-size: 10px;
                                                        padding: 0;"
<<<<<<< Updated upstream
                              @click="addContractConsigneeConfirm(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>
          <!-- 品种选择器 -->
          <view class="addContractCoalPicker">
            <u-picker
                :show="addContractCoalShow"
                :columns="addContractCoalData"
                @close="addContractCoalClose"
                @cancel="addContractCoalShow = false"
                @confirm="addContractCoalConfirm"
                :closeOnClickOverlay="true"
                keyName="label"
            ></u-picker>
          </view>
          <!-- 运输选择器 -->
          <view class="addContractCoalPicker">
            <u-picker
                :show="addContractTransportShow"
                :columns="addContractTransportData"
                @close="addContractTransportClose"
                @cancel="addContractTransportShow = false"
                @confirm="addContractTransportConfirm"
                :closeOnClickOverlay="true"
                keyName="label"
            ></u-picker>
          </view>
        </scroll-view>
      </u-popup>
    </view>
    <!-- 申请表格 -->
    <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="messageCustomerBalance" v-if="accountDetails.balanceTotal >= 0">
        <text style="color: #FFA500;;">客户账户现汇余额:{{
            accountDetails.balanceTotal
          }},承兑余额:{{ accountDetails.balance2 == null ? 0 : customerChengdui }}
        </text>
      </view>
      <u-swipe-action>
        <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="cardList-container">
              <view class="cardList_item">
                收货人:
                <text>{{ item.customerName }}</text>
              </view>
              <view class="cardList_item">
                <view class="">
                  矿厂:
                  <text>{{ item.filedName }}</text>
                </view>
                <view class="">
                  煤厂:
                  <text>{{ item.compName }}</text>
                </view>
              </view>
              <view class="cardList_item">
                <view class="">
                  品种:
                  <text>{{ item.coalName }}</text>
                </view>
                <view class="">
                  运输:
                  <text>{{ item.trainType == 1 ? '地销' : '路运' }}</text>
                </view>
              </view>
              <view class="cardList_item">
                <view class="">
                  单价:
                  <text>{{ item.price }}</text>
                </view>
                <view class="">
                  订单金额:
                  <text>{{ item.amount }}</text>
                </view>
                <!-- <view class="">
                      订单数量:<text>218.899</text>
                    </view> -->
              </view>
            </view>
          </view>
        </u-swipe-action-item>
      </u-swipe-action>
      <view class="addCard" @click="addContractClick">
        <view class="addCard-icon">
          <u-icon name="plus" size="100"></u-icon>
        </view>
      </view>
    </view>
    <view class="new-application-button">
      <u-button text="取消" :plain="true" type="primary" @click="backPage"></u-button>
      <u-button text="确定" type="primary" @click="newApplicationFormDataClick"></u-button>
    </view>
    <!-- 菜单栏 -->
    <popup-menu @menuShow="menushow" ref="menuRef"></popup-menu>
  </view>
=======
                                                        @click="addContractConsigneeConfirm(item)"
                                                    >
                                                        选择
@@ -824,7 +628,6 @@
        <!-- 菜单栏 -->
        <popup-menu @menuShow="menushow" ref="menuRef"></popup-menu>
    </view>
>>>>>>> Stashed changes
</template>
<script>
@@ -838,1213 +641,6 @@
month = month < 10 ? `0${month}` : month;
const date = d.getDate();
export default {
<<<<<<< Updated upstream
  data() {
    return {
      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: '外销'
      },
      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']
        //   }
        // ]
      },
      // 时间
      timeShow: false,
      mode: 'range',
      maxDate: `${year}-${month}-${date + 70}`,
      // 选择客户
      selectCustomerData: {
        compIds: '',
        customerName: '',
        level: '',
        current: 1,
        size: 10
      },
      status: 'loadmore',
      customerDataAllNum: 0,//客户列表总条数
      account: null, //客户账户信息
      // 搜索字段
      selectCompsData: [],
      selectCustomerLevel: [],
      searchCustomerForm: {
        compName: '',
        levelText: ''
      },
      customerData: [],
      // 选择单位
      selectCustomerCompShow: false,
      selectCustomerActions: [],
      // 级别
      selectLevelShow: false,
      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,
      // 添加合同
      addContractShow: false,
      // 添加合同表单
      addContractRules: {
        // compName: [
        //   {
        //     required: true,
        //     message: '请选择煤厂',
        //     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: ''
      },
      contractDetails: [], // 选择的合同详情
      // 选择煤厂
      coalFiledSelectShow: false,
      coalfiledData: [],
      coalfiledParams: {current: 1, size: 10},
      selectCoalFiledData: {},
      // 选择收货人
      addContractConsigneeShow: false,
      // 品种选择器
      addContractCoalShow: false,
      addContractCoalData: [[]],
      // 运输类型
      // 优惠
      favouredpolicyListAll: [], //优惠政策列表所有的
      favouredpolicyList: [], // 优惠政策列表
      multipleSelection: [], //选中的优惠政策
      selectOKfavouredpolicyValue: [],//复选框选中
      // 单选框
      addContractTransport: '',
      // 品种价格表格
      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
      },
      dust: null, // 抑尘费
      trainfreight: {}, //路运运费
      // 运输类型
      addContractTransportShow: false,
      addContractTransportData: [[{label: '地销', value: 1}, {label: '路运', value: 2}]],
      currentCoal: {
        coalName: '',
        cokingPrice: null,
        modifyId: null,
        modifyInfoId: null,
        noImportantPrice: null,
        quotePrice: null,
        steelMillPrice: null,
        type: null
      },
      // 滑动单元格
      options1: [
        {
          text: '删除'
        }
      ],
      editApplicationTableId: ''
    };
  },
  onLoad(options) {
    this.editApplicationTableId = JSON.parse(options.index);
  },
  onShow() {
    if (this.menuShow == true) {
      this.$refs.menuRef.menuClick();
    }
    this.init();
  },
  // 点击导航栏菜单后
  onNavigationBarButtonTap(e) {
    this.$refs.menuRef.menuClick();
  },
  computed: {
    afterPrice() {
      let temp = Object.assign({},this.currentCoal);
      let favouredpolicyIds = '';
      if (this.favouredpolicyList.length > 0) {
        console.log('变后的价格',this.multipleSelection,temp,this.currentCoal);
        this.multipleSelection.forEach(e => {
          if (favouredpolicyIds.length > 0) {
            favouredpolicyIds += ',';
          }
          favouredpolicyIds += e.id;
          temp.steelMillPrice -= e.price;
          temp.cokingPrice -= e.price;
          temp.noImportantPrice -= e.price;
          temp.quotePrice -= e.price;
        });
        if (this.multipleSelection.length > 0) {
          this.addContractFormdata.favouredpolicyIds = favouredpolicyIds;
        }
      }
      return temp;
    },
    showPrice() {
      if (this.addContractFormdata) {
        let row = this.addContractFormdata;
        if (row.compId && row.customerAddressId && row.coalId) {
          // this.rowClik(this.currentRow);
          return true;
        }
      }
      return false;
    },
    //优惠政策
    favouredpolicyListcomputed() {
      let list = [];
      this.favouredpolicyListAll.forEach(e => {
        //支付方式
        if (e.type.indexOf('B') != -1 && e.coalIds) {
          if (e.coalIds.indexOf(this.addContractFormdata.coalId) != -1) {
            list.push(e);
          }
        }
        //运距
        if (this.addContractFormdata.trainType == 2) {
          if (e.type.indexOf('A') != -1) {
            //根据发站到站获取运距
            list.push(e);
          }
        }
      });
      this.favouredpolicyList = list;
      return true;
    },
    async currentRowComputed() {
      //变价格用的
      this.changePriceMode(this.addContractFormdata.priceMode);
      //变订单量
      if (this.addContractFormdata.id != null) {
        if (this.addContractFormdata.price > 0 && (this.addContractFormdata.amount > 0 || this.addContractFormdata.quant > 0)) {
          let price = this.addContractFormdata.price;
          if (this.addContractFormdata.trainType == 1) {
            let q = this.addContractFormdata.amount / price;
            this.addContractFormdata.quant = q.toFixed(2);
            this.addContractFormdata.cost1 = null; //运费
            this.addContractFormdata.cost2 = null; //抑尘费
          } else if (this.addContractFormdata.trainType == 2) {
            //如果路运价格增加抑尘费和运费
            let cost1Price = await this.getFreight(this.addContractFormdata.fromStation, this.addContractFormdata.toStation, this.addContractFormdata.customerAddressId); //路运运费
            price += cost1Price;
            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);
          }
        }
      } else {
        this.addContractFormdata.quant = null;
      }
      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,
    // 深度监听 属性的变化// deep: true
    // 选择客户查询条件
    'searchCustomerForm.compName'(newV, oldV) {
      if (newV == '') {
        this.selectCustomerData.compIds = '';
      }
    },
    'searchCustomerForm.levelText'(newV, oldV) {
      if (newV == '') {
        this.selectCustomerData.level = '';
      }
    },
    // 'selectOKfavouredpolicyValue'(newV,oleV){
    // }
  },
  components: {
    popupMenu,
    combinationTitle
  },
  methods: {
    async jisuanAmount() {
      if (this.addContractFormdata.trainType == 2) {
        let price = this.addContractFormdata.price;
        //如果路运价格增加抑尘费和运费
        let cost1Price = await this.getFreight(this.addContractFormdata.fromStation, this.addContractFormdata.toStation, this.addContractFormdata.customerAddressId); //路运运费
        price += cost1Price;
        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);
      }
    },
    init() {
      this.jcfavouredpolicyitem();
      this.coalfiled();
      this.coalprice();
      this.operato();
      this.pay_type();
      this.others_params();
      this.fetchCompTree();
      this.getFavouredPolicyItem();
      this.editApplicationFormData(); // 修改申请表单详情
    },
    // 初始化申请表单
    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();
      // 初始化当前申请客户账户情况
      if(this.newFormData.customerId){
        await this.$reqGet('getAccount', {customerId: this.newFormData.customerId}).then(res => {
          this.accountDetails = res.data;
        });
      }
    },
    editApplicationClick(index) {
      this.applicationOrderIndex = index;// 待修改订单index
      this.addContractFormdata = Object.assign({},this.newFormData.contractOrders[index]);
      console.log('修改指定订单表单----------',this.addContractFormdata.id,this.addContractFormdata);
      this.addContractFormdata.priceMode = this.newFormData.contractOrders[this.applicationOrderIndex].priceMode.toString();
      // 修改订单优惠初始化
      if (this.newFormData.contractOrders[index].favouredpolicyIds) {
        this.newFormData.contractOrders[index].favouredpolicyIds.split(',').map(item => {
          this.selectOKfavouredpolicyValue.push(Number(item));
        });
      }
      // 获取价格
      // 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;
      this.getNewPriceData.fromStation = this.newFormData.contractOrders[this.applicationOrderIndex].fromStation;
      this.getNewPriceData.toStation = this.newFormData.contractOrders[this.applicationOrderIndex].toStation;
      this.getNewPriceData.filedId = this.newFormData.contractOrders[this.applicationOrderIndex].filedId;
      this.getNewPriceData.filedName = this.newFormData.contractOrders[this.applicationOrderIndex].filedName;
      this.getNewPriceData.customerAddressName = this.newFormData.contractOrders[this.applicationOrderIndex].customerAddressName;
      this.getNewPriceData.customerAddressId = this.newFormData.contractOrders[this.applicationOrderIndex].customerAddressId;
      this.getNewPriceData.toStation = this.newFormData.contractOrders[this.applicationOrderIndex].toStation;
      this.getNewPriceData.coalId = this.newFormData.contractOrders[this.applicationOrderIndex].coalId;
      this.getNewPriceData.coalName = this.newFormData.contractOrders[this.applicationOrderIndex].coalName;
      // 获取合同煤种价格
      this.getNewPrice();
      // 初始化第一次优惠价格计算
      // this.$nextTick(()=>{
      if (this.selectOKfavouredpolicyValue.length == 0) {
        this.multipleSelection = [];
      } else {
        this.multipleSelection = [];
        this.favouredpolicyList.forEach((item) => {
          if (this.selectOKfavouredpolicyValue.indexOf(item.id) != -1) {
            this.multipleSelection.push(item);
          }
        })
      }
      // })
      // 订单运输类型
      switch (this.addContractFormdata.trainType) {
        case 1:
          this.addContractTransport = '地销';
          break;
        case 2:
          this.addContractTransport = '路运';
          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: ''}];
          a[0].label = item.coalName;
          a[0].id = item.coalId;
          if (this.addContractCoalData[0]) {
            this.addContractCoalData = [];
          }
          this.addContractCoalData.push(a);
        });
      })
    },
    checkboxChangeFavouredpolicy(e) {
      // this.selectOKfavouredpolicyValue = e;
      if (e.length == 0) {
        this.multipleSelection = [];
      } else {
        this.multipleSelection = [];
        this.favouredpolicyList.forEach((item, i) => {
          if (e.indexOf(item.id) != -1) {
            this.multipleSelection.push(item);
          }
        })
      }
    },
    // 选择客户
    selectCustomer() {
      this.selectLevelShow = false;
      this.selectCustomerCompShow = false;
      uni.showLoading({
        title: '加载中...'
      });
      // this.selectCustomerShow = true;
      this.selectCustomerData.current = 1;
      this.$reqGet('customer', this.selectCustomerData).then(res => {
        uni.hideLoading();
        if (res.code == 0) {
          this.customerData = res.data.records;
          this.customerDataAllNum = res.data.total;
        }
      });
    },
    // 客户选择弹框打开了
    // selectCustomerOpen() {
    //     // this.spanStyle = 'overflow:hidden'; //当蒙层弹起时,固定界面禁止滚动,当蒙层关闭时,允许滚动
    // },
    // selectCustomerClose() {
    //     // this.spanStyle = 'overflow:auto'; // 让html的body可滑动
    //     // this.selectCustomerShow = false;
    // },
    // 获取单位树
    fetchCompTree() {
      this.selectCustomerActions = [];
      this.$reqGet('fetchCompTree').then(res => {
        if (res.code == 0) {
          let a = {name: '', id: ''};
          a.name = res.data[0].name;
          a.id = res.data[0].id;
          this.selectCustomerActions.push(a);
          res.data[0].children.forEach(item => {
            let a = {name: '', id: ''};
            a.name = item.name;
            a.id = item.id;
            this.selectCustomerActions.push(a);
          });
        }
      });
    },
    // 客户选择框单位选择菜单
    selectCustomerSelect(v) {
      uni.hideKeyboard();
      this.selectCustomerData.compIds = v.id;
      this.searchCustomerForm.compName = v.name;
    },
    // 级别
    selectLevelSelect(v) {
      uni.hideKeyboard();
      this.selectCustomerData.level = v.value;
      this.searchCustomerForm.levelText = v.name;
    },
    // 付款类型
    sexSelect(v) {
      uni.hideKeyboard();
      this.selectValue = v.name;
      this.newFormData.payType = v.value;
      // this.newFormData.payType = e.name;
      // this.$refs.form1.validateField('userInfo.sex');
    },
    // 清空选择客户表单
    selectCustomerResetFields() {
      this.$refs.selectformRef.resetFields(); // 不起效果
      this.selectCustomerData.customerName = '';
      this.searchCustomerForm.compName = '';
      this.searchCustomerForm.levelText = '';
      this.selectCustomer();
    },
    selectCustomerOkClick(v) {
      this.newFormData.customerName = v.customerName;
      this.newFormData.customerId = v.id;
      this.$reqGet('getAccount', {customerId: v.id}).then(res => {
        this.accountDetails = res.data;
        this.searchContractForm.customerName = res.data.customerName;
      });
      this.$nextTick(() => {
        // this.selectCustomerShow = false;
      });
    },
    loadingCustomer() {
      if (this.selectCustomerData.current >= this.customerDataAllNum / 10) return;
      this.status = 'loading';
      this.selectCustomerData.current = ++this.selectCustomerData.current;
      this.$reqGet('customer', this.selectCustomerData).then(res => {
        if (this.selectCustomerData.current >= this.customerDataAllNum / 10) {
          this.status = 'nomore';
          this.$u.toast('没有更多数据了!')
        }
        uni.hideLoading();
        if (res.code == 0) {
          this.customerDataAllNum = res.data.total;
          this.customerData = this.customerData.concat(res.data.records);
          this.status = 'loadmore';
        }
      });
    },
    // 时间
    confirmTime(v) {
      this.timeShow = false;
      v.forEach(e => {
        this.newFormData.startDate = v[0];
        this.newFormData.endDate = v[v.lenght - 1];
        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: '客户账户余额当前处于欠款状态!',
                icon: 'error',
                duration: 2000
              });
            } else {
              if (this.accountDetails.balance == 0 || (null && this.accountDetails.balance2 == 0) || null) {
                uni.showToast({
                  title: '账户余额不足!',
                  icon: 'error',
                  duration: 2000
                });
              } else {
                this.addContractShow = true;
                this.addContractFormdata = {
                  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: '0',
                  quant: '',
                  toStation: '',
                  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:
                    this.addContractTransport = '地销';
                    break;
                  case 2:
                    this.addContractTransport = '路运';
                    break;
                }
                // 获取合同详情,煤种
                this.getContractDetails();
                this.multipleSelection = [];
              }
            }
          // })
          // .catch(err => {
          //   uni.$u.toast('效验失败');
          // });
    },
    // 添加合同弹出框
    addContractClose() {
      this.addContractShow = false;
      this.addContractFormdata = {};
      this.applicationOrderIndex = null;
    },
    addContractOpen() {
      console.log('添加订单打开');
    },
    // 选择煤厂
    coalFiledSelectOpen(e) {
      // console.log('coalfiledSelect: ', e);
    },
    coalFiledSelectClose() {
      this.coalFiledSelectShow = false;
    },
    // 选择的煤厂
    coalFiledSelectClick(e) {
      this.addContractFormdata.compName = e.compName;
      this.addContractFormdata.filedName = e.name;
      this.addContractFormdata.compId = e.compId;
      this.addContractFormdata.filedId = e.id;
      this.addContractFormdata.fromStation = e.toStation;
      this.selectCoalFiledData = e;
      this.coalFiledSelectShow = false;
    },
    // 收货人
    addContractConsigneeClose() {
      this.addContractConsigneeShow = false;
    },
    // 添加合同子项收货人打开
    addContractConsigneeOpen() {
      this.selectCustomer()
    },
    addContractConsignee() {
      this.addContractConsigneeShow = true;
    },
    addContractConsigneeConfirm(v) {
      // console.log('收货人', v);
      this.addContractFormdata.toStation = v.toStation;
      this.addContractFormdata.customerName = v.customerName;
      this.addContractFormdata.customerId = v.id;
      this.$reqGet('getAccount', {customerId: v.id}).then(res => {
        // console.log('获取收货人账号', res);
        // this.accountDetails = res.data;
        // this.newFormData.customerName = res.data.customerName;
        // this.newFormData.customerId = res.data.id;
        // this.searchContractForm.customerName = res.data.customerName;
      });
      this.$nextTick(() => {
        this.addContractConsigneeShow = false;
      });
      // 赋值给取价格请求参数
      this.getNewPriceData.customerAddressName = v.customerFullName;
      this.getNewPriceData.customerAddressId = v.id;
      this.getNewPriceData.toStation = v.toStation;
      this.addContractFormdata.toStation = v.toStation;
      this.addContractFormdata.customerAddressId = v.id;
      // 添加煤种选项
      this.contractDetails.forEach(item => {
        let a = [{label: '', id: ''}];
        a[0].label = item.coalName;
        a[0].id = item.coalId;
        if (this.addContractCoalData[0]) {
          this.addContractCoalData = [];
        }
        this.addContractCoalData.push(a);
      });
    },
    // 品种选择器
    addContractCoalConfirm(e) {
      // console.log('品种选择器', e);
      this.addContractCoalShow = false; // 关闭选择器
      this.addContractFormdata.coalId = e.value[0].id;
      this.addContractFormdata.coalName = e.value[0].label;
      // 煤种价格请求(煤厂=>价格参数)
      this.getNewPriceData.coalId = e.value[0].id;
      this.getNewPriceData.coalName = e.value[0].label;
      // this.selectCoalFiledData.compId = e.compId;
      // this.selectCoalFiledData.compName = e.compName;
      // this.selectCoalFiledData.toStation = e.fromStation;
      this.getNewPrice();
    },
    getNewPrice() {
      this.$reqGet('getNewPrice', this.getNewPriceData).then(res => {
        if (res.code == 0) {
          // console.log('获取价格',res);
          let data = res.data;
          if (data) {
            this.currentCoal.coalName = data.coalName;
            this.currentCoal.cokingPrice = data.cokingPrice; //焦化价格
            this.currentCoal.noImportantPrice = data.noImportantPrice; //不重要价格
            this.currentCoal.quotePrice = data.quotePrice; // 挂牌价格
            this.currentCoal.steelMillPrice = data.steelMillPrice; // 钢厂价格
            this.currentCoal.modifyId = data.modifyId; //修改id
            this.currentCoal.modifyInfoId = data.id;
            this.addContractFormdata.price = data.steelMillPrice;
            this.addContractFormdata.modifyId = data.modifyId;
            // this.addContractFormdata.id = data.id;
          } else {
            uni.$u.toast('煤种价格未设置');
          }
        }
      });
    },
    addContractCoalClose() {
      this.addContractCoalShow = false;
    },
    // 煤品种价格
    groupChange(e) {
      // console.log('单选框小组', e);
    },
    changePriceMode(e) {
      if (!this.currentCoal) return;
      if (e) {
        this.addContractFormdata.priceMode = e;
      }
      this.addContractFormdata.price = this.afterPrice.quotePrice;
      switch (this.addContractFormdata.priceMode) {
        case '0':
          this.addContractFormdata.price = this.afterPrice.steelMillPrice;
          break;
        case '1':
          this.addContractFormdata.price = this.afterPrice.cokingPrice;
          break;
        case '2':
          this.addContractFormdata.price = this.afterPrice.noImportantPrice;
          break;
        case '3':
          this.addContractFormdata.price = this.afterPrice.quotePrice;
          break;
      }
    },
    // 优惠选择
    selectionChange(e) {
      // console.log('优惠选择',e);
      this.multipleSelection = [];
      this.favouredpolicyList.forEach((item, i) => {
        if (e.detail.index.indexOf(i) != -1) {
          this.multipleSelection.push(item);
        }
      });
    },
    // 运输选择器
    addContractTransportConfirm(e) {
      this.addContractTransportShow = false;
      this.addContractFormdata.trainType = e.value[0].value;
      switch (this.addContractFormdata.trainType) {
        case 1:
          this.addContractTransport = '地销';
          break;
        case 2:
          this.addContractTransport = '路运';
          break;
      }
    },
    addContractTransportClose() {
      this.addContractTransportShow = false;
    },
    // 获取运费
    async getFreight(from, to, customerId) {
      let key = from + to + customerId;
      let price = this.trainfreight[key];
      price = await this.$reqGet('trainFreightFind', {from, to, customerId}).then(res => {
        let resPrice = 10; //默认价格为10
        if (res.data) {
          resPrice = res.data.price;
        }
        return resPrice;
      });
      return price;
    },
    addContractSanConfirm() {
      if (this.addContractFormdata.compId && this.addContractFormdata.customerId && this.addContractFormdata.filedId) {
        if (this.applicationOrderIndex == null) {
          this.newFormData.contractOrders.push(this.addContractFormdata);
          this.$nextTick(() => {
            this.addContractShow = false;
          });
          this.$u.toast('添加成功');
        } else {
          // this.newFormData.contractOrders.map(i => {
          //     return this.newformData.contractOrders[]
          // })
          this.newFormData.contractOrders[this.applicationOrderIndex] = this.addContractFormdata;
          this.addContractShow = false; // 隐藏弹出框
          this.applicationOrderIndex = null; // 初始化修改订单index
          this.$u.toast('修改成功');
        }
      } else {
        uni.$u.toast('请规范输入所有信息');
      }
    },
    // 初始数据请求
    operato() {
      this.$reqGet('operator').then(res => {
        this.operator = res.data;
      });
    },
    pay_type() {
      this.actions = [];
      this.$reqGet('pay_type').then(res => {
        // console.log('paytype', res);
        this.payData = res.data;
        res.data.forEach(e => {
          let a = {name: '', value: ''};
          a.name = e.label;
          a.value = e.value;
          this.actions.push(a);
        });
      });
      // console.log(this.actions);
    },
    // 抑尘费
    others_params() {
      this.$reqGet('others_params').then(res => {
        // console.log('others_params', res);
        res.data.forEach(e => {
          if (e.label == 'dust') {
            this.dust = parseFloat(e.value);
          }
        });
      });
    },
    coalprice() {
      this.$reqGet('coalprice', {current: 1, size: 1000}).then(res => {
        // console.log('coalprice', res);
      });
    },
    // 级别距优惠
    jcfavouredpolicyitem() {
      this.$reqGet('jcfavouredpolicyitem', {current: 1, size: 1000, status: 0}).then(res => {
        // console.log('级别距优惠', res);
        // this.favouredpolicyListAll = res.data.records;
      });
    },
    // 获取所有的优惠政策
    getFavouredPolicyItem() {
      this.$reqGet('getFavouredPolicyItem', {current: 1, size: 1000, status: 0}).then(res => {
        // console.log('所有价格优惠',res.data.records);
        this.favouredpolicyListAll = res.data.records;
      });
    },
    // 煤场
    coalfiled() {
      this.$reqGet('coalfiled', this.coalfiledParams).then(res => {
        this.coalfiledData = res.data.records;
      });
    },
    // 时间
    timeClose() {
      this.timeShow = false;
    },
    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);
            });
            if (this.newFormData.payType == '0') {
              if (this.newFormData.contractOrders.length <= 0) {
                this.$u.toast('请添加订单子项!');
                return false;
              } else if (this.accountDetails.balance < amount) {
                let msg = this.accountDetails.balance == null ? 0 : this.accountDetails.balance;
                uni.showToast({
                  title: '客户账户现汇余额不足,现汇余额:' + msg,
                  icon: 'error',
                  duration: 2000
                });
              } else {
                uni.showLoading({
                  title:'加载中...'
                });
                this.editShenQing();
                // this.xswaybill();
              }
            } else {
              if (this.newFormData.contractOrders.length <= 0) {
                this.$u.toast('请添加订单子项!');
                return false;
              } else if (this.accountDetails.balance2 < amount) {
                let msg = this.accountDetails.balance2 == null ? 0 : this.accountDetails.balance2;
                uni.showToast({
                  title: '客户账户承兑余额不足,承兑余额:' + msg,
                  icon: 'error',
                  duration: 2000
                });
              } else {
                uni.showLoading({
                  title:'加载中...'
                });
                this.editShenQing();
                // this.xswaybill();
              }
            }
          })
          .catch(err => {
            uni.$u.toast('校验失败');
          });
    },
    // 修改申请信息
    editShenQing() {
      uni.request({
        url: '/yunxiao/xswaybill',
        method: "PUT",
        data: this.newFormData,
        header: {
          'TENANT-ID': 5,
          Authorization: 'Bearer ' + uni.getStorageSync('access_token'),
          VERSION: 'zzl'
        }
      }).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() {
      console.log('新建发运申请', this.newFormData);
      uni.showLoading({
        title: '加载中...'
      });
      this.$reqPost('xswaybill', this.newFormData).then(res => {
        uni.hideLoading();
        console.log('新建发运申请', res);
        if (res.code == 0) {
          uni.showToast({
            title: '添加成功!',
            icon: 'success',
            duration: 2000
          });
          // this.$nextTick(() => {
          //     uni.navigateBack({
          //         // url: '/pages/my-application/my-application'
          //         delta: 2
          //     });
          // });
        }
      });
    },
    backPage() {
      uni.navigateBack({
        delta: 1
      });
    }
  }
=======
    data() {
        return {
            applicationOrderIndex:null,
@@ -3253,7 +1849,6 @@
            });
        }
    }
>>>>>>> Stashed changes
};
</script>
@@ -3266,13 +1861,11 @@
  .newApplicationTitle {
    margin-bottom: 0;
  }
  // 表单
  .formDataContaniner {
    .u-form {
      width: 91%;
      margin: 0 auto 0;
      .u-form-item {
        .u-form-item__body {
          .u-form-item__body__left {
@@ -3281,7 +1874,6 @@
              }
            }
          }
          .u-form-item__body__right {
            .u-form-item__body__right__content {
              .u-form-item__body__right__content__slot {
@@ -3298,14 +1890,11 @@
    .u-popup {
      .u-transition {
        height: 95%;
        .u-popup__content {
          overflow: scroll !important;
          .selectCustomerTitle {
            margin-bottom: 0;
          }
          .selectCustomerContainer {
            padding: 0 4%;
            // .loadmoreClass{
@@ -3318,16 +1907,13 @@
            // }
            .searchContainer {
            }
            .searchCustomerBtn {
              margin-top: vww(10);
              display: flex;
              .u-button {
                width: 30%;
              }
            }
            // 数据列表
            .searchResultList {
              margin-top: vww(16);
@@ -3338,15 +1924,12 @@
              margin-top: vww(30);
              display: flex;
              justify-content: center;
              .uni-table-scroll {
                min-width: 0 !important;
                .uni-table {
                  .uni-table-tr {
                    padding: 0;
                    font-size: vww(13);
                    .uni-table-th {
                      width: vww(100);
                      height: vww(32);
@@ -3365,19 +1948,15 @@
                  }
                }
              }
              .tableBody {
                width: 80%;
              }
              .TableUtilBtn {
                width: 20%;
                overflow: hidden;
                .uni-table {
                  min-width: 0 !important;
                }
                .TableUtilBtnContainer {
                  .u-button {
                    width: vww(20);
@@ -3419,7 +1998,6 @@
                }
              }
            }
            .selectContractEndTime {
              .u-popup {
                .u-transition {
@@ -3438,10 +2016,8 @@
    .u-popup {
      .u-transition {
        height: 95%;
        .u-popup__content {
          overflow: scroll !important;
          .addContractFormTitle {
            margin-bottom: 0;
          }
@@ -3449,13 +2025,11 @@
          // 搜索
          .coalFiledSelectSearch {
          }
          // 选择煤种
          .coalFiledSelectPopup {
            .u-popup {
              .u-transition {
                height: 80%;
                .u-popup__content {
                  overflow: scroll !important;
                  // 表格
@@ -3464,15 +2038,12 @@
                    display: flex;
                    justify-content: center;
                    margin: 0 auto;
                    .uni-table-scroll {
                      min-width: 0 !important;
                      .uni-table {
                        .uni-table-tr {
                          padding: 0;
                          font-size: vww(13);
                          .uni-table-th {
                            width: vww(100);
                            height: vww(32);
@@ -3491,19 +2062,15 @@
                        }
                      }
                    }
                    .tableBody {
                      width: 80%;
                    }
                    .TableUtilBtn {
                      width: 20%;
                      overflow: hidden;
                      .uni-table {
                        min-width: 0 !important;
                      }
                      .TableUtilBtnContainer {
                        .u-button {
                          width: vww(20);
@@ -3525,11 +2092,9 @@
    .u-popup {
      .u-transition {
        height: 95%;
        .u-popup__content {
          // background-color: rgb(247, 247, 247);
          overflow: scroll !important;
          .addContractForm {
            width: 92%;
            margin: 0 auto;
@@ -3566,19 +2131,16 @@
                box-shadow: 0 2px 16px #e5e5e5, 0 0 1px #e5e5e5, 0 0 1px #e5e5e5;
                // margin-top:vww(10);
                background-color: #ffffff;
                .currentPriceContainer {
                  .currentPriceBox {
                    width: 92%;
                    margin: 0 auto;
                  }
                }
                .selectPriceContainer {
                  .selectPricebox {
                    width: 92%;
                    margin: 0 auto;
                    .selectPriceboxItem {
                      display: flex;
                      justify-content: space-between;
@@ -3587,7 +2149,6 @@
                }
              }
            }
            .formDownCard {
              border-radius: vww(4);
              padding: vww(10);
@@ -3620,12 +2181,10 @@
    width: 100%;
    padding: vww(0) vww(10) vww(60) vww(10);
    box-sizing: border-box;
    .u-swipe-action {
      .u-swipe-action-item {
        box-shadow: 0 2px 16px #e5e5e5, 0 0 1px #e5e5e5, 0 0 1px #e5e5e5;
        margin-top: vww(10);
        .u-swipe-action-item__right {
          .u-swipe-action-item__right__button {
            .u-swipe-action-item__right__button__wrapper {
@@ -3635,28 +2194,21 @@
        }
      }
    }
    .cardList {
      height: vww(130);
      border-radius: vww(4);
      padding: vww(10);
      position: relative;
      .cardListIcon {
        position: absolute;
        right: vww(20);
        top: vww(20);
                position:absolute; right: vww(20); top:vww(20);
      }
      .cardList-container {
        .cardList_item {
          margin-top: vww(12);
          font-size: 14px;
          display: flex;
          view {
            width: 50%;
            &:nth-child(2) {
              margin-left: vww(20);
            }
@@ -3664,7 +2216,6 @@
        }
      }
    }
    .addCard {
      width: 100%;
      height: vww(130);
pages/home/home.vue
@@ -3,8 +3,8 @@
        <!-- 轮播图 -->
        <view class="home_swipe"><u-swiper :list="list3" indicator indicatorMode="line" circular></u-swiper></view>
        <!-- 我的申请 -->
        <combined-title title="我的申请" detailsPath="/pages/my-application/my-application" v-if="$store.state.shenqingMenu"></combined-title>
        <combination-card v-for="(item, index) in shenqingData" index="index" v-if="$store.state.shenqingMenu">
        <combined-title title="我的申请" detailsPath="/pages/my-application/my-application"></combined-title>
        <combination-card v-for="(item, index) in shenqingData" index="index">
            <template v-slot:top>
                <view>
                    <text>{{ item.title }}</text>
@@ -52,7 +52,7 @@
                        </view>
                        <view @click="theFormDataClick(item.tableId)" v-if="item.status == 1 || item.status == 2">
                            <image src="@/static/home/biaodan.png" mode=""></image>
                            <view>申请详情</view>
                            <view>表单数据</view>
                        </view>
                        <view @click="apply(item)" v-if="item.status == 3">
                            <image src="@/static/home/history.png" mode=""></image>
@@ -110,10 +110,10 @@
                <view class="bottom-container">
                    <!-- 待办按钮 -->
                    <view class="bottom-content__item">
                        <view @click="theFormDataClick(item.tableId)" v-if="item.procDefId == 'WAY_BILL:4:87504'">
                        <!-- <view @click="theFormDataClick">
                            <image src="@/static/home/jindu.png" mode=""></image>
                            <view>申请详情</view>
                        </view>
                        </view> -->
                        <view @click="adopClick(item)">
                            <image src="@/static/home/tongguo.png" mode=""></image>
                            <view>通过</view>
@@ -182,7 +182,7 @@
                <view class="bottom-container">
                    <!-- 已办按钮 -->
                    <view class="bottom-content__item">
                        <view @click="theFormDataClick(item.tableId)" v-if="item.procDefId == 'WAY_BILL:4:87504'">
                        <view @click="theFormDataClick(item.tableId)">
                            <image src="@/static/home/biaodan.png" mode=""></image>
                            <view>表单数据</view>
                        </view>
@@ -324,6 +324,7 @@
            // data
            shenqingData: [],
            daibanData: [],
            daibanData: [],
            yibanData: [],
            menuShow: false,
            // 申请
@@ -353,18 +354,11 @@
        console.log(e);
        this.$refs.menuRef.menuClick();
    },
    onLoad(){
        console.log('加载页面');
        wx.hideShareMenu({
          menus: ['shareAppMessage', 'shareTimeline']
        })
    },
    onShow() {
        if (this.menuShow == true) {
            this.$refs.menuRef.menuClick();
        }
        this.init();
    },
    components: {
        combinedTitle,
@@ -691,12 +685,6 @@
                justify-content: center;
                align-content: center;
                margin-right: vww(10);
<<<<<<< Updated upstream
                &:nth-last-child(1) {
                    margin-right: 0;
                }
=======
>>>>>>> Stashed changes
                view {
                    display: inline-block;
                }