Merge branch 'master' of http://git.echepei.com/wengyuwen/anpinjingyuan-ui

src/views/purchaseIssue/index.vue

@@ -89,27 +89,29 @@
     ></approval-comments>
 
     <el-dialog
-      title="打印打印"
+      title="打印"
       :visible.sync="dialogVisible"
       :fullscreen="true"
       style="padding: 0;margin:0"
       width="70%"
     >
       <div ref="print">
-        <h1 style="text-align: center;font-weight:bold">开票公司</h1>
+        <h1 style="text-align: center;font-weight:bold">{{ formList.fsbuName }}</h1>
         <div style="display: flex;justify-content: space-between;margin-bottom: 20px">
           <div style="width: 200px;height: 20px;font-size: 14px;">客户项目：{{projectName}}</div>
-          <div style="width: 200px;height: 20px;font-size: 14px;">编号：{{formList.fBillno}}</div>
+          <div style="width: 200px;height: 20px;font-size: 14px;">出库日期：{{formList.fBsdate}}</div>
+        </div>
+        <div style="display: flex;justify-content: space-between;margin-bottom: 20px">
           <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.fBsdate}}</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: 5%;">行号</td>
+            <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: 5%;">单位</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>
@@ -134,9 +136,9 @@
         </table>
         <table class="table table-striped table-bordered" align="center" valign="center">
           <tr>
-            <td class="column" colspan="2" style="border-top: none;width: 10%;">大写总金额:</td>
+            <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: 10%;">小写总金额:</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>
@@ -249,6 +251,13 @@ export default {
           width: 100,
           onabort: ''
         }, {
+          surface: '5',
+          label: 'fCurrencyName',
+          name: '规格型号',
+          checked: 0,
+          width: 100,
+          onabort: ''
+        }, {
           surface: '6',
           label: 'createTime',
           name: '申请日期',
@@ -299,6 +308,7 @@ export default {
           name: '操作',
           checked: 0,
           width: 160,
+          fixed:'right',
           operation: '1',
           onabort: ''
         }
@@ -359,6 +369,15 @@ export default {
           changeable: 1
         }, {
           surface: '7',
+          label: 'fCurrencyName',
+          name: '规格型号',
+          checked: 0,
+          width: 100,
+          onabort: '',
+          disabled: false,
+          changeable: 1
+        }, {
+          surface: '8',
           label: 'fAmount',
           name: '金额',
           checked: 0,
@@ -367,7 +386,7 @@ export default {
           disabled: false,
           changeable: 2
         }, {
-          surface: '8',
+          surface: '9',
           label: 'remark',
           name: '备注',
           checked: 0,
@@ -376,7 +395,7 @@ export default {
           disabled: false,
           changeable: 2
         }, {
-          surface: '9',
+          surface: '10',
           label: 'createTime',
           name: '申请日期',
           checked: 0,
@@ -407,6 +426,7 @@ export default {
           name: '操作',
           checked: 0,
           disabled: false,
+          fixed:'right',
           width: 160,
           operation: '2',
           onabort: ''
@@ -479,6 +499,13 @@ export default {
           icon: 'el-icon-edit',
           name: '修改',
           disabled: false
+        },
+        {
+          type: 'primary',
+          size: 'mini',
+          icon: 'el-icon-edit-outline',
+          name: '打印',
+          disabled: false
         }, {
           type: 'warning',
           size: 'mini',
@@ -506,13 +533,6 @@ export default {
           icon: 'el-icon-edit-outline',
           name: '申请发票',
           disabled: false
-        },
-        {
-          type: 'primary',
-          size: 'mini',
-          icon: 'el-icon-edit-outline',
-          name: '打印',
-          disabled: false
         }
       ],
       formOption: [

src/views/purchaseRequest/index.vue

@@ -524,6 +524,12 @@ export default {
           icon: 'el-icon-edit-outline',
           name: '生成销售单',
           disabled: false
+        },{
+          type: 'info',
+          size: 'mini',
+          icon: 'el-icon-edit-outline',
+          name: '生成出库单',
+          disabled: false
         }
       ],
       formOption: [
@@ -1133,7 +1139,7 @@ export default {
         case '修改':
           this.contentButton.forEach(item =>{
             if (this.$refs.avatar.form.fBillstatus >= 4){
-              if (item.name === '返回列表' || item.name == '打印' || item.name === '修改' || item.name === '生成入库单' || item.name === '生成销售单' || item.name === '查看审批' || item.name === '审批' || item.name === '撤销采购' || item.name === '撤销审批'){
+              if (item.name === '返回列表' || item.name == '打印' || item.name === '修改' || item.name === '生成入库单' || item.name === '生成销售单'||item.name === '生成出库单' || item.name === '查看审批' || item.name === '审批' || item.name === '撤销采购' || item.name === '撤销审批'){
                 item.disabled = false
               }else {
                 item.disabled = true
@@ -1235,6 +1241,19 @@ export default {
             });
           })
           break
+        case '生成出库单':
+          let listd = {
+            fId:this.$refs.avatar.form.fId,
+            fBilltype:'CK'
+          }
+          copyNew(listd).then(res=>{
+            this.$message({
+              message: '生成成功',
+              type: 'success',
+              showClose:true
+            });
+          })
+          break
         case '复制新增':
           if (this.selection.length > 0){
             let datae = {