Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override

廖井涛

5 小时以前 f7a2fcdda7f1120498c5c5f75c5a99955fc54b43

 north-glass-erp/northglass-erp/src/components/sd/order/PrintSheet3.vue

@@ -38,6 +38,7 @@
    if(res.code==200){
      productIdData.value=deepClone(res.data.data)
      produceList.value = deepClone(res.data.data)

      delivery.value=deepClone(res.data.delivery)
      money.value=deepClone(res.data.money)
      produceList.value.forEach(item => {
@@ -176,6 +177,7 @@
<template>
  <div id="sheet" @dblclick="handleDoubleClick">
    <table border="1" >
      <thead>
      <tr class="title-s">
        <th colspan="9">
          <h1>
@@ -187,9 +189,12 @@
      <tr  class="title-s">
        <th colspan="2"></th>
        <th colspan="5">
          <h3>销售确认单</h3>
          <h4 v-if="!company.showDeliveryCreator" >金华市乐动智能科技有限公司</h4>
          <h3 >销售确认单</h3>

        </th>
        <th colspan="2" style="text-align: left;font-weight: bold;">发货单号：<span>{{delivery.deliveryId}}</span></th>
        <th colspan="2" style="text-align: left;font-weight: bold;" v-if="company.showDeliveryCreator">发货单号：<span>{{delivery.deliveryId}}</span></th>
        <th colspan="2" style="text-align: left;font-weight: bold;" v-else></th>
      </tr>
      <tr>
        <th style="text-align: left;border:none;font-weight: bold;" colspan="4">客户名称：<span>{{delivery.customerName}}</span></th>
@@ -197,7 +202,8 @@
        <th style="text-align: left;border:none;font-weight: bold;" colspan="2">联系人：<span>{{delivery.contacts}}</span></th>
      </tr>
      <tr>
        <th style="text-align: left;border:none;font-weight: bold;" colspan="7">送货地址：<span>{{delivery.deliveryAddress}}</span></th>
        <th style="text-align: left;border:none;font-weight: bold;" colspan="4">送货地址：<span>{{delivery.deliveryAddress}}</span></th>
        <th style="text-align: left;border:none;font-weight: bold;" colspan="3">送货时间：<span>{{delivery.deliveryDate}}</span></th>
        <th style="text-align: left;border:none;font-weight: bold;" colspan="2">联系电话：<span>{{delivery.contactNumber}}</span></th>
      </tr>
      <tr>
@@ -205,28 +211,37 @@
        <th style="width: 15%;">楼层编号</th>
        <th style="width: 17%;" colspan="1">宽X高</th>
        <th style="width: 10%;">数量</th>
        <th style="width: 10%;">面积</th>
        <th style="width: 10%;">总面积</th>
        <th style="width: 10%;">单价</th>
        <th style="width: 12%;">金额</th>
        <th style="width: 20%;" colspan="2">加工要求</th>
        <th v-if="company.showDeliveryCreator" style="width: 20%;" colspan="2">加工要求</th>
        <th v-if="!company.showDeliveryCreator" style="width: 10%;" colspan="1">加工要求</th>
        <th v-if="!company.showDeliveryCreator" style="width: 10%;" colspan="1">备注</th>
      </tr>
      </thead>
      <template v-for="(item, index) in produceList" :key="index" >
        <tr>
          <td style="font-size: 15px;font-weight: bold;text-align: left" colspan="4">产品名称:<span>{{item.DeliveryDetail.productName}}</span></td>
          <td style="font-size: 15px;font-weight: bold;text-align: left" colspan="2">对方单号:</td>
          <td style="font-size: 15px;font-weight: bold;text-align: left" colspan="4">产品名称:
            <span v-if="company.productName!=='product_abbreviation'">{{item.productName}}</span>
            <span v-else >{{item.remarks}}</span>
          </td>
          <td v-if="company.showDeliveryCreator" style="font-size: 15px;font-weight: bold;text-align: left" colspan="2">订货日期:<span>{{delivery.contractId}}</span></td>
          <td v-else style="font-size: 15px;font-weight: bold;text-align: left" colspan="2"></td>
          <td style="font-size: 15px;font-weight: bold;text-align: left" colspan="3">订单编号:<span>{{item.DeliveryDetail.orderId}}</span></td>
        </tr>

        <tr class="day-in" v-for="(items, index1) in item.DeliveryDetailList" :key="index1">
          <td>{{items.order_number}}</td>
          <td>{{items.buildingNumber}}</td>
          <td colspan="1" style="font-size: 15px;font-weight: bold;" v-if="items.other_columns!=null&&(JSON.parse(items.other_columns).S02!=null)">{{JSON.parse(items.other_columns).S02}}</td>
          <td colspan="1" style="font-size: 15px;font-weight: bold;" v-if="company.showDeliveryCreator&&items.other_columns!=null&&(JSON.parse(items.other_columns).S02!=null)">{{JSON.parse(items.other_columns).S02}}</td>
          <td colspan="1" style="font-size: 15px;font-weight: bold;" v-else>{{items.width}}x{{items.height}}</td>
          <td>{{items.quantity}}</td>
          <td>{{items.compute_gross_area}}</td>
          <td>{{items.price}}</td>
          <td>{{items.gross_amount}}</td>
          <td colspan="2">{{items.processingNote}}</td>
          <td v-if="company.showDeliveryCreator" colspan="2">{{items.processingNote}}</td>
          <td v-if="!company.showDeliveryCreator" >{{items.processingNote}}</td>
          <td v-if="!company.showDeliveryCreator" >{{items.remarks}}</td>
        </tr>
        <tr class="day-in" >
          <td style="font-size: 15px;font-weight: bold;" colspan="3">小计:</td>
@@ -271,21 +286,30 @@

    </table>
    <el-row :gutter="20">
      <el-col :span="4"><div class="bottom">制单员：<span style="font-size: 10px">{{delivery.creator}}</span></div></el-col>
      <el-col :span="4"><div class="bottom">制单日期：<span style="font-size: 10px">{{delivery.createTime}}</span></div></el-col>
      <el-col :span="4"><div class="bottom">发货员：</div></el-col>
      <el-col :span="3"><div class="bottom">司机：</div></el-col>
      <el-col :span="4"><div class="bottom">客户签字：</div></el-col>
      <el-col :span="4"><div class="bottom">签收日期：</div></el-col>
      <el-col :span="4">制单员：<span style="font-size: 10px">{{delivery.creator}}</span></el-col>
      <el-col :span="4">制单日期：<span style="font-size: 10px">{{delivery.createTime}}</span></el-col>
      <el-col v-if="company.showDeliveryCreator" :span="4">发货员：</el-col>
      <el-col v-if="company.showDeliveryCreator" :span="3">司机：</el-col>
      <el-col v-if="company.showDeliveryCreator" :span="4">客户签字：</el-col>
      <el-col v-if="company.showDeliveryCreator" :span="4">签收日期：</el-col>

    </el-row>
    <el-row :gutter="20" style="margin-top: 20px;">
    <el-row :gutter="20" style="margin-top: 20px;" v-if="company.showDeliveryCreator">
      <el-col :span="4"><div class="bottom">架子&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;只</div></el-col>
      <el-col :span="20"><div class="bottom">{{takeCare}}</div></el-col>
    </el-row>
    <el-row :gutter="20" style="margin-top: 20px;">
    <el-row :gutter="20" style="margin-top: 20px;" v-if="company.showDeliveryCreator">
      <el-col :span="24"><div class="bottom">{{remark}}</div></el-col>
    </el-row>
    <el-row :gutter="20" style="margin-top: 20px;" v-if="!company.showDeliveryCreator">
<!--      <el-input
          v-model=""
          autosize
          type="textarea"
          placeholder="Please input"
      />-->
      <el-col :span="24"><div class="bottom">{{delivery.processingNote}}</div></el-col>
    </el-row>

    <el-dialog v-model="dialogVisible" style="width: 40%;height: 20%;margin-top: 10%" >
      <el-select v-model="selectedValues" style="width: 100%" @change="handleChange" multiple  placeholder="请选择">