bug 修复

rk

5 天以前 bd6229ebd9cb543a22944ecb1142fad92b675dce

 admin/src/components/business/OperaOrderDetailWindow.vue

@@ -59,15 +59,14 @@
            <div  class="cont"><span class="label">品种：</span> <span class="txt">{{info.categoryName || ''}}</span></div>
          </div>
          <div class="line">
            <div class="cont"><span class="label" v-if="info.workType==1">人数：</span> <span class="txt">{{info.priceNum1 || '' }}人</span></div>
            <div class="cont"><span class="label"  v-if="info.workType==0">重量：</span> <span class="txt">{{info.priceNum1 || '' }}斤</span></div>
            <div class="cont"><span class="label">用工时间：</span><span class="txt">{{info.startDate|| '' }}-{{info.endDate|| '' }}</span></div>
            <div class="cont"><span class="label">用工天数：</span><span class="txt">{{info.totalDays || 0 }}天</span></div>
            <div class="cont" ><span class="label">用工时间：</span><span class="txt">{{info.startDate|| '' }}-{{info.endDate|| '' }} （ {{info.totalDays || 0 }} ）天</span></div>
            <div class="cont"><span class="label">用工地点：</span> <span class="txt">{{info.location || '' }}</span></div>
            <div class="cont"><span class="label">预估总费用：</span><span class="txt yellowbtn">{{((info.originEstimatedAccount||0)/100).toFixed(2) }}元</span></div>
          </div>
          <div class="line">
            <div class="cont"><span class="label">用工地点：</span> <span class="txt">{{info.location || '' }}</span></div>
            <div class="cont"><span class="label">费用标准：</span><span class="txt">{{((info.price||0)/100).toFixed(2) }}{{info.priceUnit || '' }}</span></div>
            <div class="cont"><span class="label">预估总费用：</span><span class="txt yellowbtn">{{((info.estimatedAccount||0)/100).toFixed(2) }}元</span></div>
            <div class="cont"  :style="feeFrom.priceParam2.name!=null?'':'flex: 2'"><span class="label">{{feeFrom.priceParam1.name }}</span><span class="txt">{{info.originPriceNum1 || 0 }}{{feeFrom.priceParam1.unit }}</span></div>
            <div class="cont" v-if="feeFrom.priceParam2.name!=null"><span class="label">{{feeFrom.priceParam2.name }}</span><span class="txt">{{info.originPriceNum2 || 0 }}{{feeFrom.priceParam2.unit }}</span></div>
          </div>
          <div class="line">
            <div class="cont"><span class="label">地点描述：</span><span class="txt">{{info.locationRemark || '' }}</span></div>
@@ -86,7 +85,7 @@
              <template v-if="info.multifileList && info.multifileList.length>0">
              <div v-for="item in info.multifileList" style="display: inline-block" :key="'aaa'+item.id">
                <el-image v-if="item.fileurlFull" style="width: 50px; height: 50px; margin-right: 10px" :src="item.fileurlFull"
                          :preview-src-list="[info.fileurlFull]">
                          :preview-src-list="[item.fileurlFull]">
                </el-image>
              </div>
              </template>
@@ -99,9 +98,9 @@
        </div>
        <div class="detail" v-if="info.type==1">
          <div class="line">
            <div class="cont"><span class="label"> 订单类型：</span> <span class="txt">{{(info.type==0?'用工单':(info.type==1?'货运单':'订单单')) }}</span></div>
            <div class="cont"><span class="label"> 订单类型：</span> <span class="txt">{{(info.type==0?'用工单':(info.type==1?'货运单':'订餐单')) }}</span></div>
            <div  class="cont"><span class="label">车辆：</span> <span class="txt">{{info.categoryName || ''}}-{{info.carUnit || ''}}</span></div>
            <div  class="cont"><span class="label">用车时间：</span> <span class="txt">{{info.startDate|| '' }}-{{info.endDate|| '' }}</span></div>
            <div  class="cont"><span class="label">用车时间：</span> <span class="txt">{{info.startDate|| '' }}-{{info.endDate|| '' }}（ {{info.totalDays || 0 }} ）天</span></div>
          </div>
          <div class="line">
            <div class="cont" >  <span class="label"> 地址信息：</span> <span class="label" v-if="!wayList || wayList.length==0">-</span> </div>
@@ -116,12 +115,12 @@
            </div>
          </div>
          <div class="line">
            <div class="cont"><span class="label">用工天数：</span><span class="txt">{{info.totalDays || 0 }}</span></div>
            <div class="cont"><span class="label">{{feeFrom.priceParam1.name }}</span><span class="txt">{{info.originPriceNum1 || 0 }}{{feeFrom.priceParam1.unit }}</span></div>
            <div class="cont"><span class="label">运输重量/数量：</span> <span class="txt">{{info.transportNum || '' }}{{info.transportUnit || ''}}</span></div>
            <div class="cont"><span class="label">费用标准：</span><span class="txt">{{((info.price||0)/100).toFixed(2) }}{{info.priceUnit || '' }}</span></div>
          </div>
          <div class="line">
            <div class="cont"><span class="label">预估总费用：</span><span class="txt yellowbtn">{{((info.estimatedAccount||0)/100).toFixed(2) }}元</span></div>
            <div class="cont"><span class="label">预估总费用：</span><span class="txt yellowbtn">{{((info.originEstimatedAccount||0)/100).toFixed(2) }}元</span></div>
          </div>
          <div class="line">
            <div class="cont" ><span class="label">需求补充：</span><span class="txt">{{info.supplement || '' }}</span></div>
@@ -137,7 +136,7 @@
              <template v-if="info.multifileList && info.multifileList.length>0">
                <div v-for="item in info.multifileList" style="display: inline-block" :key="item.id">
                  <el-image v-if="item.fileurlFull" style="width: 50px; height: 50px; margin-right: 10px" :src="item.fileurlFull"
                            :preview-src-list="[info.fileurlFull]">
                            :preview-src-list="[item.fileurlFull]">
                  </el-image>
                </div>
              </template>
@@ -177,11 +176,27 @@
              <template v-if="info.multifileList && info.multifileList.length>0">
                <div v-for="item in info.multifileList" style="display: inline-block" :key="'aaa'+item.id">
                  <el-image v-if="item.fileurlFull" style="width: 50px; height: 50px; margin-right: 10px" :src="item.fileurlFull"
                            :preview-src-list="[info.fileurlFull]">
                            :preview-src-list="[item.fileurlFull]">
                  </el-image>
                </div>
              </template>
            </div>
          </div>
        </div>
      </div>
      <div class="renzheng" v-if="(info.type ===0 || info.type===1)&&(info.status===5|| info.status===4)" >
        <div class="info" >
          <span class="m10">费用确认</span>
        </div>
        <div class="detail" style=" ">
          <div class="line">
            <div class="cont"><span class="label">实际{{feeFrom.priceParam1.name }}</span><span class="txt">{{info.priceNum1 || 0 }}{{feeFrom.priceParam1.unit }}</span></div>
            <div class="cont" v-if="feeFrom.priceParam2.name!=null"><span class="label">实际{{feeFrom.priceParam2.name }}</span><span class="txt">{{info.priceNum2 || 0 }}{{feeFrom.priceParam2.unit }}</span></div>
            <div class="cont"  :style="feeFrom.priceParam2.name!=null?'':'flex: 2'"><span class="label">其他费用：</span> <span class="txt">{{((info.confirmOtherFee||0)/100).toFixed(2) }}元</span></div>
          </div>
          <div class="line">
            <div class="cont"><span class="label">实际总费用：</span><span class="txt yellowbtn">{{((info.estimatedAccount||0)/100).toFixed(2) }}元</span></div>
            <div class="cont"  style="flex: 2"><span class="label">备注：</span><span class="txt">{{info.confirmFeeRemark || '' }}</span></div>
          </div>
        </div>
      </div>
@@ -248,9 +263,19 @@
  data () {
    return {
      id: '',
      wayList:[],
      wayList: [],
      info: {},
      loading: false
      loading: false,
      feeFrom: {
        priceParam1: {
          name: null,
          unit: null
        },
        priceParam2: {
          name: null,
          unit: null
        }
      }
    }
  },
  methods: {
@@ -259,7 +284,17 @@
      this.visible = true
      this.tableData2 = []
      this.id = row.id
      this.wayList=[]
      this.wayList = []
      this.feeFrom = {
        priceParam1: {
          name: null,
          unit: null
        },
        priceParam2: {
          name: null,
          unit: null
        }
      }
      this.getData()
    },
    getData () {
@@ -267,9 +302,10 @@
        .then(res => {
          this.info = res
          this.visible = true
          if(this.info.wayInfo){
          if (this.info.wayInfo) {
            this.wayList = JSON.parse(this.info.wayInfo)
          }
          this.initPriceNumParam()
          console.log(this.wayList)
        })
    },
@@ -277,7 +313,7 @@

    },
    showLogList () {
      this.$refs.orderProgress.open('订单流转日志', this.info.orderLogList||[])
      this.$refs.orderProgress.open('订单流转日志', this.info.orderLogList || [])
    },
    getScoreLevel (num) {
      if (this.info.commentLevel && this.info.commentLevel >= num) {
@@ -312,6 +348,54 @@
              })
          })
      })
    },
    initPriceNumParam () {
      this.feeFrom.priceParam1.name = null
      this.feeFrom.priceParam1.unit = null
      this.feeFrom.priceParam2.name = null
      this.feeFrom.priceParam2.unit = null
      if (this.info.type === 0 && this.info.workType === 1) {
        // 分拣工
        this.feeFrom.priceParam1.name = '用工天数：'
        this.feeFrom.priceParam1.unit = '天'
        this.feeFrom.priceParam2.name = '用工人数：'
        this.feeFrom.priceParam2.unit = '人'
      } else if (this.info.type === 0 && this.info.workType === 0) {
        // 采摘工
        this.feeFrom.priceParam1.name = '采摘重量：'
        this.feeFrom.priceParam1.unit = '斤'
        this.feeFrom.priceParam2.name = null
        this.feeFrom.priceParam2.unit = null
      } else if (this.info.type === 0 && this.info.workType === 2) {
        // 包装工
        if (this.info.carType === 0) {
          // 按天
          this.feeFrom.priceParam1.name = '用工天数：'
          this.feeFrom.priceParam1.unit = '天'
          this.feeFrom.priceParam2.name = '用工人数：'
          this.feeFrom.priceParam2.unit = '人'
        } else if (this.info.carType === 1) {
          // 按小时
          this.feeFrom.priceParam1.name = '工作时长：'
          this.feeFrom.priceParam1.unit = '时'
          this.feeFrom.priceParam2.name = '用工人数'
          this.feeFrom.priceParam2.unit = '人'
        } else if (this.info.carType === 2) {
          // 按小时
          this.feeFrom.priceParam1.name = '包装重量：'
          this.feeFrom.priceParam1.unit = '斤'
          this.feeFrom.priceParam2.name = null
          this.feeFrom.priceParam2.unit = null
        }
      } else if (this.info.type === 1 && this.info.carType === 0) {
        // 运货单 按天数
        this.feeFrom.priceParam1.name = '用车天数：'
        this.feeFrom.priceParam1.unit = '天'
      } else if (this.info.type === 1 && this.info.carType === 1) {
        // 运货单 按次数
        this.feeFrom.priceParam1.name = '用车次数：'
        this.feeFrom.priceParam1.unit = '次'
      }
    }
  }
}