Przeglądaj źródła

出入库完善

wengyuwen 4 lat temu
rodzic
commit
319115cbdb

+ 0 - 37
src/combination/MainForm.vue

@@ -32,43 +32,6 @@
               <span style="padding-left: 10px;padding-right: 10px">至</span>
               <el-input v-model="form.last" clearable oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d).*$/, "$1$2.$3")' @change="changeMoney"></el-input></div>
           </el-form-item>
-
-<!--        <div v-if="show">-->
-<!--          <el-row>-->
-<!--            <el-col v-for="(item,index) in hidedata" :span="item.span" :key="index">-->
-<!--              <el-form-item :label="item.name" :label-width="item.labelSize + 'px'" :rules="[item.rules]" :prop="item.label">-->
-
-<!--                <el-select v-if="item.form == 1" v-model="form[item.label]" :style="{ width: item.width + 'px' }">-->
-<!--                  <el-option v-for="(it,index) in item.data"-->
-<!--                             :key="index"-->
-<!--                             :label="it.label"-->
-<!--                             :value="it.value"/>-->
-<!--                </el-select>-->
-<!--                <el-input v-if="item.form == 2" v-model="form[item.label]" :style="{ width: item.width + 'px' }"></el-input>-->
-<!--                <el-input v-if="item.form == 4" type="textarea" v-model="form[item.label]" :style="{ width: item.width + 'px' }"></el-input>-->
-<!--                <el-date-picker v-if="item.form == 3" v-model="form[item.label]" :style="{ width: item.width + 'px' }" type="date" placeholder="选择日期" format="yyyy - MM - dd" value-format="yyyy-MM-dd">-->
-<!--                </el-date-picker>-->
-<!--                <el-date-picker-->
-<!--                  v-if="item.form == 6"-->
-<!--                  :disabled="item.disabled"-->
-<!--                  v-model="form[item.label]"-->
-<!--                  :style="{ width: item.width + 'px' }"-->
-<!--                  type="daterange"-->
-<!--                  value-format="yyyy-MM-dd"-->
-<!--                  range-separator="至"-->
-<!--                  start-placeholder="开始日期"-->
-<!--                  end-placeholder="结束日期"-->
-<!--                  />-->
-<!--                <span v-if="item.form == 5"  v-model="form[item.label]" :style="{ width: item.width + 'px' }">-->
-<!--                  <el-input clearable style="width: 85px;" v-model="form.first " oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d).*$/, "$1$2.$3")'></el-input>-->
-<!--                  <span style="padding-left: 10px;padding-right: 10px">至</span>-->
-<!--                  <el-input v-model="form.last" clearable oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d).*$/, "$1$2.$3")' style="width:85px" @change="changeMoney"></el-input>-->
-<!--                </span>-->
-
-<!--              </el-form-item>-->
-<!--            </el-col>-->
-<!--          </el-row>-->
-<!--        </div>-->
     </el-form>
   </div>
 </template>

+ 1 - 0
src/views/project/index1.vue

@@ -863,6 +863,7 @@ export default {
           this.detailList = response.data.projectItemsList
           for (let li in this.detailList) {
             this.$set(this.detailList[li], 'fStatus', JSON.stringify(this.detailList[li].fStatus))
+            this.$set(this.detailList[li], 'fMeasure', JSON.stringify(this.detailList[li].fMeasure))
           }
         }
         if (res == 0 || res == 1) {

+ 198 - 182
src/views/warehouse/inStock/index.vue

@@ -8,8 +8,6 @@
         :form="queryParms"
         :show="show"
         :inDex="inDex"
-        :hidedata="hidedata"
-        @handleClick="handleClick"
       />
       <listComponent
         style="clear:both"
@@ -49,7 +47,6 @@
         :inDex="inDex"
         @backRules="backRules"
         @backSave="backSave"
-        @handleClick="handleClick"
         @verificationRules="verificationRules"
         @changeWarehouse="changeWarehouse"
       />
@@ -74,6 +71,88 @@
         :listData="listData"
         :queryList="detailList"/>
     </div>
+    <el-dialog
+      title="打印入库"
+      :visible.sync="dialogVisible"
+      :fullscreen="true"
+      style="padding: 0;margin:0"
+      width="70%">
+      <div ref="print">
+        <table class="table table-striped table-bordered" align="center" border="1"
+               style="border-collapse: collapse; border: none;">
+          <tr>
+            <td style="font-size: 24px;font-weight:bold; border: 1px solid #000; padding:10px" class="column" width="1400" align="center" colspan="6">入库明细表</td>
+          </tr>
+          <tr>
+            <td class="column" style="width: 10%;border: 1px solid #000; padding:10px" align="center">系统编号</td>
+            <td class="column" style="width: 25%;border: 1px solid #000; padding:10px" align="center">{{formList.fBillno}}</td>
+            <td class="column" style="width: 10%;border: 1px solid #000; padding:10px" align="center">供应商</td>
+            <td class="column" style="width: 25%;border: 1px solid #000; padding:10px" align="center">{{ formList.corpName }}</td>
+            <td class="column" style="width: 10%;border: 1px solid #000; padding:10px" align="center">库管员</td>
+            <td class="column" style="width: 25%;border: 1px solid #000; padding:10px" align="center">{{formList.fStorekeeper}}</td>
+          </tr>
+          <tr>
+            <td class="column" style="width: 10%;border: 1px solid #000; padding:10px" align="center">仓库</td>
+            <td class="column" style="width: 25%;border: 1px solid #000; padding:10px" align="center">{{formList.fWarehouseid}}</td>
+            <td class="column" style="width: 10%;border: 1px solid #000; padding:10px" align="center">付款单位</td>
+            <td class="column" style="width: 25%;border: 1px solid #000; padding:10px" align="center">{{ formList.fSbu }}</td>
+            <td class="column" style="width: 10%;border: 1px solid #000; padding:10px" align="center">入库时间</td>
+            <td class="column" style="width: 25%;border: 1px solid #000; padding:10px" align="center">{{formList.fBsdate}}</td>
+          </tr>
+          <tr>
+            <td class="column" style="width: 10%;border: 1px solid #000; padding:10px" align="center">备注</td>
+            <td class="column" style="width: 90%;border: 1px solid #000; padding:10px" align="center" colspan="6">{{formList.remark}}</td>
+
+          </tr>
+        </table>
+        <table class="table table-striped table-bordered" align="center" valign="center" style="border-collapse: collapse; border: none;margin-top: 10px;" >
+          <tr>
+            <td class="column" style="border: 1px solid #000; padding:10px" align="center" width="190">品名</td>
+            <td class="column" style="border: 1px solid #000; padding:10px" align="center" width="190">单价</td>
+            <td class="column" style="border: 1px solid #000; padding:10px" align="center" width="190">数量</td>
+            <td class="column" style="border: 1px solid #000; padding:10px" align="center" width="190">计量单位</td>
+            <td class="column" style="border: 1px solid #000; padding:10px" align="center" width="190">库区</td>
+            <td class="column" style="border: 1px solid #000; padding:10px" align="center" width="190">金额</td>
+            <td class="column" style="border: 1px solid #000; padding:10px" align="center" width="190">付款方式</td>
+            <td class="column" style="border: 1px solid #000; padding:10px" align="center" width="190">备注</td>
+          </tr>
+          <tr v-for="(item,index) in this.detailData" :key="index">
+            <td class="column" style="border: 1px solid #000; padding:10px" align="center" width="190">{{item.fFeeid}}</td>
+            <td class="column" style="border: 1px solid #000; padding:10px" align="center" width="190">{{item.fUnitprice}}</td>
+            <td class="column" style="border: 1px solid #000; padding:10px" align="center" width="190">{{item.fQty}}</td>
+            <td class="column" style="border: 1px solid #000; padding:10px" align="center" width="190">{{item.fFeeunitid}}</td>
+            <td class="column" style="border: 1px solid #000; padding:10px" align="center" width="190">{{item.fWarehouseid}}</td>
+            <td class="column" style="border: 1px solid #000; padding:10px" align="center" width="190">{{item.fAmount}}</td>
+            <td class="column" style="border: 1px solid #000; padding:10px" align="center" width="190">{{item.fStltypeid}}</td>
+            <td class="column" style="border: 1px solid #000; padding:10px" align="center" width="190">{{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>
+    <el-button type="primary" @click="Printing">打印</el-button>
+  </span>
+    </el-dialog>
   </div>
 </template>
 
@@ -89,6 +168,8 @@ export default {
   name: 'inStock',
   data(){
     return{
+      formList:{},
+      dialogVisible: false,
       mainTatol:['金额'],
       ids:[],
       listData:{
@@ -213,48 +294,6 @@ export default {
           labelSize:'80',
           rules: { required:false }
         },
-
-
-      ],
-      //隐藏表单数据
-      hidedata:[
-        {
-          span:6,
-          label: 'cLoadDate',
-          name:"申请日期",
-          form:6,
-          width:250,
-          labelSize:'80',
-          rules: { required:false }
-        },
-        {
-          span:6,
-          label: 'createBy',
-          name:"申请人",
-          form:2,
-          width:200,
-          labelSize:'80',
-          rules: { required:false }
-        },
-        {
-          span:6,
-          label: 'moneys',
-          name:"金额范围",
-          form:5,
-          width:200,
-          labelSize:'80',
-          rules: { required:false }
-        },
-        {
-          span:6,
-          label: 'remark',
-          name:"备注",
-          form:2,
-          width:200,
-          labelSize:'80',
-          rules: { required:false }
-        },
-
       ],
       //表名称
       tableData:[],
@@ -361,7 +400,6 @@ export default {
 
       ],
       //从表数据
-
       detailStyle: [
         {
           surface: "1",
@@ -563,38 +601,6 @@ export default {
           disabled:false
         },
       ],
-      //详情主表隐藏
-      hideDetail:[
-      //   {
-      //     span:6,
-      //     label: 'fBsdate',
-      //     name:"入库日期",
-      //     form:3,
-      //     width:200,
-      //     labelSize:'80',
-      //     rules:''
-      //   },
-      //   {
-      //     span:6,
-      //     label: 'fSbu',
-      //     name:"付款单位",
-      //     form:1,
-      //     width:200,
-      //     labelSize:'80',
-      //     rules:'',
-      //     data:[]
-      //   },
-      //   {
-      //     span:6,
-      //     label: 'remark',
-      //     name:"备注",
-      //     form:4,
-      //     width:200,
-      //     labelSize:'80',
-      //     rules:''
-      //   },
-      //
-      ],
       //按钮
       customButton:[
         {
@@ -706,8 +712,6 @@ export default {
     }
   },
   created() {
-    console.log(Cookies.get("userName"))
-    console.log(this.queryList.tableName)
     let data = {
       tableName: this.queryList.tableName,
       userId: Cookies.get("userName"),
@@ -722,6 +726,10 @@ export default {
     this.selectMethods()
   },
   methods:{
+    //确认打印
+    Printing(){
+      this.$print(this.$refs.print)
+    },
     //查询主页列数据
     query(data){
       listQuery(data).then(res =>{
@@ -756,10 +764,7 @@ export default {
     //搜索、重置、展开
     feedback(res){
       if (res == '展开'){
-        // this.handleClick()
         if (this.inDex == 4){
-          console.log("000")
-          console.log(this.formOption.length)
           this.inDex = this.formOption.length
         }else {
           this.inDex = 4
@@ -884,14 +889,6 @@ export default {
         }
       })
     },
-    handleClick(){
-      this.show = !this.show
-      if(this.show){
-        this.arrow = 'el-icon-arrow-down'
-      }else{
-        this.arrow = 'el-icon-arrow-up'
-      }
-    },
     handleQuery(){
       this.$refs.MainForm.hide()
       this.getList();
@@ -906,7 +903,6 @@ export default {
         tableName: this.queryList.tableName,
         userId: Cookies.get("userName"),
       };
-      console.log(data)
       select(data).then((res) => {
         if (data.tableName === '仓库入库详情') {
           if (res.data.length != 0) {
@@ -933,7 +929,6 @@ export default {
           }else {
             this.waitFor = true
             this.queryList.columnList = this.listStyle
-            console.log(this.queryList.columnList.fFeeid)
             this.setRowList = this.listStyle
           }
           // this.pageDisplay = true
@@ -955,9 +950,15 @@ export default {
     },
     //查看
     viewMethod(scope){
-      console.log(scope)
       this.detailList.columnList = this.detailStyle
-      getSave(scope.row.fId).then(res=>{
+      this.inDex = this.detailOption.length
+      let fId = ''
+      if(scope){
+         fId = scope.row.fId
+      }else{
+         fId = this.ids
+      }
+      getSave(fId).then(res=>{
         if(res.code == 200){
           if(res.data.warehouseBills){
             this.detailForm = res.data.warehouseBills
@@ -1008,11 +1009,9 @@ export default {
     },
     //修改
     modification(scope){
-      console.log(scope)
     },
     //删除
     deletion(scope){
-      console.log(scope)
       const fIds = scope.row.fId || this.ids;
       let tips = "";
       deletMain(fIds).then(res=>{
@@ -1164,12 +1163,12 @@ export default {
     },
     //所以按钮
     buttonList(row){
-      console.log(row)
-      if(row.name == '新增'){
-        this.detailList.columnList = this.detailStyle
-        this.detailForm = {}
-        this.detailData = []
-        this.inDex = this.detailOption.length
+      switch (row.name) {
+        case '新增':
+          this.detailList.columnList = this.detailStyle
+          this.detailForm = {}
+          this.detailData = []
+          this.inDex = this.detailOption.length
           //从表修改按钮
           for(let li in this.detailStyle){
             if(!this.detailStyle[li].doNot){
@@ -1184,88 +1183,107 @@ export default {
           for(let li in this.detailButton){
             this.detailButton[li].disabled = false
           }
-        this.MainTable = true
-      }else if(row.name == '录入'){
-        this.$refs.detailForm.rules()
-      }else if(row.name == '返回列表'){
-        this.backRules()
-      }else if(row.name == '保存'){
-        this.$refs.detailForm.saveRules()
-      }else if(row.name == '入库确认'){
-        for(let item in this.detailData) {
-          let num = Number(item) + 1
-          if(!this.detailData[item].fQty){
-            this.$message.error("请维护第" + num + "数量")
-            return false
-          }
-          if (!this.detailData[item].fWarehouseid) {
-            this.$message.error("请维护第" + num + "行库区")
-            return false
-          }
-        }
-        this.detailForm.fMoney = 0
-        for(let li in this.detailData){
-          if(this.detailData[li]){
-            this.detailForm.fMoney += Number(this.detailData[li].fAmount)
-          }
-        }
-        let formData = new window.FormData();
-        formData.append('tWarehousebills', JSON.stringify(this.detailForm))
-        formData.append('tWarehousebillsfees', JSON.stringify(this.detailData))
-        formData.append('fBilltype', 'RK')
-        addWarehous(formData).then(res=>{
-          if(res.data.warehouseBills){
-            this.detailForm = res.data.warehouseBills
-            this.$set(this.detailForm,'fStorekeeper',JSON.parse(this.detailForm.fStorekeeper))
-          }
-          if(res.data.tWarehousebillsCntrs){
-            this.detailData = res.data.tWarehousebillsCntrs
+          this.MainTable = true
+          break
+        case '录入':
+          this.$refs.detailForm.rules()
+          break
+        case '返回列表':
+          this.backRules()
+          break
+        case '保存':
+          this.$refs.detailForm.saveRules()
+          break
+        case '入库确认':
+          console.log(this.detailData)
+          if(this.detailData.length == 0){
+            this.$message.error("请维护明细")
+          }else{
+            for(let item in this.detailData) {
+              let num = Number(item) + 1
+              if(!this.detailData[item].fQty){
+                this.$message.error("请维护第" + num + "数量")
+                return false
+              }
+              if (!this.detailData[item].fWarehouseid) {
+                this.$message.error("请维护第" + num + "行库区")
+                return false
+              }
+            }
+            this.detailForm.fMoney = 0
             for(let li in this.detailData){
-            this.$set(this.detailData[li],'fFeeunitid',JSON.stringify(this.detailData[li].fFeeunitid))
-            this.$set(this.detailData[li],'fStltypeid',JSON.stringify(this.detailData[li].fStltypeid))
-          }
-          }
-          this.$message.success("操作成功")
-          for(let li in this.detailStyle){
-            this.detailStyle[li].disabled = true
-          }
-          for(let item in this.detailOption){
-            this.detailOption[item].disabled = true
-          }
-          for(let li in this.detailButton) {
-            if (this.detailButton[li].name == '返回列表') {
-              this.detailButton[li].disabled = false
-            }else{
-              this.detailButton[li].disabled = true
+              if(this.detailData[li]){
+                this.detailForm.fMoney += Number(this.detailData[li].fAmount)
+              }
             }
+            let formData = new window.FormData();
+            formData.append('tWarehousebills', JSON.stringify(this.detailForm))
+            formData.append('tWarehousebillsfees', JSON.stringify(this.detailData))
+            formData.append('fBilltype', 'RK')
+            addWarehous(formData).then(res=>{
+              if(res.data.warehouseBills){
+                this.detailForm = res.data.warehouseBills
+                this.$set(this.detailForm,'fStorekeeper',JSON.parse(this.detailForm.fStorekeeper))
+              }
+              if(res.data.tWarehousebillsCntrs){
+                this.detailData = res.data.tWarehousebillsCntrs
+                for(let li in this.detailData){
+                  this.$set(this.detailData[li],'fFeeunitid',JSON.stringify(this.detailData[li].fFeeunitid))
+                  this.$set(this.detailData[li],'fStltypeid',JSON.stringify(this.detailData[li].fStltypeid))
+                }
+              }
+              this.$message.success("操作成功")
+              for(let li in this.detailStyle){
+                this.detailStyle[li].disabled = true
+              }
+              for(let item in this.detailOption){
+                this.detailOption[item].disabled = true
+              }
+              for(let li in this.detailButton) {
+                if (this.detailButton[li].name == '返回列表') {
+                  this.detailButton[li].disabled = false
+                }else{
+                  this.detailButton[li].disabled = true
+                }
+              }
+            })
+
           }
-        })
-      }else if(row.name == '刷新'){
-        if(this.detailForm.fId){
-          getSave(this.detailForm.fId).then(res=>{
-            if(res.data.warehouseBills){
-              this.detailForm = res.data.warehouseBills
-              this.$set(this.detailForm,'fStorekeeper',JSON.parse(this.detailForm.fStorekeeper))
-            }
-            if(res.data.tWarehousebillsfees){
-              this.detailData = res.data.tWarehousebillsfees
-              for(let li in this.detailData){
-                this.$set(this.detailData[li],'fFeeunitid',JSON.stringify(this.detailData[li].fFeeunitid))
-                this.$set(this.detailData[li],'fStltypeid',JSON.stringify(this.detailData[li].fStltypeid))
+          break
+        case '刷新':
+          if(this.detailForm.fId){
+            getSave(this.detailForm.fId).then(res=>{
+              if(res.data.warehouseBills){
+                this.detailForm = res.data.warehouseBills
+                this.$set(this.detailForm,'fStorekeeper',JSON.parse(this.detailForm.fStorekeeper))
               }
-            }
+              if(res.data.tWarehousebillsfees){
+                this.detailData = res.data.tWarehousebillsfees
+                for(let li in this.detailData){
+                  this.$set(this.detailData[li],'fFeeunitid',JSON.stringify(this.detailData[li].fFeeunitid))
+                  this.$set(this.detailData[li],'fStltypeid',JSON.stringify(this.detailData[li].fStltypeid))
+                }
+              }
+            })
+          }
+          break
+        case '复制新增':
+          let formDate = {
+            fBilltype:'RK',
+            fId:this.selection[0].fId
+          }
+          copyNew(formDate).then(res=>{
+            this.$message.success("操作成功")
+            this.getList()
           })
-        }
-      }else if(row.name == '复制新增'){
-        console.log(this.selection[0].fId)
-        let formData = {
-          fBilltype:'RK',
-          fId:this.selection[0].fId
-        }
-        copyNew(formData).then(res=>{
-          this.$message.success("操作成功")
-          this.getList()
-        })
+          break
+        case '打印':
+          this.formList = this.detailForm
+          this.dialogVisible = true
+          break
+      }
+      if(row.name == '修改'){
+        this.viewMethod()
       }
       if(row.res === 1){
         //从表修改按钮
@@ -1283,11 +1301,9 @@ export default {
           this.detailButton[li].disabled = false
         }
       }
-
     },
     // 显示搜索条件、点击后会调用此方法
     showSearch(){
-      console.log('到我了')
       this.getList()
     },
     //点击刷新会调用此方法

+ 208 - 193
src/views/warehouse/outStock/index.vue

@@ -8,8 +8,6 @@
         :form="queryParms"
         :show="show"
         :inDex="inDex"
-        :hidedata="hidedata"
-        @handleClick="handleClick"
       />
       <listComponent
         style="clear:both"
@@ -49,7 +47,6 @@
         :inDex="inDex"
         @backRules="backRules"
         @backSave="backSave"
-        @handleClick="handleClick"
         @verificationRules="verificationRules"
         @changeWarehouse="changeWarehouse"
       />
@@ -74,6 +71,88 @@
         :listData="listData"
         :queryList="detailList"/>
     </div>
+    <el-dialog
+      title="打印出库"
+      :visible.sync="dialogVisible"
+      :fullscreen="true"
+      style="padding: 0;margin:0"
+      width="70%">
+      <div ref="print">
+        <table class="table table-striped table-bordered" align="center" border="1"
+               style="border-collapse: collapse; border: none;">
+          <tr>
+            <td style="font-size: 24px;font-weight:bold; border: 1px solid #000; padding:10px" class="column" width="1400" align="center" colspan="6">出库明细表</td>
+          </tr>
+          <tr>
+            <td class="column" style="width: 10%;border: 1px solid #000; padding:10px" align="center">系统编号</td>
+            <td class="column" style="width: 25%;border: 1px solid #000; padding:10px" align="center">{{formList.fBillno}}</td>
+            <td class="column" style="width: 10%;border: 1px solid #000; padding:10px" align="center">供应商</td>
+            <td class="column" style="width: 25%;border: 1px solid #000; padding:10px" align="center">{{ formList.corpName }}</td>
+            <td class="column" style="width: 10%;border: 1px solid #000; padding:10px" align="center">库管员</td>
+            <td class="column" style="width: 25%;border: 1px solid #000; padding:10px" align="center">{{formList.fStorekeeper}}</td>
+          </tr>
+          <tr>
+            <td class="column" style="width: 10%;border: 1px solid #000; padding:10px" align="center">仓库</td>
+            <td class="column" style="width: 25%;border: 1px solid #000; padding:10px" align="center">{{formList.fWarehouseid}}</td>
+            <td class="column" style="width: 10%;border: 1px solid #000; padding:10px" align="center">付款单位</td>
+            <td class="column" style="width: 25%;border: 1px solid #000; padding:10px" align="center">{{ formList.fSbu }}</td>
+            <td class="column" style="width: 10%;border: 1px solid #000; padding:10px" align="center">出库时间</td>
+            <td class="column" style="width: 25%;border: 1px solid #000; padding:10px" align="center">{{formList.fBsdate}}</td>
+          </tr>
+          <tr>
+            <td class="column" style="width: 10%;border: 1px solid #000; padding:10px" align="center">备注</td>
+            <td class="column" style="width: 90%;border: 1px solid #000; padding:10px" align="center" colspan="6">{{formList.remark}}</td>
+
+          </tr>
+        </table>
+        <table class="table table-striped table-bordered" align="center" valign="center" style="border-collapse: collapse; border: none;margin-top: 10px;" >
+          <tr>
+            <td class="column" style="border: 1px solid #000; padding:10px" align="center" width="190">品名</td>
+            <td class="column" style="border: 1px solid #000; padding:10px" align="center" width="190">单价</td>
+            <td class="column" style="border: 1px solid #000; padding:10px" align="center" width="190">数量</td>
+            <td class="column" style="border: 1px solid #000; padding:10px" align="center" width="190">计量单位</td>
+            <td class="column" style="border: 1px solid #000; padding:10px" align="center" width="190">库区</td>
+            <td class="column" style="border: 1px solid #000; padding:10px" align="center" width="190">金额</td>
+            <td class="column" style="border: 1px solid #000; padding:10px" align="center" width="190">付款方式</td>
+            <td class="column" style="border: 1px solid #000; padding:10px" align="center" width="190">备注</td>
+          </tr>
+          <tr v-for="(item,index) in this.detailData" :key="index">
+            <td class="column" style="border: 1px solid #000; padding:10px" align="center" width="190">{{item.fFeeid}}</td>
+            <td class="column" style="border: 1px solid #000; padding:10px" align="center" width="190">{{item.fUnitprice}}</td>
+            <td class="column" style="border: 1px solid #000; padding:10px" align="center" width="190">{{item.fQty}}</td>
+            <td class="column" style="border: 1px solid #000; padding:10px" align="center" width="190">{{item.fFeeunitid}}</td>
+            <td class="column" style="border: 1px solid #000; padding:10px" align="center" width="190">{{item.fWarehouseid}}</td>
+            <td class="column" style="border: 1px solid #000; padding:10px" align="center" width="190">{{item.fAmount}}</td>
+            <td class="column" style="border: 1px solid #000; padding:10px" align="center" width="190">{{item.fStltypeid}}</td>
+            <td class="column" style="border: 1px solid #000; padding:10px" align="center" width="190">{{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>
+    <el-button type="primary" @click="Printing">打印</el-button>
+  </span>
+    </el-dialog>
   </div>
 </template>
 
@@ -89,6 +168,9 @@ export default {
   name: 'inStock',
   data(){
     return{
+      formList:{},
+      dialogVisible: false,
+      mainTatol:['金额'],
       ids:[],
       listData:{
         fFeeid:[],
@@ -103,7 +185,6 @@ export default {
       // 总条数
       total: 0,
       inDex:4,
-      mainTatol:['金额'],
       tatolLabel:['单价','数量','金额'],
       MainTable:false,
       show: false,
@@ -213,48 +294,6 @@ export default {
           labelSize:'80',
           rules: { required:false }
         },
-
-
-      ],
-      //隐藏表单数据
-      hidedata:[
-        {
-          span:6,
-          label: 'cLoadDate',
-          name:"申请日期",
-          form:6,
-          width:250,
-          labelSize:'80',
-          rules: { required:false }
-        },
-        {
-          span:6,
-          label: 'createBy',
-          name:"申请人",
-          form:2,
-          width:200,
-          labelSize:'80',
-          rules: { required:false }
-        },
-        {
-          span:6,
-          label: 'moneys',
-          name:"金额范围",
-          form:5,
-          width:200,
-          labelSize:'80',
-          rules: { required:false }
-        },
-        {
-          span:6,
-          label: 'remark',
-          name:"备注",
-          form:2,
-          width:200,
-          labelSize:'80',
-          rules: { required:false }
-        },
-
       ],
       //表名称
       tableData:[],
@@ -361,7 +400,6 @@ export default {
 
       ],
       //从表数据
-
       detailStyle: [
         {
           surface: "1",
@@ -563,38 +601,6 @@ export default {
           disabled:false
         },
       ],
-      //详情主表隐藏
-      hideDetail:[
-        //   {
-        //     span:6,
-        //     label: 'fBsdate',
-        //     name:"出库日期",
-        //     form:3,
-        //     width:200,
-        //     labelSize:'80',
-        //     rules:''
-        //   },
-        //   {
-        //     span:6,
-        //     label: 'fSbu',
-        //     name:"付款单位",
-        //     form:1,
-        //     width:200,
-        //     labelSize:'80',
-        //     rules:'',
-        //     data:[]
-        //   },
-        //   {
-        //     span:6,
-        //     label: 'remark',
-        //     name:"备注",
-        //     form:4,
-        //     width:200,
-        //     labelSize:'80',
-        //     rules:''
-        //   },
-        //
-      ],
       //按钮
       customButton:[
         {
@@ -706,8 +712,6 @@ export default {
     }
   },
   created() {
-    console.log(Cookies.get("userName"))
-    console.log(this.queryList.tableName)
     let data = {
       tableName: this.queryList.tableName,
       userId: Cookies.get("userName"),
@@ -722,6 +726,10 @@ export default {
     this.selectMethods()
   },
   methods:{
+    //确认打印
+    Printing(){
+      this.$print(this.$refs.print)
+    },
     //查询主页列数据
     query(data){
       listQuery(data).then(res =>{
@@ -756,10 +764,7 @@ export default {
     //搜索、重置、展开
     feedback(res){
       if (res == '展开'){
-        // this.handleClick()
         if (this.inDex == 4){
-          console.log("000")
-          console.log(this.formOption.length)
           this.inDex = this.formOption.length
         }else {
           this.inDex = 4
@@ -884,14 +889,6 @@ export default {
         }
       })
     },
-    handleClick(){
-      this.show = !this.show
-      if(this.show){
-        this.arrow = 'el-icon-arrow-down'
-      }else{
-        this.arrow = 'el-icon-arrow-up'
-      }
-    },
     handleQuery(){
       this.$refs.MainForm.hide()
       this.getList();
@@ -906,7 +903,6 @@ export default {
         tableName: this.queryList.tableName,
         userId: Cookies.get("userName"),
       };
-      console.log(data)
       select(data).then((res) => {
         if (data.tableName === '仓库出库详情') {
           if (res.data.length != 0) {
@@ -933,7 +929,6 @@ export default {
           }else {
             this.waitFor = true
             this.queryList.columnList = this.listStyle
-            console.log(this.queryList.columnList.fFeeid)
             this.setRowList = this.listStyle
           }
           // this.pageDisplay = true
@@ -955,9 +950,15 @@ export default {
     },
     //查看
     viewMethod(scope){
-      console.log(scope)
       this.detailList.columnList = this.detailStyle
-      getSave(scope.row.fId).then(res=>{
+      this.inDex = this.detailOption.length
+      let fId = ''
+      if(scope){
+        fId = scope.row.fId
+      }else{
+        fId = this.ids
+      }
+      getSave(fId).then(res=>{
         if(res.code == 200){
           if(res.data.warehouseBills){
             this.detailForm = res.data.warehouseBills
@@ -1008,11 +1009,9 @@ export default {
     },
     //修改
     modification(scope){
-      console.log(scope)
     },
     //删除
     deletion(scope){
-      console.log(scope)
       const fIds = scope.row.fId || this.ids;
       let tips = "";
       deletMain(fIds).then(res=>{
@@ -1164,108 +1163,126 @@ export default {
     },
     //所以按钮
     buttonList(row){
-      console.log(row)
-      if(row.name == '新增'){
-        this.detailList.columnList = this.detailStyle
-        this.detailForm = {}
-        this.detailData = []
-        this.inDex = this.detailOption.length
-        //从表修改按钮
-        for(let li in this.detailStyle){
-          if(!this.detailStyle[li].doNot){
-            this.detailStyle[li].disabled = false
-          }
-        }
-        for(let item in this.detailOption){
-          if(!this.detailOption[item].doNot){
-            this.detailOption[item].disabled = false
-          }
-        }
-        for(let li in this.detailButton){
-          this.detailButton[li].disabled = false
-        }
-        this.MainTable = true
-      }else if(row.name == '录入'){
-        this.$refs.detailForm.rules()
-      }else if(row.name == '返回列表'){
-        this.backRules()
-      }else if(row.name == '保存'){
-        this.$refs.detailForm.saveRules()
-      }else if(row.name == '出库确认'){
-        for(let item in this.detailData) {
-          let num = Number(item) + 1
-          if(!this.detailData[item].fQty){
-            this.$message.error("请维护第" + num + "数量")
-            return false
-          }
-          if (!this.detailData[item].fWarehouseid) {
-            this.$message.error("请维护第" + num + "行库区")
-            return false
-          }
-        }
-        this.detailForm.fMoney = 0
-        for(let li in this.detailData){
-          if(this.detailData[li]){
-            this.detailForm.fMoney += Number(this.detailData[li].fAmount)
-          }
-        }
-        let formData = new window.FormData();
-        formData.append('tWarehousebills', JSON.stringify(this.detailForm))
-        formData.append('tWarehousebillsfees', JSON.stringify(this.detailData))
-        formData.append('fBilltype', 'CK')
-        addWarehous(formData).then(res=>{
-          if(res.data.warehouseBills){
-            this.detailForm = res.data.warehouseBills
-            this.$set(this.detailForm,'fStorekeeper',JSON.parse(this.detailForm.fStorekeeper))
-          }
-          if(res.data.tWarehousebillsCntrs){
-            this.detailData = res.data.tWarehousebillsCntrs
-            for(let li in this.detailData){
-              this.$set(this.detailData[li],'fFeeunitid',JSON.stringify(this.detailData[li].fFeeunitid))
-              this.$set(this.detailData[li],'fStltypeid',JSON.stringify(this.detailData[li].fStltypeid))
-            }
-          }
-          this.$message.success("操作成功")
+      switch (row.name) {
+        case '新增':
+          this.detailList.columnList = this.detailStyle
+          this.detailForm = {}
+          this.detailData = []
+          this.inDex = this.detailOption.length
+          //从表修改按钮
           for(let li in this.detailStyle){
-            this.detailStyle[li].disabled = true
+            if(!this.detailStyle[li].doNot){
+              this.detailStyle[li].disabled = false
+            }
           }
           for(let item in this.detailOption){
-            this.detailOption[item].disabled = true
-          }
-          for(let li in this.detailButton) {
-            if (this.detailButton[li].name == '返回列表') {
-              this.detailButton[li].disabled = false
-            }else{
-              this.detailButton[li].disabled = true
+            if(!this.detailOption[item].doNot){
+              this.detailOption[item].disabled = false
             }
           }
-        })
-      }else if(row.name == '刷新'){
-        if(this.detailForm.fId){
-          getSave(this.detailForm.fId).then(res=>{
-            if(res.data.warehouseBills){
-              this.detailForm = res.data.warehouseBills
-              this.$set(this.detailForm,'fStorekeeper',JSON.parse(this.detailForm.fStorekeeper))
+          for(let li in this.detailButton){
+            this.detailButton[li].disabled = false
+          }
+          this.MainTable = true
+          break
+        case '录入':
+          this.$refs.detailForm.rules()
+          break
+        case '返回列表':
+          this.backRules()
+          break
+        case '保存':
+          this.$refs.detailForm.saveRules()
+          break
+        case '出库确认':
+          if(this.detailData.length == 0){
+            this.$message.error("请维护明细")
+          }else{
+            for(let item in this.detailData) {
+              let num = Number(item) + 1
+              if(!this.detailData[item].fQty){
+                this.$message.error("请维护第" + num + "数量")
+                return false
+              }
+              if (!this.detailData[item].fWarehouseid) {
+                this.$message.error("请维护第" + num + "行库区")
+                return false
+              }
             }
-            if(res.data.tWarehousebillsfees){
-              this.detailData = res.data.tWarehousebillsfees
-              for(let li in this.detailData){
-                this.$set(this.detailData[li],'fFeeunitid',JSON.stringify(this.detailData[li].fFeeunitid))
-                this.$set(this.detailData[li],'fStltypeid',JSON.stringify(this.detailData[li].fStltypeid))
+            this.detailForm.fMoney = 0
+            for(let li in this.detailData){
+              if(this.detailData[li]){
+                this.detailForm.fMoney += Number(this.detailData[li].fAmount)
               }
             }
+            let formData = new window.FormData();
+            formData.append('tWarehousebills', JSON.stringify(this.detailForm))
+            formData.append('tWarehousebillsfees', JSON.stringify(this.detailData))
+            formData.append('fBilltype', 'CK')
+            addWarehous(formData).then(res=>{
+              if(res.data.warehouseBills){
+                this.detailForm = res.data.warehouseBills
+                this.$set(this.detailForm,'fStorekeeper',JSON.parse(this.detailForm.fStorekeeper))
+              }
+              if(res.data.tWarehousebillsCntrs){
+                this.detailData = res.data.tWarehousebillsCntrs
+                for(let li in this.detailData){
+                  this.$set(this.detailData[li],'fFeeunitid',JSON.stringify(this.detailData[li].fFeeunitid))
+                  this.$set(this.detailData[li],'fStltypeid',JSON.stringify(this.detailData[li].fStltypeid))
+                }
+              }
+              this.$message.success("操作成功")
+              for(let li in this.detailStyle){
+                this.detailStyle[li].disabled = true
+              }
+              for(let item in this.detailOption){
+                this.detailOption[item].disabled = true
+              }
+              for(let li in this.detailButton) {
+                if (this.detailButton[li].name == '返回列表') {
+                  this.detailButton[li].disabled = false
+                }else{
+                  this.detailButton[li].disabled = true
+                }
+              }
+            })
+
+          }
+          break
+        case '刷新':
+          if(this.detailForm.fId){
+            getSave(this.detailForm.fId).then(res=>{
+              if(res.data.warehouseBills){
+                this.detailForm = res.data.warehouseBills
+                this.$set(this.detailForm,'fStorekeeper',JSON.parse(this.detailForm.fStorekeeper))
+              }
+              if(res.data.tWarehousebillsfees){
+                this.detailData = res.data.tWarehousebillsfees
+                for(let li in this.detailData){
+                  this.$set(this.detailData[li],'fFeeunitid',JSON.stringify(this.detailData[li].fFeeunitid))
+                  this.$set(this.detailData[li],'fStltypeid',JSON.stringify(this.detailData[li].fStltypeid))
+                }
+              }
+            })
+          }
+          break
+        case '复制新增':
+          let formDate = {
+            fBilltype:'CK',
+            fId:this.selection[0].fId
+          }
+          copyNew(formDate).then(res=>{
+            this.$message.success("操作成功")
+            this.getList()
           })
-        }
-      }else if(row.name == '复制新增'){
-        console.log(this.selection[0].fId)
-        let formData = {
-          fBilltype:'CK',
-          fId:this.selection[0].fId
-        }
-        copyNew(formData).then(res=>{
-          this.$message.success("操作成功")
-          this.getList()
-        })
+          break
+        case '打印':
+          this.formList = this.detailForm
+          this.dialogVisible = true
+          break
+      }
+      if(row.name == '修改'){
+        this.viewMethod()
       }
       if(row.res === 1){
         //从表修改按钮
@@ -1283,11 +1300,9 @@ export default {
           this.detailButton[li].disabled = false
         }
       }
-
     },
     // 显示搜索条件、点击后会调用此方法
     showSearch(){
-      console.log('到我了')
       this.getList()
     },
     //点击刷新会调用此方法