提交

package.json

@@ -40,7 +40,7 @@
     "axios": "^0.21.1",
     "clipboard": "2.0.6",
     "core-js": "3.8.1",
-    "echarts": "4.9.0",
+    "echarts": "^4.9.0",
     "element-ui": "2.15.0",
     "file-saver": "2.0.4",
     "fuse.js": "6.4.3",

src/combination/formComponent.vue

@@ -10,7 +10,7 @@
       >
         <el-input v-model="form[item.label]" :onkeyup="item.onabort" :disabled="item.disabled" v-if="item.inputType == 2" :style="{ width: item.width + 'px' }" size="small" :placeholder="'请输入'+item.name"></el-input>
         <span v-if="item.inputType == 1">
-          <el-select v-model="form[item.label]" :disabled="item.disabled" filterable slot="prepend" @change="change(item.label,dataList[item.label],form[item.label])" placeholder="请选择">
+          <el-select v-model="form[item.label]" :disabled="item.disabled" :style="{ width: item.width + 'px' }" filterable slot="prepend" @change="change(item.label,dataList[item.label],form[item.label])" placeholder="请选择">
             <el-option v-for="(item,index) in dataList[item.label]" :key="index" :label="item.label" :value="item.value"></el-option>
           </el-select>
         </span>
@@ -25,7 +25,7 @@
           v-model="form[item.label]">
         </el-input>
         <div style="width: 100%;display:flex;" v-if="item.inputType == 5">
-          <el-input v-model="number" :onkeyup="item.onabort" placeholder="请输入内容" :disabled="item.disabled" @input="spellNumbers(item.label)"></el-input>
+          <el-input v-model="number" :onkeyup="item.onabort" :style="{ width: item.width + 'px' }" placeholder="请输入内容" :disabled="item.disabled" @input="spellNumbers(item.label)"></el-input>
           <span style="padding-left: 10px;padding-right: 10px">至</span>
           <el-input v-model="numBer" :onkeyup="item.onabort" placeholder="请输入内容" :disabled="item.disabled" @input="spellNumbers(item.label)"></el-input>
         </div>
@@ -42,6 +42,7 @@
         <el-date-picker
           :disabled="item.disabled"
           v-if="item.inputType == 3"
+          :style="{ width: item.width + 'px' }"
           v-model="form[item.label]"
           type="daterange"
           value-format="yyyy-MM-dd"

src/combination/listComponent.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <div style="width: 100%;height: 40px;">
-      <div style="margin: 0 12px;float: left;">
+      <div style="margin: 10px 12px;float: left;">
         <el-button
           v-for="item in customButton"
           :type="item.type"
@@ -13,7 +13,7 @@
           {{ item.name }}
         </el-button>
       </div>
-      <div class="tabSetting" style="float: right">
+      <div class="tabSetting" style="float: right;margin: 10px 0">
         <div style="margin-left:10px;float: right">
           <el-button
             icon="el-icon-setting"
@@ -28,7 +28,7 @@
           @queryTable="getList"
         ></right-toolbar>
       </div>
-      <div style="margin-right:10px;float: right" v-if="isItHidden">
+      <div style="margin:10px 10px 0px 0px;float: right;" v-if="isItHidden">
         <el-button
           type="success"
           plain

src/main.js

@@ -20,6 +20,8 @@ import { parseTime, resetForm, addDateRange, selectDictLabel, selectDictLabels,
 import Pagination from "@/components/Pagination";
 // 自定义表格工具扩展
 import RightToolbar from "@/components/RightToolbar"
+import echarts from "echarts";
+Vue.prototype.$echarts = echarts;
 //自定义列表组件
 import listComponent from '@/combination/listComponent'
 Vue.component('listComponent', listComponent)

src/views/purchaseRequest/index.vue

@@ -64,63 +64,60 @@
     <el-dialog
       title="打印采购"
       :visible.sync="dialogVisible"
-      width="80%">
+      :fullscreen="true"
+      style="padding: 0;margin:0"
+      width="70%">
       <div ref="print">
-        <div style="margin:0 auto;border: 0px solid #000000">
-          <table class="table table-striped table-bordered" align="center" valign="center">
-            <tr>
-              <td style="font-size: 24px;font-weight:bold" class="column" colspan="6">采购表</td>
-            </tr>
-            <tr>
-              <td class="column" style="width: 10%;">项目</td>
-              <td class="column" style="width: 25%;">{{formList.projectName}}</td>
-              <td class="column" style="width: 10%;">供应商</td>
-              <td class="column" style="width: 25%;">{{ formList.corpName }}</td>
-              <td class="column" style="width: 20%;" colspan="2">日期：{{formList.createTime}}</td>
-            </tr>
-          </table>
-          <table class="table table-striped table-bordered" align="center" valign="center">
-            <tr>
-              <td colspan="6" style="border-top: none;" class="column"></td>
-            </tr>
-            <tr>
-              <td class="column" style="width: 15%;">日期</td>
-              <td class="column" style="width: 15%;">品名</td>
-              <td class="column" style="width: 15%;">单价</td>
-              <td class="column" style="width: 15%;">采购计划(斤)</td>
-              <td class="column" style="width: 15%;">实际重量(斤)</td>
-              <td class="column" style="width: 15%;">备注</td>
-            </tr>
-            <tr v-for="(item,index) in this.contentList" :key="index">
-              <td class="column">{{item.createTime}}</td>
-              <td class="column">{{item.feeName}}</td>
-              <td class="column">{{item.fUnitprice}}</td>
-              <td class="column">{{item.fPurchase}}</td>
-              <td class="column">{{item.fQty}}</td>
-              <td class="column">{{item.remark}}</td>
-            </tr>
-          </table>
-          <table class="table table-striped table-bordered" align="center" valign="center">
-            <tr>
-              <td colspan="6" style="border-top: none;" class="column"></td>
-            </tr>
-            <tr>
-              <td class="column" style="width: 25%;">采购人签字</td>
-              <td class="column" style="width: 25%;">厨房主管签字</td>
-              <td class="column" style="width: 25%;">验收人签字</td>
-              <td class="column" style="width: 25%;">主管签字</td>
-            </tr>
-            <tr>
-              <td class="column" style="width: 25%;height: 37px;"></td>
-              <td class="column" style="width: 25%;"></td>
-              <td class="column" style="width: 25%;"></td>
-              <td class="column" style="width: 25%;"></td>
-            </tr>
-            <tr>
-              <td colspan="4" style="border-top: none;font-weight:bold;text-align: right;padding-right: 10%;font-size: 16px;" class="column">青岛安品餐饮管理有限公司</td>
-            </tr>
-          </table>
-        </div>
+        <table class="table table-striped table-bordered" align="center" valign="center">
+          <tr>
+            <td style="font-size: 24px;font-weight:bold" class="column" colspan="6">采购表</td>
+          </tr>
+          <tr>
+            <td class="column" style="width: 10%;">项目</td>
+            <td class="column" style="width: 25%;">{{formList.projectName}}</td>
+            <td class="column" style="width: 10%;">供应商</td>
+            <td class="column" style="width: 25%;">{{ formList.corpName }}</td>
+            <td class="column" style="width: 25%;" colspan="2">日期：{{formList.fBsdate}}</td>
+          </tr>
+        </table>
+        <table class="table table-striped table-bordered" align="center" valign="center">
+          <tr>
+            <td class="column" style="width: 15%;border-top: none;">品名</td>
+            <td class="column" style="width: 15%;border-top: none;">单价</td>
+            <td class="column" style="width: 15%;border-top: none;">采购计划(斤)</td>
+            <td class="column" style="width: 15%;border-top: none;">实际重量(斤)</td>
+            <td class="column" style="width: 15%;border-top: none;">金额</td>
+            <td class="column" style="width: 20%;border-top: none;">备注</td>
+          </tr>
+          <tr v-for="(item,index) in this.contentList" :key="index">
+            <td class="column">{{item.feeName}}</td>
+            <td class="column">{{item.fUnitprice}}</td>
+            <td class="column">{{item.fPurchase}}</td>
+            <td class="column">{{item.fQty}}</td>
+            <td class="column">{{item.fAmount}}</td>
+            <td class="column">{{item.remark}}</td>
+          </tr>
+        </table>
+        <table class="table table-striped table-bordered" align="center" valign="center">
+          <tr>
+            <td colspan="6" style="border-top: none;" class="column"></td>
+          </tr>
+          <tr>
+            <td class="column" style="width: 25%;">采购人签字</td>
+            <td class="column" style="width: 25%;">厨房主管签字</td>
+            <td class="column" style="width: 25%;">验收人签字</td>
+            <td class="column" style="width: 25%;">主管签字</td>
+          </tr>
+          <tr>
+            <td class="column" style="width: 25%;height: 37px;"></td>
+            <td class="column" style="width: 25%;"></td>
+            <td class="column" style="width: 25%;"></td>
+            <td class="column" style="width: 25%;"></td>
+          </tr>
+          <tr>
+            <td colspan="4" style="border-top: none;font-weight:bold;text-align: right;padding-right: 10%;font-size: 16px;" class="column">{{ formList.fsbuName }}</td>
+          </tr>
+        </table>
       </div>
       <span slot="footer" class="dialog-footer">
     <el-button @click="dialogVisible = false">取 消</el-button>
@@ -388,15 +385,15 @@ export default {
         //   disabled:false,
         // },
         {
-          type: 'primary',
+          type: 'warning',
           size: 'mini',
-          icon: 'el-icon-edit',
+          icon: 'el-icon-upload2',
           name: '导出',
           disabled: false
         }, {
-          type: 'primary',
+          type: 'success',
           size: 'mini',
-          icon: 'el-icon-edit',
+          icon: 'el-icon-c-scale-to-original',
           name: '复制新增',
           disabled: false
         }
@@ -820,7 +817,7 @@ export default {
       console.log(selection)
     },
     //详情内容保存
-    submitAndSave() {
+    submitAndSave(item) {
       let formData = new window.FormData()
       formData.append('tWarehousebills', JSON.stringify(this.$refs.avatar.form))
       formData.append('tWarehousebillsfees', JSON.stringify(this.contentList))
@@ -831,6 +828,9 @@ export default {
           this.$refs.avatar.form = res.data.warehouseBills
           this.contentList = res.data.tWarehousebillsCntrs
           console.log(this.dataList, this.contentList)
+          if (item == 1){
+            this.dialogVisible = true
+          }
         }
       })
     },
@@ -881,7 +881,7 @@ export default {
             this.$message.error('未保存，不允许打印');
           }else {
             this.formList = this.$refs.avatar.form
-            this.dialogVisible = true
+            this.submitAndSave(1)
           }
           break
         case '修改':
@@ -1024,4 +1024,7 @@ export default {
 .column {
   border: 1px solid #000;
 }
+.app-container >>> .el-form-item{
+  margin-bottom: 0;
+}
 </style>