Browse Source

森语-搬运工对账单打印/事故处理单打印

jbb 2 years ago
parent
commit
be93a200a5
5 changed files with 23735 additions and 559 deletions
  1. 22861 1
      package-lock.json
  2. 209 38
      src/views/oa/modules/IncidentTicketModalDetail.vue
  3. 99 0
      src/views/oa/modules/SyCarryDetailModal.vue
  4. 5 2
      vue.config.js
  5. 561 518
      yarn.lock

File diff suppressed because it is too large
+ 22861 - 1
package-lock.json


+ 209 - 38
src/views/oa/modules/IncidentTicketModalDetail.vue

@@ -10,6 +10,7 @@
     >
     <template #footer>
         <a-button  @click="handleCancel" style="margin-left: 8px;">取消</a-button>
+        <a-button @click="handlePrint" style="margin-left: 8px;">打印</a-button>
         <a-button  type="primary"  @click="addNotice" style="margin-left: 8px;" :disabled="!(formState.state=='1')">通知</a-button>
         <a-popconfirm title="确定反馈通知吗?" ok-text="是" cancel-text="否" @confirm="feedbackNotice" @cancel="handleCancelPop('visibleFk')" :visible="visibleFk">
           <a-button  type="primary"   style="margin-left: 8px;" :disabled="!(formState.state=='2')" @click="()=>visibleFk = true">反馈通知</a-button>
@@ -21,41 +22,163 @@
           <a-button  type="primary"   style="margin-left: 8px;" :disabled="!(formState.state=='3'|| formState.state=='4')" @click="()=>visibleWj = true">完结</a-button>
         </a-popconfirm>
       </template>
+
+
+      <div class="col-md-6 column" style="display: none;" id="printBox">
+             <h1 style="text-align: center;">质量事故处理单</h1>
+              <table class="table table-bordered" style="border:2px solid #999">    
+                        <thead>
+                        </thead>
+                        <tbody>
+                                <tr>
+                                    <td class="tdOne">日期</td>
+                                    <td class="tdTwo"> {{ formState.accidentData }}</td>
+                                    <td class="tdOne">质量事故单号</td>
+                                    <td class="tdTwo">{{ formState.accidentNumber }}</td>
+                                    <td class="tdOne">质量事故主题</td>
+                                    <td class="tdTwo">{{ formState.accidentTheme }}</td>
+                                </tr>
+                            <tr>
+                                <td class="tdOne">客户</td>
+                                <td class="tdTwo" >{{formState.customer  }}</td>
+                                <td class="tdOne">工厂</td>
+                                <td class="tdTwo" >{{ formState.factory}}</td>
+                                <td class="tdOne">责任单位</td>
+                                <td class="tdTwo" >{{ formState.responsibilityCompany }}</td>
+                            </tr>
+                            <tr>
+                                <td class="tdOne">责任人1</td>
+                                <td class="tdOne">{{ formState.responsibilityPerson1 }}</td>
+                                <td class="tdOne">责任人2</td>
+                                <td class="tdOne">{{ formState.responsibilityPerson2 }}</td>
+                                <td class="tdOne">责任人3</td>
+                                <td class="tdOne">{{ formState.responsibilityPerson3 }}</td>
+                            </tr>
+                            <tr>
+                              <td class="tdOne">金额1</td>
+                                <td class="tdOne">{{ formState.sum1 }}</td>
+                                <td class="tdOne">金额2</td>
+                                <td class="tdOne">{{ formState.sum2 }}</td>
+                                <td class="tdOne">金额3</td>
+                                <td class="tdOne">{{ formState.sum3 }}</td>
+                            </tr>
+                            <tr>
+                                <td class="tdOne">总金额</td>
+                                <td class="tdOne">{{ formState.totalMoney }}</td>
+                                <td class="tdOne">业务类型</td>
+                                <td class="tdOne">{{ formState.businessType }}</td>
+                                <td class="tdOne"></td>
+                                <td class="tdOne"></td>
+                            </tr>
+
+                            <tr>
+                                <td class="tdOne">成衣销售订单号</td>
+                                <td class="tdOne">{{ formState.garmentSalesOrder }}</td>
+                                <td class="tdOne">款号</td>
+                                <td class="tdOne">{{ formState.styleNumber }}</td>
+                                <td class="tdOne">物料</td>
+                                <td class="tdOne">{{ formState.material }}</td>
+                            </tr>
+                            <tr>
+                                <td class="tdOne">计划员</td>
+                                <td class="tdOne">{{ formState.planPersonnel }}</td>
+                                <td class="tdOne">业务员</td>
+                                <td class="tdOne">{{ formState.businessPeople }}</td>
+                                <td class="tdOne">QC</td>
+                                <td class="tdOne">{{ formState.qualityControl }}</td>
+                            </tr>
+                            <tr style="height: 50px;">
+                                <td class="tdOne" rowspan="3">情况说明</td>
+                                <td class="tdOne" colspan="5" rowspan="3">{{ formState.presentationCondition }}</td>
+                            </tr>
+                        </tbody>
+                    </table>
+                    <table class="table table-bordered" style="margin-top: 2%;border:2px solid #999">    
+                        <thead>
+                           <th>计划单号</th>
+                           <th>事故类型</th>
+                           <th>币种</th>
+                           <th>事故金额</th>
+                           <th>汇率</th>
+                           <th>实际事故金额</th>
+                           <th>U8生成运费发票号</th>
+                           <th>账套号</th>
+                           <th>备注</th>
+                        </thead>
+                        <tbody>
+                               <tr v-for="(item, key) in incidentTicketChildrenTable.dataSource">
+                                  <td>{{item.planNumber}}</td>
+                                  <td>{{item.accidentType}}</td>
+                                  <td>{{item.moneyType}}</td>
+                                  <td>{{item.accidentSum}}</td>
+                                  <td>{{item.exchangeRate}}</td>
+                                  <td>{{item.practicalSum}}</td>
+                                  <td>{{item.u8Invoice}}</td>
+                                  <td>{{item.zhanghaoId}}</td>
+                                  <td>{{item.remark}}</td>
+                                  
+                              </tr>
+                        </tbody>
+                    </table>
+                    <table class="table table-bordered" style="margin-top: 2%;border:2px solid #999">    
+                        <thead>
+                        </thead>
+                        <tbody>
+                            <tr style="height: 50px;">
+                                <td class="tdOne" style="width: 1%;">财务备注</td>
+                                <td class="tdOne" colspan="7" >{{formState.financeRemark}}</td>
+                            </tr>
+                        </tbody>
+                    </table>
+                    <div style="display: flex;justify-content: space-around;margin-top: 2%;">
+                       <span>填报人:{{ formState.informant }}</span>
+                       <span>通知人:{{ formState.Noticer }}</span>
+                    </div>
+              </div>
       <a-spin :spinning="confirmLoading">
-      <div class="table-page-search-wrapper">
-        <div >
-        <a-form-model layout="inline" ref="form" :model="formState" :rules="validatorRules" labelAlign="right">
+      <div class="table-page-search-wrapper" >
+        <div>
+        <a-form-model layout="inline" ref="form" :model="formState" :rules="validatorRules" labelAlign="right" class="kk">
           <a-row :gutter="24">
           <a-col :span="8" >
             <a-form-model-item label="日期" prop="accidentData" >
-              <a-input v-model="formState.accidentData"    placeholder="请输入" readOnly></a-input>
+              <a-input v-model="formState.accidentData"    placeholder="请输入" readOnly  v-show='showSelect==0'></a-input>
+              <span  v-show='showSelect==1'>  {{ formState.accidentData }}</span>
+            
             </a-form-model-item>
           </a-col>
           <a-col :span="8" >
             <a-form-model-item label="质量事故单主题" prop="accidentTheme">
-              <a-input v-model="formState.accidentTheme"   placeholder="请输入" readOnly></a-input>
+              <a-input v-model="formState.accidentTheme"   placeholder="请输入" readOnly v-show='showSelect==0'></a-input>
+              <span v-show='showSelect==1'>{{ formState.accidentTheme }}</span>
             </a-form-model-item>
           </a-col>
           <a-col :span="8">
             <a-form-model-item label="质量事故单号" prop="accidentNumber">
-              <a-input v-model="formState.accidentNumber"   placeholder="请输入" readOnly></a-input>
+              <a-input v-model="formState.accidentNumber"   placeholder="请输入" readOnly v-show='showSelect==0'></a-input>
+              <span v-show='showSelect==1'>{{ formState.accidentNumber }}</span>
+              
             </a-form-model-item>
           </a-col>
           </a-row>
           <a-row :gutter="24">
           <a-col :span="8" >
             <a-form-model-item label="客户" prop="customer" >
-              <a-input v-model="formState.customer"    placeholder="请输入" readOnly></a-input>
+              <a-input v-model="formState.customer"    placeholder="请输入" readOnly v-show='showSelect==0'></a-input>
+              <span v-show='showSelect==1'> {{formState.customer  }}</span>
+             
             </a-form-model-item>
           </a-col>
           <a-col :span="8" >
             <a-form-model-item label="工厂(事故发生地)" prop="factory">
-              <a-input v-model="formState.factory"   placeholder="请输入" readOnly></a-input>
+              <a-input v-model="formState.factory"   placeholder="请输入" readOnly v-show='showSelect==0'></a-input>
+              <span v-show='showSelect==1'>{{ formState.factory}}</span>
             </a-form-model-item>
           </a-col>
           <a-col :span="8" >
             <a-form-model-item label="责任单位" prop="responsibilityCompany">
-              <a-input v-model="formState.responsibilityCompany"   placeholder="请输入" readOnly></a-input>
+              <a-input v-model="formState.responsibilityCompany"   placeholder="请输入" readOnly v-show='showSelect==0'></a-input>
+              <span v-show='showSelect==1'> {{ formState.responsibilityCompany }}</span>
             </a-form-model-item>
           </a-col>
           
@@ -65,47 +188,57 @@
             <a-col :span="6" >
             <a-form-model-item label="责任人1" prop="responsibilityPerson1" >
               <j-search-select-tag v-model="formState.responsibilityPerson1" placeholder="" 
-                   dict="sys_user,realname,username" @search="searchName" :disabled="true"/>
+                   dict="sys_user,realname,username" @search="searchName" :disabled="true" v-show='showSelect==0'/>
+                   <span v-show='showSelect==1'>{{ formState.responsibilityPerson1 }}</span>
             </a-form-model-item>
           </a-col>
           <a-col :span="6" >
             <a-form-model-item label="责任人2" prop="responsibilityPerson2" >
               <j-search-select-tag v-model="formState.responsibilityPerson2" placeholder="" 
-                   dict="sys_user,realname,username" @search="searchName"  :disabled="true"/>
+                   dict="sys_user,realname,username" @search="searchName"  :disabled="true" v-show='showSelect==0'/>
+                   <span v-show='showSelect==1'>{{ formState.responsibilityPerson2 }}</span>
+
             </a-form-model-item>
           </a-col>
           <a-col :span="6" >
             <a-form-model-item label="责任人3" prop="responsibilityPerson3">
               <j-search-select-tag v-model="formState.responsibilityPerson3" placeholder="" 
-                   dict="sys_user,realname,username" @search="searchName" :disabled="true"/>
+                   dict="sys_user,realname,username" @search="searchName" :disabled="true" v-show='showSelect==0'/>
+                   <span v-show='showSelect==1'>{{ formState.responsibilityPerson3 }}</span>
+
             </a-form-model-item>
           </a-col>
-          <a-col :span="6" >
+          <a-col :span="6" class="noprint">
             <a-form-model-item label="责任人4" prop="responsibilityPerson4">
               <j-search-select-tag v-model="formState.responsibilityPerson4" placeholder="" 
-                   dict="sys_user,realname,username" @search="searchName" :disabled="true"/>
+                   dict="sys_user,realname,username" @search="searchName" :disabled="true" />
             </a-form-model-item>
           </a-col>
           </a-row>
           <a-row :gutter="24">
             <a-col :span="6" >
             <a-form-model-item label="金额1" prop="sum1" >
-              <a-input v-model="formState.sum1"   placeholder="请输入" readOnly></a-input>
+              <a-input v-model="formState.sum1"   placeholder="请输入" readOnly v-show='showSelect==0'></a-input>
+              <span v-show='showSelect==1'>{{ formState.sum1 }}</span>
+
             </a-form-model-item>
           </a-col>
           <a-col :span="6" >
             <a-form-model-item label="金额2" prop="sum2" >
-              <a-input v-model="formState.sum2"    placeholder="请输入" readOnly></a-input>
+              <a-input v-model="formState.sum2"    placeholder="请输入" readOnly v-show='showSelect==0'></a-input>
+              <span v-show='showSelect==1'>{{ formState.sum2}}</span>
             </a-form-model-item>
           </a-col>
           <a-col :span="6" >
             <a-form-model-item label="金额3" prop="sum3">
-              <a-input v-model="formState.sum3"   placeholder="请输入" readOnly></a-input>
+              <a-input v-model="formState.sum3"   placeholder="请输入" readOnly v-show='showSelect==0'></a-input>
+              <span v-show='showSelect==1'>{{ formState.sum3 }}</span>
             </a-form-model-item>
           </a-col>
-          <a-col :span="6" >
-            <a-form-model-item label="金额4" prop="sum4">
-              <a-input v-model="formState.sum4"   placeholder="请输入" readOnly></a-input>
+          <a-col :span="6" class="noprint">
+            <a-form-model-item label="金额4" prop="sum4" >
+              <a-input v-model="formState.sum4"   placeholder="请输入" readOnly v-show='showSelect==0'></a-input>
+              <span v-show='showSelect==1'>{{ formState.sum4 }}</span>
             </a-form-model-item>
           </a-col>
           </a-row>
@@ -118,12 +251,15 @@
           </a-col> -->
           <a-col :span="8" >
             <a-form-model-item label="总金额" prop="totalMoney" >
-              <a-input v-model="formState.totalMoney"    placeholder="请输入" readOnly></a-input>
+              <a-input v-model="formState.totalMoney"    placeholder="请输入" readOnly v-show='showSelect==0'></a-input>
+              <span v-show='showSelect==1'>{{ formState.totalMoney }}</span>
             </a-form-model-item>
           </a-col>
           <a-col :span="8" >
             <a-form-model-item label="业务类型" prop="businessType">
-              <a-input v-model="formState.businessType"   placeholder="请输入" readOnly></a-input>
+              <a-input v-model="formState.businessType"   placeholder="请输入" readOnly v-show='showSelect==0'></a-input>
+              <span v-show='showSelect==1'>{{ formState.businessType }}</span>
+
             </a-form-model-item>
           </a-col>
           
@@ -131,17 +267,23 @@
           <a-row :gutter="24">
             <a-col :span="8" >
             <a-form-model-item label="成衣销售订单号" prop="garmentSalesOrder">
-              <a-input v-model="formState.garmentSalesOrder"   placeholder="请输入" readOnly></a-input>
+              <a-input v-model="formState.garmentSalesOrder"   placeholder="请输入" readOnly v-show='showSelect==0'></a-input>
+              <span v-show='showSelect==1'>{{ formState.garmentSalesOrder }}</span>
+              
             </a-form-model-item>
           </a-col>
           <a-col :span="8" >
             <a-form-model-item label="款号" prop="styleNumber" >
-              <a-input v-model="formState.styleNumber"    placeholder="请输入" readOnly></a-input>
+              <a-input v-model="formState.styleNumber"    placeholder="请输入" readOnly v-show='showSelect==0'></a-input>
+              <span v-show='showSelect==1'>{{ formState.styleNumber }}</span>
+
             </a-form-model-item>
           </a-col>
           <a-col :span="8" >
             <a-form-model-item label="物料" prop="material">
-              <a-input v-model="formState.material"   placeholder="请输入" readOnly></a-input>
+              <a-input v-model="formState.material"   placeholder="请输入" readOnly v-show='showSelect==0'></a-input>
+              <span v-show='showSelect==1'>{{ formState.material }}</span>
+
             </a-form-model-item>
           </a-col>
          
@@ -149,26 +291,32 @@
           <a-row :gutter="24">
             <a-col :span="8" >
             <a-form-model-item label="计划员" prop="planPersonnel">
-              <a-input v-model="formState.planPersonnel"   placeholder="请输入" readOnly></a-input>
+              <a-input v-model="formState.planPersonnel"   placeholder="请输入" readOnly v-show='showSelect==0'></a-input>
+              <span v-show='showSelect==1'>{{ formState.planPersonnel }}</span>
+
             </a-form-model-item>
           </a-col>
           <a-col :span="8" >
             <a-form-model-item label="业务员" prop="businessPeople" >
               <j-search-select-tag v-model="formState.businessPeople" placeholder="" 
-                   dict="sys_user,realname,username" @search="searchName" :disabled="true"/>
+                   dict="sys_user,realname,username" @search="searchName" :disabled="true" v-show='showSelect==0'/>
+              <span v-show='showSelect==1'>{{ formState.businessPeople }}</span>
             </a-form-model-item>
           </a-col>
           <a-col :span="8" >
             <a-form-model-item label="QC" prop="qualityControl">
               <j-search-select-tag v-model="formState.qualityControl" placeholder="" 
-                   dict="sys_user,realname,username" @search="searchName" :disabled="true"/>
+                   dict="sys_user,realname,username" @search="searchName" :disabled="true" v-show='showSelect==0'/>
+              <span v-show='showSelect==1'>{{ formState.qualityControl }}</span>
+
             </a-form-model-item>
           </a-col>
           </a-row>
           <a-row :gutter="24">
           <a-col :span="24" style="height: 290px;">
             <a-form-model-item label="情况说明" prop="presentationCondition" class="fff">
-              <a-input v-model="formState.presentationCondition"  type="textarea"  placeholder="请输入" readOnly></a-input>
+              <a-input v-model="formState.presentationCondition"  type="textarea"  placeholder="请输入" readOnly v-show='showSelect==0'></a-input>
+              <a-input  v-text="formState.presentationCondition"  type="textarea"  placeholder="请输入"  v-show='showSelect==1'></a-input>
             </a-form-model-item>
           </a-col>
           </a-row>
@@ -181,8 +329,8 @@
            bordered
           :columns="incidentTicketChildrenTable.columns"
           :data-source="incidentTicketChildrenTable.dataSource"
-         :loading="incidentTicketChildrenTable.loading"
-         :scroll="{x: 1500,y:300 }"
+          :loading="incidentTicketChildrenTable.loading"
+          :scroll="{x: 1500,y:300 }"
           :pagination="false"
             >
           <!-- 汇率 -->
@@ -209,12 +357,12 @@
             <!-- 主表单区域 -->
         <a-form-model layout="inline" ref="form" :model="formState" :rules="validatorRules">
           <a-row :gutter="24">
-            <a-col :span="12" >
+            <a-col :span="12" class="noprint" >
             <a-form-model-item label="附件上传" prop="accessory" class="ff">
               <j-upload  v-model="accessory"  :disabled="true"></j-upload>
             </a-form-model-item>
           </a-col>
-            <a-col :span="12" >
+            <a-col :span="12"  class="noprint">
               <a-form-model-item label="工厂签章" prop="factorySignature" class="ff">
               <j-upload  v-model="factorySignature"  :disabled="true"></j-upload>
             </a-form-model-item>
@@ -224,27 +372,30 @@
           <a-row :gutter="24">
           <a-col :span="24" style="height: 230px;">
             <a-form-model-item label="财务备注" prop="financeRemark" class="caiwu">
-              <a-input v-model="formState.financeRemark"  type="textarea"  placeholder="请输入" readOnly></a-input>
+              <a-input v-model="formState.financeRemark"  type="textarea"  placeholder="请输入" readOnly v-show='showSelect==0'></a-input>
+              <a-input v-text="formState.financeRemark"  type="textarea"   readOnly v-show='showSelect==1'></a-input>
             </a-form-model-item>
           </a-col>          
           </a-row>
           <a-row :gutter="24">
-            <a-col :span="12">
-            <a-form-model-item label="财务添加附件" prop="accessory2" class="ff">
+            <a-col :span="12" class="noprint">
+            <a-form-model-item label="财务添加附件" prop="accessory2" class="ff ">
               <j-upload  v-model="accessory2"  ></j-upload>
               <!-- <a-input v-model="formState.accessory2"  placeholder="请输入"></a-input> -->
             </a-form-model-item>
           </a-col>
           <a-col :span="10">
             <a-form-model-item label="通知人" prop="Noticer">
-              <a-input v-model="formState.Noticer"  placeholder="请输入"></a-input>
+              <a-input v-model="formState.Noticer"  placeholder="请输入" v-show='showSelect==0'></a-input>
+              <span v-show='showSelect==1'>{{ formState.Noticer }}</span>
             </a-form-model-item>
           </a-col>
           </a-row>
           <a-row :gutter="24">
             <a-col :span="8" >
             <a-form-model-item label="填报人" prop="informant">
-              <a-input v-model="formState.informant"   placeholder="请输入" readOnly></a-input>
+              <a-input v-model="formState.informant"   placeholder="请输入" readOnly v-show='showSelect==0'></a-input>
+              <span v-show='showSelect==1'>{{ formState.informant}}</span>
             </a-form-model-item>
           </a-col>
           
@@ -294,6 +445,7 @@
           span: 20
         },
         formState:{},
+        showSelect:0,
         confirmLoading:false,
         visibleFk:false,
         visibleTs:false,
@@ -628,6 +780,25 @@
         if(data=='visibleFk') this.visibleFk = false
         if(data=='visibleTs') this.visibleTs = false
         if(data=='visibleWj') this.visibleWj = false
+      },
+      handlePrint(){
+        this.showSelect = 1
+        this.$nextTick(() => {
+        const html = window.document.getElementById('printBox').innerHTML 
+         const win = window.open();
+         const style = '<style>\n'
+         + 'table{width: 100% !important;border-collapse: collapse;border-spacing: 0;overflow-x:hidden;}\n'
+         + 'th,td{width:5%;height: 18px;border: 1px solid #999;font-size: 12px;color: #333;max-width:2000px;text-align: center;}\n'
+         + 'th{color: #333}\n'
+         +'@media print{@page {size:landscape}}'
+         + '</style>';;
+         win.document.write(style+html);
+         win.focus();
+         win.print();
+         this.showSelect = 0
+        })
+      
+
       },
       // getAllTable() {
       //   let values = this.tableKeys.map(key => getRefPromise(this, key))

+ 99 - 0
src/views/oa/modules/SyCarryDetailModal.vue

@@ -13,6 +13,7 @@
         <a-button  type="primary">导入</a-button>
       </a-upload> -->
       <a-button @click="handleCancel" style="margin-left: 8px;">关闭</a-button>
+      <a-button @click="handlePrint" style="margin-left: 8px;">打印</a-button>
     </template>
     <div class="table-page-search-wrapper">
       <a-form-model layout="inline" ref="form" :model="formState" :rules="validatorRules">
@@ -80,9 +81,11 @@
       </a-form> -->
 
       <!-- 子表单区域 -->
+      
       <a-tabs v-model="activeKey" @change="handleChangeTabs">
         <a-tab-pane tab="搬运工对账单" :key="refKeys[0]" :forceRender="true">
           <!-- <a-button type="primary"  @click="addList">增行</a-button> -->
+          <div id="fabricLossTable">
         <a-table
         bordered
         :columns="syCarryBTable.columns"
@@ -101,6 +104,7 @@
            </a-popconfirm>
           </span>
         </a-table>
+        </div>
         
           <!-- <j-editable-table
             :ref="refKeys[0]"
@@ -367,6 +371,101 @@
         this.zhuId = ''
         this.$emit('close')
       },
+       randomNumber() {
+          return parseInt(Math.random() * 101);
+        },
+
+         tableNumber(n, m,win) {
+          win.document.write("<table>");
+          for (var j = 1; j <= n; j++) {
+            win.document.write("<tr>");
+            for (var i = 1; i <= m; i++) {
+              win.document.write("<td>" + this.randomNumber() + "</td>");
+            }
+            win.document.write("</tr>");
+            win.document.write("</table>");
+        }
+          },
+          
+      handlePrint(){
+        const cloumn = this.syCarryBTable.columns
+        var data = this.syCarryBTable.dataSource
+        //增加合计行
+        data.push({
+          orderDate:'合计',
+          invoiceNo:'',
+          saleInvoiceNo:'',
+          allNum:'',
+          cabinets:'',
+          detailedNum:'合计大写',
+          totalPrice:'',
+          coatHanger:'',
+          price:'',
+          reason:'',
+          demo:'',
+          jhyName:'',
+          containerNo:this.formState.totalText,
+          jhyNameData:this.formState.totalNum
+
+        })
+        const win = window.open();
+        win.document.write("<span class='work'>");
+        win.document.write(this.formState.demo);
+        win.document.write("</span>");
+        win.document.write("<h1>");
+        win.document.write('宁波马菲羊纺织科技有限公司名称');
+        win.document.write("</h1>");
+        // 给table头
+        win.document.write("<table>");
+        for (var i = 0; i <data.length ; i++) { //外层循环 作用行
+          // 给表的行rows 头
+          if(i==0){
+            win.document.write("<tr>");
+            for (var j = 0; j < cloumn.length; j++) { //内层循环 作用列
+              // 给表的列columns 头
+              if(j !== cloumn.length-1){
+                win.document.write("<td>");  
+                win.document.write(cloumn[j].title);
+                // 给表的列columns 尾
+                win.document.write("</td>");
+                  }
+                }
+          }else{
+            for (var j = 0; j < cloumn.length-1; j++) { //内层循环 作用列
+              var cc = cloumn[j].dataIndex
+              var dd = data[i][cc]
+              win.document.write("<td>");
+              win.document.write(dd);
+              // 给表的列columns 尾
+              win.document.write("</td>"); 
+            }  
+          }
+              
+          // 给表的行rows 尾
+          win.document.write("</tr>");
+        }
+        // 给table尾
+        win.document.write("</table>");
+        win.document.write("<span class='workFooter'>");
+        win.document.write('备注:'+this.formState.remarks);
+        win.document.write("</span>");
+        win.document.write("<div class='workFooter1'>");
+        win.document.write('审批:');
+        win.document.write("</div>");
+        const style = '<style>\n'
+         +'.noprint{display:none}'
+         + 'table{width: 100% !important;border-collapse: collapse;border-spacing: 0;overflow-x:hidden;}\n'
+         + 'th,td{width:5%;border: 1px solid;text-align: center}\n'
+         + 'h1{text-align: center}\n'
+         + '.work{display: block;text-align: center}\n'
+         + '.workFooter{display: block;margin-top: 2%;}\n'
+         + '.workFooter1{width: 10%;float: right;margin-top: 2%;}\n'
+         + '</style>';
+        win.document.write(style);
+        win.focus();
+        win.print();
+        win.close();
+      }
     }
   }
 </script>

+ 5 - 2
vue.config.js

@@ -77,8 +77,11 @@ module.exports = {
       '/jeecg-boot': {
         // target: 'http://127.0.0.1:8090', // 请求本地 需要jeecg-boot后台项目
         // target: 'http://106.15.206.14:8087', // 测试环境
-        target: 'http://220.191.168.86:18087', // 森语外网
-        // changeOrigin: true
+        // target: 'http://220.191.168.86:18087', // 森语外
+        // target: 'http://10.0.0.74:8090', // 
+        target: 'http://10.0.0.34:8090', 
+        
+        changeOrigin: true
       }
     }
   },

File diff suppressed because it is too large
+ 561 - 518
yarn.lock


Some files were not shown because too many files changed in this diff