caojunjie пре 4 година
родитељ
комит
81782cc6a8

+ 0 - 1
src/combination/listComponent.vue

@@ -163,7 +163,6 @@
         <el-button type="primary" @click="save">确 定</el-button>
       </span>
     </el-dialog>
-    {{listStyle}}
   </div>
 </template>
 

+ 72 - 71
src/views/purchaseIssue/index.vue

@@ -87,70 +87,71 @@
       ref="ApprovalComments"
       @refreshDataList="returnData"
     ></approval-comments>
-
-    <el-dialog
-      :visible.sync="dialogVisible"
-      :fullscreen="true"
-      width="70%"
-      style="background-color: #1c84c6"
-    >
-      <div ref="print">
-        <h1 style="text-align: center;font-weight:bold">{{ formList.fsbuName }}</h1>
-        <div style="display: flex;justify-content: space-between;margin-bottom: 10px">
-          <div style="width: 200px;height: 20px;font-size: 14px;">客户项目:{{projectName}}</div>
-          <div style="width: 200px;height: 20px;font-size: 14px;">出库日期:{{formList.fBsdate}}</div>
-        </div>
-        <div style="display: flex;justify-content: space-between;margin-bottom: 10px">
-          <div style="width: 200px;height: 20px;font-size: 14px;">录入人:{{formList.createBy}}</div>
-          <div style="width: 200px;height: 20px;font-size: 14px;">公司电话:{{formList.fsbuTel}}</div>
-          <div style="width: 200px;height: 20px;font-size: 14px;">编号:{{formList.fBillno}}</div>
-        </div>
-        <table class="table table-striped table-bordered" align="center" valign="center">
-          <tr>
-            <td class="column" style="width: 8%;">行号</td>
-            <td class="column" style="width: 20%;">物料名称</td>
-            <td class="column" style="width: 10%;">规格型号</td>
-            <td class="column" style="width: 8%;">单位</td>
-            <td class="column" style="width: 10%;">数量</td>
-            <td class="column" style="width: 10%;">单价</td>
-            <td class="column" style="width: 10%;">金额</td>
-            <td class="column" style="width: 10%;">备注</td>
-          </tr>
-          <tr v-for="(item,index) in contentList" :key="index">
-            <td class="column">{{ index+1 }}</td>
-            <td class="column">{{ item.feeName }}</td>
-            <td class="column"></td>
-            <td class="column">{{item.fFeeunitName}}</td>
-            <td class="column">{{ item.fQty }}</td>
-            <td class="column">{{ item.fUnitprice }}</td>
-            <td class="column">{{ item.fAmount }}</td>
-            <td class="column">{{ item.remark }}</td>
-          </tr>
-<!--          <tr>-->
-<!--            <td class="column" colspan="2">大写金额:</td>-->
-<!--            <td class="column" colspan="2" style="text-align: left">100亿元</td>-->
-<!--            <td class="column">总金额:</td>-->
-<!--            <td class="column" colspan="3">{{formList.fMoney}}</td>-->
-<!--          </tr>-->
-        </table>
-        <table class="table table-striped table-bordered" align="center" valign="center">
-          <tr>
-            <td class="column" colspan="2" style="border-top: none;width: 15%;">大写总金额:</td>
-            <td class="column" colspan="2" style="text-align: left;border-top: none;width: 40%;"></td>
-            <td class="column" style="border-top: none; width: 15%;">小写总金额:</td>
-            <td class="column" colspan="3" style="border-top: none;text-align: left;width: 30%;">{{formList.fMoney}}</td>
-          </tr>
-        </table>
-        <div style="display: flex;justify-content: space-between;margin-top: 20px">
-          <div style="width: 200px;height: 20px;font-size: 14px;">发货人:</div>
-          <div style="width: 200px;height: 20px;font-size: 14px;">收货:</div>
+    <div class="print_div">
+      <el-dialog
+        :visible.sync="dialogVisible"
+        :fullscreen="true"
+        width="70%"
+        style="background-color: #1c84c6"
+      >
+        <div ref="print">
+          <h1 style="text-align: center;font-weight:bold">{{ formList.fsbuName }}</h1>
+          <div style="display: flex;justify-content: space-between;margin-bottom: 10px">
+            <div style="width: 200px;height: 20px;font-size: 14px;">客户项目:{{projectName}}</div>
+            <div style="width: 200px;height: 20px;font-size: 14px;">出库日期:{{formList.fBsdate}}</div>
+          </div>
+          <div style="display: flex;justify-content: space-between;margin-bottom: 10px">
+            <div style="width: 200px;height: 20px;font-size: 14px;">录入人:{{formList.createBy}}</div>
+            <div style="width: 200px;height: 20px;font-size: 14px;">公司电话:{{formList.fsbuTel}}</div>
+            <div style="width: 200px;height: 20px;font-size: 14px;">编号:{{formList.fBillno}}</div>
+          </div>
+          <table class="table table-striped table-bordered" align="center" valign="center">
+            <tr>
+              <td class="column" style="width: 8%;">行号</td>
+              <td class="column" style="width: 20%;">物料名称</td>
+              <td class="column" style="width: 10%;">规格型号</td>
+              <td class="column" style="width: 8%;">单位</td>
+              <td class="column" style="width: 10%;">数量</td>
+              <td class="column" style="width: 10%;">单价</td>
+              <td class="column" style="width: 10%;">金额</td>
+              <td class="column" style="width: 10%;">备注</td>
+            </tr>
+            <tr v-for="(item,index) in contentList" :key="index">
+              <td class="column">{{ index+1 }}</td>
+              <td class="column">{{ item.feeName }}</td>
+              <td class="column"></td>
+              <td class="column">{{item.fFeeunitName}}</td>
+              <td class="column">{{ item.fQty }}</td>
+              <td class="column">{{ item.fUnitprice }}</td>
+              <td class="column">{{ item.fAmount }}</td>
+              <td class="column">{{ item.remark }}</td>
+            </tr>
+            <!--          <tr>-->
+            <!--            <td class="column" colspan="2">大写金额:</td>-->
+            <!--            <td class="column" colspan="2" style="text-align: left">100亿元</td>-->
+            <!--            <td class="column">总金额:</td>-->
+            <!--            <td class="column" colspan="3">{{formList.fMoney}}</td>-->
+            <!--          </tr>-->
+          </table>
+          <table class="table table-striped table-bordered" align="center" valign="center">
+            <tr>
+              <td class="column" colspan="2" style="border-top: none;width: 15%;">大写总金额:</td>
+              <td class="column" colspan="2" style="text-align: left;border-top: none;width: 40%;"></td>
+              <td class="column" style="border-top: none; width: 15%;">小写总金额:</td>
+              <td class="column" colspan="3" style="border-top: none;text-align: left;width: 30%;">{{formList.fMoney}}</td>
+            </tr>
+          </table>
+          <div style="display: flex;justify-content: space-between;margin-top: 20px">
+            <div style="width: 200px;height: 20px;font-size: 14px;">发货人:</div>
+            <div style="width: 200px;height: 20px;font-size: 14px;">收货:</div>
+          </div>
         </div>
-      </div>
-      <span slot="footer" class="dialog-footer">
+        <span slot="footer" class="dialog-footer">
     <el-button @click="dialogVisible = false">取 消</el-button>
     <el-button type="primary" @click="Printing">打印</el-button>
   </span>
-    </el-dialog>
+      </el-dialog>
+    </div>
   </div>
 </template>
 
@@ -250,28 +251,28 @@ export default {
           width: 100,
           onabort: ''
         }, {
-          surface: '5',
+          surface: '6',
           label: 'fCurrencyName',
           name: '规格型号',
           checked: 0,
           width: 100,
           onabort: ''
         }, {
-          surface: '6',
+          surface: '7',
           label: 'createTime',
           name: '申请日期',
           checked: 0,
           width: 100,
           onabort: ''
         }, {
-          surface: '7',
+          surface: '8',
           label: 'createBy',
           name: '申请人',
           checked: 0,
           width: 100,
           onabort: ''
         }, {
-          surface: '8',
+          surface: '9',
           label: 'fBillstatusName',
           name: '状态',
           checked: 0,
@@ -279,7 +280,7 @@ export default {
           onabort: ''
         },
         {
-          surface: '9',
+          surface: '10',
           label: 'fReviewDate',
           name: '审核日期',
           checked: 0,
@@ -287,7 +288,7 @@ export default {
           onabort: ''
         },
         {
-          surface: '10',
+          surface: '11',
           label: 'fBsdate',
           name: '出库日期',
           checked: 0,
@@ -295,14 +296,14 @@ export default {
           onabort: ''
         },
         {
-          surface: '11',
+          surface: '12',
           label: 'remark',
           name: '备注',
           checked: 0,
           width: 100,
           onabort: ''
         }, {
-          surface: '12',
+          surface: '13',
           label: 'operation',
           name: '操作',
           checked: 0,
@@ -1402,13 +1403,13 @@ export default {
   margin-bottom: 0;
 }
 
-::v-deep .el-table__body-wrapper{
+.print_div ::v-deep .el-table__body-wrapper{
   z-index: 2
 }
-::v-deep .el-dialog__header{
+.print_div ::v-deep .el-dialog__header{
   padding: 0;
 }
-::v-deep .el-dialog__body{
+.print_div ::v-deep .el-dialog__body{
    padding: 0 20px;
  }
 </style>

+ 2 - 1
src/views/warehouse/inStock/index.vue

@@ -26,7 +26,7 @@
         :hasPermi="hasPermi"
         :tatolLabel="mainTatol"
         :seachButton="seachButton"
-        :setRowList="listStyle"
+        :setRowList="setRowList"
         :listStyle="listStyle"
         :isItHidden="isItHidden"
         :queryList="queryList"/>
@@ -194,6 +194,7 @@ export default {
       detailForm:{
 
       },
+      setRowList:[],
       //主页面默认显示4个表单数据
       formOption:[
         {