look 3 vuotta sitten
vanhempi
commit
15e791a144
1 muutettua tiedostoa jossa 157 lisäystä ja 460 poistoa
  1. 157 460
      src/components/orderDetail/orderDetail.vue

+ 157 - 460
src/components/orderDetail/orderDetail.vue

@@ -1,18 +1,22 @@
 <template>
   <div class="orderDetail">
     <el-card class="box">
-      <div slot="header">
         <span class="box-header-title">
-          基本信息(<el-link type="primary" @click="openOrderStep">{{ form.orderCode }}
-          <span v-if="form.businessKind==3" style="display: inline-block;color: red">(补{{ form.rePrintIndex }})</span></el-link>)
+          基本信息(<el-link type="primary">{{ form.orderCode }}</el-link>)
           <el-link target="_blank" :href="form.originFileLink">{{ form.fileDescription }}</el-link>
           <el-button size="mini" @click="handleOrderPDFFiles(form.id)">下载pdf</el-button>
           <el-link target="_blank" :href="form.webProofFileLink">下载样稿文件</el-link>
         </span>
         <i class="box-header-icon el-icon-caret-top" @click="unfold($event,'basicInfo',2)"></i>
-      </div>
+
       <div class="box-content" id="basicInfo">
-        <el-row :gutter="20">
+        <el-row :gutter="10">
+          <el-col :span="6">
+            <div class="detailItem">
+              <label class="item_label">制单时间:</label>
+              <div class="item_content" v-if="form.createTime">{{ form.createTime | getTime }}</div>
+            </div>
+          </el-col>
           <el-col :span="6">
             <div class="detailItem">
               <label class="item_label">客户名称:</label>
@@ -21,530 +25,219 @@
           </el-col>
           <el-col :span="6">
             <div class="detailItem">
-              <label class="item_label">施工单号:</label>
-              <div class="item_content">{{ printBillCode }}</div>
+              <label class="item_label">产品类型:</label>
+              <div class="item_content">{{ form.productName }}</div>
             </div>
           </el-col>
           <el-col :span="6">
             <div class="detailItem">
-              <label class="item_label">制单时间:</label>
-              <div class="item_content" v-if="form.createTime">{{ form.createTime | getTime }}</div>
+              <label class="item_label">订单数量:</label>
+              <div class="item_content">
+                <span>{{ form.printQty }}</span>
+              </div>
             </div>
           </el-col>
-          <el-col :span="6">
+          <el-col :span="10">
             <div class="detailItem">
-              <label class="item_label">制单人:</label>
-              <div class="item_content">{{ form.createMan }}</div>
+              <label class="item_label">备注:</label>
+              <div class="item_content">{{ form.orderMemo }}</div>
             </div>
           </el-col>
-          <el-col :span="6">
+        </el-row>
+      </div>
+    </el-card>
+    <el-card class="box" style="margin-top: 10px">
+      <div slot="header">
+        <span class="box-header-title">产品信息</span>
+        <i class="box-header-icon el-icon-caret-top" @click="unfold($event,'deliverInfo',2)"></i>
+      </div>
+      <div class="box-content" id="deliverInfo">
+        <el-row :gutter="10">
+          <el-col style="height: 40px"  :span="4">
             <div class="detailItem">
-              <label class="item_label">产品类型:</label>
-              <div class="item_content">{{ form.productName }}</div>
+              <label class="item_label">成品联数:</label>
+              <div class="item_content">{{ form.receiptsCount }}</div>
             </div>
           </el-col>
-          <el-col :span="6">
+          <el-col style="height: 40px" :span="4">
             <div class="detailItem">
-              <label class="item_label">成品裁切:</label>
-              <div class="item_content">{{ form.cutKindStr }}
-                <!--              <span v-if="form.cutKind == 0"></span>-->
-              </div>
+              <label class="item_label">材料类型:</label>
+              <div class="item_content">{{ form.receiptsCount }}</div>
             </div>
           </el-col>
-          <el-col :span="6">
+          <el-col style="height: 40px" :span="4">
             <div class="detailItem">
-              <label class="item_label">印品名称:</label>
-              <div class="item_content">{{ form.orderName }}</div>
+              <label class="item_label">每本页数:</label>
+              <div class="item_content">{{ form.receiptsCount }}</div>
             </div>
           </el-col>
-          <el-col :span="6">
+          <el-col style="height: 40px" :span="4">
             <div class="detailItem">
-              <label class="item_label">印刷要求:</label>
-              <div class="item_content">{{ form.printRequire }}</div>
+              <label class="item_label">印刷颜色:</label>
+              <div class="item_content">{{ form.receiptsCount }}</div>
             </div>
           </el-col>
-          <el-col :span="6">
+          <el-col style="height: 40px" :span="15">
             <div class="detailItem">
-              <label class="item_label">交货时间:</label>
-              <div class="item_content" v-if="form.deliverDate">{{ form.deliverDate | getTime }}</div>
+              <label class="item_label">生产工艺:</label>
+              <div class="item_content">
+                <el-checkbox v-model="form.printCodeFlag" disabled>打码</el-checkbox>
+                <el-checkbox v-model="form.printCoverFlag" disabled>封面</el-checkbox>
+                <el-checkbox v-model="form.printMatFlag" disabled>加垫</el-checkbox>
+                <el-checkbox v-model="form.printNotCodeFlag" disabled>不打码</el-checkbox>
+                <el-checkbox v-model="form.printAllCoverFlag" disabled>封面全包</el-checkbox>
+              </div>
             </div>
           </el-col>
+        </el-row>
+      </div>
+    </el-card>
+    <el-card class="box">
+      <div slot="header">
+        <span class="box-header-title">报价信息</span>
+        <i class="box-header-icon el-icon-caret-top" @click="unfold($event,'produceInfo',2)"></i>
+      </div>
+      <div class="box-content" id="produceInfo">
+        <el-row :gutter="10">
+        <el-col :span="6">
+          <div class="detailItem">
+            <label class="item_label">数量:</label>
+            <div class="item_content">{{ form.printQty }}</div>
+            <div class="item_content">{{ form.printQtyUnit }}</div>
+          </div>
+        </el-col>
+        <el-col :span="6">
+          <div class="detailItem">
+            <label class="item_label">单价:</label>
+            <div class="item_content">{{ form.printPrice }}</div>
+          </div>
+        </el-col>
           <el-col :span="6">
             <div class="detailItem">
-              <label class="item_label">制作P数:</label>
-              <div class="item_content">{{ form.pageQty }}</div>
+              <label class="item_label">金额:</label>
+              <div class="item_content">{{ form.printMoneyTotal }}</div>
             </div>
           </el-col>
+        </el-row>
+        <el-row :gutter="10">
           <el-col :span="6">
             <div class="detailItem">
-              <label class="item_label">打包方式:</label>
-              <div class="item_content">
-                <span v-if="form.packKind == 0">均匀打包</span>
-                <span v-else-if="form.packKind == 1">按要求打包</span>
-              </div>
+              <label class="item_label">送货方式:</label>
+              <div class="item_content">{{ form.sendKind }}</div>
             </div>
           </el-col>
-          <el-col :span="6">
+          <el-col :span="15">
             <div class="detailItem">
-              <label class="item_label">包装要求:</label>
-              <div class="item_content">
-                <span>{{ form.boxRequire }}</span>
-              </div>
+              <label class="item_label">送货地址:</label>
+              <div class="item_content">{{ form.sendAddress }}</div>
             </div>
           </el-col>
-          <el-col :span="6" v-if="permissionFlag1">
+        </el-row>
+      </div>
+    </el-card>
+    <el-card class="box">
+      <div slot="header">
+        <span class="box-header-title">外发信息</span>
+        <i class="box-header-icon el-icon-caret-top" @click="unfold($event,'outInfo',2)"></i>
+      </div>
+      <div class="box-content" id="outInfo">
+        <el-row :gutter="10">
+          <el-col :span="20">
             <div class="detailItem">
-              <label class="item_label">订单金额:</label>
-              <div class="item_content">
-                <span>{{ form.orderMoneyTotal }}</span>
-              </div>
+              <label class="item_label">外发形式:</label>
+              <el-radio disabled  v-model="form.orderKind" label="0">常规</el-radio>
+              <el-radio disabled v-model="form.orderKind" label="1">销售</el-radio>
+              <el-radio disabled v-model="form.orderKind" label="2">自产</el-radio>
+              <el-radio disabled v-model="form.orderKind" label="3">外发</el-radio>
             </div>
           </el-col>
-          <el-col :span="18">
+          <el-col :span="6">
+            <div v-if="form.outWorkDept != null" class="detailItem">
+              <label class="item_label">外发部门:</label>
+              <div class="item_content">{{ form.outWorkDept }}</div>
+            </div>
+          </el-col>
+          <el-col :span="6">
+            <div v-if="form.outWorkFactory != null"  class="detailItem">
+              <label class="item_label">供应商:</label>
+              <div class="item_content">{{ form.outWorkFactory }}</div>
+            </div>
+          </el-col>
+        </el-row>
+        <el-row :gutter="10">
+          <el-col :span="6">
             <div class="detailItem">
-              <label class="item_label">付款方式:</label>
-              <div class="item_content">
-                <div v-for="item in payKind">
-                  <template >
-                    <span>{{ item[1] }} -- {{ item[2] }}</span><span v-if="item[3]"> -- {{ item[3] }}</span>
-                  </template>
-                </div>
-              </div>
+              <label class="item_label">外发数量:</label>
+              <div class="item_content">{{ form.outQty }}</div>
             </div>
           </el-col>
           <el-col :span="6">
             <div class="detailItem">
-              <label class="item_label">用纸要求:</label>
-              <div class="item_content">
-                <span v-if="form.paperRequireFlag == 0">无</span>
-                <span v-else-if="form.paperRequireFlag == 1">有</span>
-              </div>
+              <label class="item_label">外发单价:</label>
+              <div class="item_content">{{ form.outPrice }}</div>
             </div>
           </el-col>
           <el-col :span="6">
             <div class="detailItem">
-              <label class="item_label">订单数量:</label>
-              <div class="item_content">
-                <span>{{ form.orderQty }}</span>
-              </div>
+              <label class="item_label">外发金额:</label>
+              <div class="item_content">{{ form.outMoneyTotal }}</div>
             </div>
           </el-col>
-          <el-col :span="24">
+          <el-col :span="6">
             <div class="detailItem">
-              <label class="item_label">生产备注:</label>
-              <div class="item_content">{{ form.orderMemo }}</div>
+              <label class="item_label">外发运费:</label>
+              <div class="item_content">{{ form.outSendMoney }}</div>
             </div>
           </el-col>
-          <el-col :span="24">
+          <el-col :span="6">
             <div class="detailItem">
-              <label class="item_label">发货备注:</label>
-              <div class="item_content">{{ form.sendMemo }}</div>
+              <label class="item_label">交货日期:</label>
+              <div class="item_content">{{ form.sendDate }}</div>
             </div>
           </el-col>
-          <el-col :span="24">
+          <el-col :span="6">
             <div class="detailItem">
-              <label class="item_label">订单消息:</label>
-              <div class="item_content" style="height: 16px;line-height: 16px;overflow: hidden;">
-                <el-tooltip style=" margin: 10px;" :content="form.orderMessage" placement="top-start" effect="dark">
-                  <span>{{ form.orderMessage }}</span></el-tooltip>
-              </div>
+              <label class="item_label">提点:</label>
+              <div class="item_content">{{ form.outAddress }}</div>
             </div>
           </el-col>
-          <!--          <el-col :span="24">-->
-          <!--            <div class="detailItem">-->
-          <!--              <label class="item_label">发货备注:</label>-->
-          <!--              <div class="item_content">{{ form.sendMemo }}</div>-->
-          <!--            </div>-->
-          <!--          </el-col>-->
-          <el-col :span="24" v-if="form.packKind == 1">
+          <el-col :span="15">
             <div class="detailItem">
-              <label class="item_label">打包要求:</label>
-              <div class="item_content">{{ form.packRequire }}</div>
+              <label class="item_label">外发备注:</label>
+              <div class="item_content">{{ form.outMemo }}</div>
             </div>
           </el-col>
         </el-row>
-        <el-card class="box" style="margin-top: 10px">
-          <div slot="header">
-            <span class="box-header-title">发货信息</span>
-            <i class="box-header-icon el-icon-caret-top" @click="unfold($event,'deliverInfo',2)"></i>
-          </div>
-          <div class="box-content" id="deliverInfo">
-            <el-table
-              :data="deliverInform"
-              border
-              size="mini">
-              <el-table-column
-                label="收货人"
-                prop="linkMan">
-              </el-table-column>
-              <el-table-column
-                label="联系方式"
-                prop="linkPhone">
-              </el-table-column>
-              <el-table-column
-                label="发货方式"
-                prop="sendKind">
-              </el-table-column>
-              <!--              <el-table-column-->
-              <!--                label="送货区域"-->
-              <!--                prop="sendRegion">-->
-              <!--              </el-table-column>-->
-              <el-table-column
-                label="详细地址"
-                width="500">
-                <template slot-scope="{row}">
-                  <span>{{ row.sendProvince }}-{{ row.sendCity }}-{{ row.sendDistrict }}-{{ row.sendAddress }}</span>
-                </template>
-              </el-table-column>
-              <el-table-column
-                label="发货数量"
-                prop="needDeliverQty"></el-table-column>
-            </el-table>
-          </div>
-        </el-card>
-        <el-card class="box" style="margin-top: 10px">
-          <div slot="header">
-            <span class="box-header-title">部件信息</span>
-            <i class="box-header-icon el-icon-caret-top" @click="unfold($event,'partInfo',2)"></i>
-          </div>
-          <div class="box-content" id="partInfo" style="max-height: 200px;overflow-y: scroll" >
-            <div v-for="(ele,i) in partInfoList" style="line-height: 20px">
-              <label class="title-main">{{ ele.partName }}</label>
-              <template v-for="item in ele.paramValueList">
-                <span class="detailItem">
-                  <label class="item_label">{{ item.parameterName }}:</label>
-                  <span class="item_content">{{ item.paramDisplay }}</span>
-                </span>
-              </template>
-              <label style="margin-left: 10px">部件工艺</label>
-              <template v-for="item in ele.processList">
-                <span class="detailItem">
-                  <span class="item_content">{{ item.processName }} <span v-if="item.processMemo">({{item.processMemo}})</span><span v-if="item.materialName">{{item.materialName}}</span></span>
-                </span>
-              </template>
-            </div>
-            <!--            <div class="or-container">-->
-            <!--              <div class="boxItem" v-for="(ele,i) in form.partList" :key="i" @mouseenter="enter(i)" :class="eleindex ==i?'eleactive':''" >-->
-            <!--                <div class="box-title">-->
-            <!--                  <label class="title-main">{{ele.partName}}</label>-->
-            <!--                </div>-->
-            <!--                <div class="box-main">-->
-            <!--                  <template v-for="item in ele.paramValueList">-->
-            <!--                    <div class="detailItem">-->
-            <!--                    <label class="item_label">{{ item.parameterName}}:</label>-->
-            <!--                    <div class="item_content">{{ item.paramDisplay }}</div>-->
-            <!--                    </div>-->
-            <!--                  </template>-->
-            <!--                  <el-divider></el-divider>-->
-            <!--                  <template v-if="ele.processList.length>0">-->
-            <!--                    <label style="margin-left: 10px">部件工艺</label>-->
-            <!--                    <template v-for="item in ele.processList">-->
-            <!--                      <div class="detailItem">-->
-            <!--                        <div class="item_content">{{ item.processName }} <span v-if="item.processMemo">({{item.processMemo}})</span><span v-if="item.materialName">{{item.materialName}}</span></div>-->
-            <!--                      </div>-->
-            <!--                    </template>-->
-            <!--                  </template>-->
-            <!--                </div>-->
-            <!--              </div>-->
-            <!--            </div>-->
-          </div>
-        </el-card>
       </div>
     </el-card>
     <el-card class="box">
       <div slot="header">
-        <span class="box-header-title">生产信息</span>
-        <el-button v-if="permissionFlag1" size="mini" class="filter-item" type="primary" @click="handleMachine">
-          查看机台任务
-        </el-button>
-        <i class="box-header-icon el-icon-caret-top" @click="unfold($event,'produceInfo',2)"></i>
+        <span class="box-header-title">成本信息</span>
+        <i class="box-header-icon el-icon-caret-top" @click="unfold($event,'CostInfo',2)"></i>
       </div>
-      <div class="box-content" id="produceInfo">
-        <el-table
-          :data="produceInfoList"
-          max-height="150"
-          border
-          size="medium">
-          <el-table-column
-            prop="printBillCode"
-            width="110"
-            show-overflow-tooltip
-            label="施工单号">
-            <template slot-scope="{row}">
-                    <span @click.stop="getPrintBillStep(row.idPrintBill)" v-if="permissionFlag1"
-                          style="color: #409EFF;cursor: pointer" v-html="row.printBillCode"></span>
-                    <span v-else>{{row.printBillCode}}</span>
-            </template>
-          </el-table-column>
-          <el-table-column
-            prop="breedName"
-            width="115"
-            show-overflow-tooltip
-            label="版名称">
-            <template slot-scope="{row}">
-              <span v-if="permissionFlag1" @click.stop="handlePrintBillDetail(row.idPrintBill)" style="color: #409EFF;cursor: pointer;"> {{ row.breedName }}</span>
-              <span v-else> {{ row.breedName }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column
-            prop="machineInfoName"
-            width="120"
-            show-overflow-tooltip
-            label="机台名称">
-          </el-table-column>
-          <el-table-column
-            prop="composeTime"
-            label="组版时间"
-            show-overflow-tooltip
-            width="140">
-            <template slot-scope="{row}">
-              <span v-if="row.composeTime">{{ row.composeTime | getTime }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column
-            prop="pdfPlatedTime"
-            label="拼版时间"
-            show-overflow-tooltip
-            width="140">
-            <template slot-scope="{row}">
-              <span v-if="row.pdfPlatedTime">{{ row.pdfPlatedTime | getTime }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column
-            prop="psMadeTime"
-            label="制版时间"
-            show-overflow-tooltip
-            width="140">
-            <template slot-scope="{row}">
-              <span v-if="row.psMadeTime">{{ row.psMadeTime | getTime }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column
-            prop="cropPaperTime"
-            label="切白料时间"
-            show-overflow-tooltip
-            width="140">
-            <template slot-scope="{row}">
-              <span v-if="row.cropPaperTime">{{ row.cropPaperTime | getTime }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column
-            prop="printTime"
-            label="印刷下机时间"
-            show-overflow-tooltip
-            width="140">
-            <template slot-scope="{row}">
-              <span v-if="row.printTime">{{ row.printTime | getTime }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column
-            prop="breedMsg"
-            show-overflow-tooltip
-            label="版消息">
-          </el-table-column>
-        </el-table>
-      </div>
-    </el-card>
-    <el-tabs type="border-card" v-model="activeName">
-      <el-tab-pane label="外协信息" name="first">
-        <el-table
-          border
-          id="orderStockInfo"
-          :data="outAssistBillList"
-          size="medium">
-          <el-table-column
-            label="外协单号"
-            prop="billCode">
-          </el-table-column>
-          <el-table-column
-            prop="outAssistFactoryName"
-            label="外协厂">
-          </el-table-column>
-          <el-table-column
-            prop="containProcessStr"
-            label="外协工序">
-          </el-table-column>
-          <el-table-column
-            prop="billState"
-            label="外协单状态">
-            <template slot-scope="{row}">
-              <el-tag size="mini" type="primary" v-if="row.billState == 0">已开制</el-tag>
-              <el-tag size="mini" type="success" v-else-if="row.billState == 1">已下达</el-tag>
-              <el-tag size="mini" type="danger" v-else-if="row.billState == 2">已验收</el-tag>
-              <el-tag size="mini" type="danger" v-else-if="row.billState == 3">外协已审核</el-tag>
-            </template>
-          </el-table-column>
-          <el-table-column
-            prop="feedbackTimeLong"
-            label="反馈时间">
-            <template slot-scope="{row}">
-              <span v-if="row.feedbackTimeLong">{{ row.feedbackTimeLong | getLongTime }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column
-            prop="createTime"
-            label="创建时间">
-            <template slot-scope="{row}">
-              <span v-if="row.createTime">{{ row.createTime | getTime }}</span>
-            </template>
-          </el-table-column>
-          <!--          <el-table-column-->
-          <!--            label="工序数量">-->
-          <!--          </el-table-column>-->
-          <!--          <el-table-column-->
-          <!--            label="反馈数量">-->
-          <!--          </el-table-column>-->
-          <!--          <el-table-column-->
-          <!--            label="反馈人">-->
-          <!--          </el-table-column>-->
-          <!--          <el-table-column-->
-          <!--            label="反馈时间">-->
-          <!--          </el-table-column>-->
-        </el-table>
-      </el-tab-pane>
-      <el-tab-pane label="外加工信息" name="second">
-        <el-table size="medium" :data="craftInfoList" :row-style="customRowStyle" row-key="id"
-                  :tree-props="{children: 'processList', hasChildren: 'hasChildren'}">
-          <el-table-column prop="billCode" label="外协单号" width="173"></el-table-column>
-          <el-table-column prop="craftName" label="外协工序"></el-table-column>
-          <el-table-column prop="outAssistFactoryName" label="外加工厂"></el-table-column>
-          <el-table-column prop="feedbackGroupName" label="反馈组"></el-table-column>
-          <el-table-column prop="processState" label="工序状态">
-            <template slot-scope="{row}">
-              <span v-if="row.processState == 0">待排产</span>
-              <span v-else-if="row.processState == 1">待验收</span>
-              <span v-else-if="row.processState == 2">待生产</span>
-              <span v-else-if="row.processState == 3">待完工</span>
-              <span v-else-if="row.processState == 4">待流转</span>
-              <span v-else-if="row.processState == 10">已完成</span>
-            </template>
-          </el-table-column>
-          <el-table-column prop="processNum" label="工序数量"></el-table-column>
-          <el-table-column prop="feedbackNum" label="反馈数量"></el-table-column>
-          <el-table-column prop="scheduleIndex" label="工序排序"></el-table-column>
-          <el-table-column prop="completeTime" label="完成时间" width="160">
-            <template slot-scope="{row}">
-              <span v-if="row.completeTime">{{ row.completeTime | getTime }}</span>
-            </template>
-          </el-table-column>
-        </el-table>
-      </el-tab-pane>
-    </el-tabs>
-    <!--    <el-card class="box">-->
-    <!--      <div slot="header">-->
-    <!--        <span class="box-header-title">外协信息</span>-->
-    <!--        <i class="box-header-icon el-icon-caret-top" @click="unfold($event,'outInfo',2)"></i>-->
-    <!--      </div>-->
-    <!--      <div class="box-content" id="outInfo">-->
-    <!--        <el-table-->
-    <!--          border-->
-    <!--          :data="form.outAssistBillList"-->
-    <!--          size="medium">-->
-    <!--          <el-table-column-->
-    <!--            label="外协单号"-->
-    <!--          prop="orderCode">-->
-    <!--          </el-table-column>-->
-    <!--          <el-table-column-->
-    <!--            prop="outAssistFactoryName"-->
-    <!--            label="外协厂">-->
-    <!--          </el-table-column>-->
-    <!--          <el-table-column-->
-    <!--            prop="containProcessStr"-->
-    <!--            label="外协工序">-->
-    <!--          </el-table-column>-->
-    <!--          <el-table-column-->
-    <!--            prop="createTime"-->
-    <!--            label="创建时间">-->
-    <!--            <template slot-scope="{row}">-->
-    <!--              <span v-if="row.createTime">{{row.createTime | getTime}}</span>-->
-    <!--            </template>-->
-    <!--          </el-table-column>-->
-    <!--&lt;!&ndash;          <el-table-column&ndash;&gt;-->
-    <!--&lt;!&ndash;            label="工序数量">&ndash;&gt;-->
-    <!--&lt;!&ndash;          </el-table-column>&ndash;&gt;-->
-    <!--&lt;!&ndash;          <el-table-column&ndash;&gt;-->
-    <!--&lt;!&ndash;            label="反馈数量">&ndash;&gt;-->
-    <!--&lt;!&ndash;          </el-table-column>&ndash;&gt;-->
-    <!--&lt;!&ndash;          <el-table-column&ndash;&gt;-->
-    <!--&lt;!&ndash;            label="反馈人">&ndash;&gt;-->
-    <!--&lt;!&ndash;          </el-table-column>&ndash;&gt;-->
-    <!--&lt;!&ndash;          <el-table-column&ndash;&gt;-->
-    <!--&lt;!&ndash;            label="反馈时间">&ndash;&gt;-->
-    <!--&lt;!&ndash;          </el-table-column>&ndash;&gt;-->
-    <!--        </el-table>-->
-    <!--      </div>-->
-    <!--    </el-card>-->
-    <el-card class="box">
-      <div slot="header">
-        <span class="box-header-title">入库和发货</span>
-        <i class="box-header-icon el-icon-caret-top" @click="unfold($event,'orderStockInfo',2)"></i>
-      </div>
-      <div class="box-content">
-        <el-row :gutter="20">
-          <el-col :span="9">
-            <el-table
-              :header-cell-style="{background:'#eef1f6',color:'#606266'}"
-              border
-              size="mini"
-              :data="orderStockItemList">
-              <el-table-column
-                prop="boxCount"
-                label="包数">
-              </el-table-column>
-              <el-table-column
-                prop="boxDesc"
-                label="包数描述">
-              </el-table-column>
-              <el-table-column
-                prop="stockPlace"
-                label="库位">
-              </el-table-column>
-              <el-table-column
-                prop="inStockMan"
-                label="入库人">
-              </el-table-column>
-            </el-table>
+      <div class="box-content" id="CostInfo">
+        <el-row :gutter="10">
+          <el-col :span="6">
+            <div class="detailItem">
+              <label class="item_label">合计成本:</label>
+              <div class="item_content">{{ form.orderCost }}</div>
+            </div>
           </el-col>
-          <el-col :span="15">
-            <el-table
-              :header-cell-style="{background:'#eef1f6',color:'#606266'}"
-              border
-              size="mini"
-              :data="sendBillItemList">
-              <el-table-column
-                prop="sendMan"
-                label="物流/送货人">
-                <template slot-scope="{row}">
-                  <span v-if="row.logisticName">{{ row.logisticName }}</span>
-                  <span v-if="row.sendMan">-{{ row.sendMan }}</span>
-
-                </template>
-              </el-table-column>
-              <el-table-column label="送货司机电话" prop="sendManPhoneNum"></el-table-column>
-              <el-table-column
-                prop="logisticsCode"
-                label="货号">
-              </el-table-column>
-              <el-table-column
-                prop="sendDate"
-                width="164px"
-                label="发货时间">
-                <template slot-scope="{row}">
-                  <span v-if="row.sendDate">{{ row.sendDate | getTime }}</span>
-                </template>
-              </el-table-column>
-              <el-table-column
-                prop="sendBoxDesc"
-                label="包数">
-              </el-table-column>
-            </el-table>
+          <el-col :span="6">
+            <div class="detailItem">
+              <label class="item_label">毛利:</label>
+              <div class="item_content">{{ form.orderGrossProfit }}</div>
+            </div>
+          </el-col>
+          <el-col :span="6">
+            <div class="detailItem">
+              <label class="item_label">毛利率:</label>
+              <div class="item_content">{{ form.orderGrossProfitRate }}</div>
+            </div>
           </el-col>
         </el-row>
-
       </div>
     </el-card>
-    <order-step ref="orderStep" :append-to-body="true"></order-step>
-
     <el-dialog size="mini" title="PDF文件列表" :append-to-body="true" :visible.sync="dialogPdfVisible" width="560px">
       <el-table :data="gridDataPdf">
         <el-table-column
@@ -564,8 +257,6 @@
         </el-table-column>
       </el-table>
     </el-dialog>
-    <printbill-detail ref="printbillDetail"></printbill-detail>
-    <print-step ref="printStep"></print-step>
     <div v-show="machinefListVisible" style="width: 100%;position: fixed;left: 0px;height: 510px;z-index: 9999;background: #fff;bottom:0px;border-top: 1px solid #ddd;overflow-y: auto">
       <machinef-list @closeDrawer="closeDrawer" @searchList="searchList" ref="machinefList"></machinef-list>
     </div>
@@ -664,7 +355,6 @@ export default {
     },
     getInfo() {
       const _that = this
-      _that.checkPermission('order:orderMoneyTotal:admin')
       var data = {
         'idOrder': _that.idOrder
       }
@@ -858,6 +548,13 @@ export default {
   width: 100%;
   height: 100%;
 }
+.tip {
+  padding: 8px 16px;
+  background-color: #ecf8ff;
+  border-radius: 4px;
+  border-left: 5px solid #50bfff;
+  margin: 8px 0;
+}
 
 /*end*/