Home Explore Help
Sign In
yichepei
/
lemonBeans_ui
4
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

Merge branch 'dev' of http://git.echepei.com/zhujiawei/Warehouse_management_ui into dev

QuKatie 3 years ago
parent
00c3e77523 2b56b262e8
commit
f9d4cd7a1d
19 changed files with 859 additions and 902 deletions
Split View Show Diff Stats
  1. 0 84
      public/view.html
  2. 0 432
      public/view.js
  3. 23 12
      src/views/Warehousing/cargoClearance/AddOrUpdate.vue
  4. 14 33
      src/views/Warehousing/components/incomeMoney.vue
  5. 1 1
      src/views/Warehousing/components/payMoney.vue
  6. 58 29
      src/views/Warehousing/costModify/AddOrUpdate.vue
  7. 99 44
      src/views/Warehousing/goodsTransfer/AddOrUpdate.vue
  8. 22 12
      src/views/Warehousing/inAndOutStock/AddOrUpdate.vue
  9. 166 59
      src/views/Warehousing/inStock/AddOrUpdate.vue
  10. 174 84
      src/views/Warehousing/outStock/AddOrUpdate.vue
  11. 116 64
      src/views/Warehousing/stockTransfer/AddOrUpdate.vue
  12. 2 2
      src/views/agreement/agreementTask/index.vue
  13. 0 19
      src/views/appVersion/version/index.vue
  14. 1 1
      src/views/basicdata/dept/index.vue
  15. 151 0
      src/views/finance/contrast/index.vue
  16. 6 4
      src/views/index.vue
  17. 3 2
      src/views/morePage/stock/index.vue
  18. 5 5
      src/views/reportManagement/whgenleg/index.vue
  19. 18 15
      src/views/warehouseBusiness/agreement/index.vue

+ 0 - 84
public/view.html
View File 

@@ -1,84 +0,0 @@
 
-
 
-<!DOCTYPE html>
 
-<html lang="en">
 
-
 
-<head>
 
-  <meta charset="utf-8">
 
-  <meta http-equiv="X-UA-Compatible" content="IE=edge">
 
-  <meta name="viewport" content="width=device-width,initial-scale=1.0">
 
-  <META HTTP-EQUIV="Pragma" CONTENT="no-cache">
 
-  <META HTTP-EQUIV="Cache-Control" CONTENT="no-cache">
 
-  <META HTTP-EQUIV="Expires" CONTENT="0">
 
-  <script src="./view.js"></script>
 
-  <link rel="stylesheet" href="https://at.alicdn.com/t/font_1117329_z5buvlhlaf.css">
 
-  <link rel="stylesheet" href="https://cdn.bootcdn.net/ajax/libs/animate.css/3.5.1/animate.min.css">
 
-  <link rel="stylesheet" href="https://cdn.bootcdn.net/ajax/libs/element-ui/2.15.3/theme-chalk/index.min.css">
 
-  <link rel="stylesheet" href="https://avuejs.com/lib/index.css">
 
-  <link rel="stylesheet" href="https://data.avuejs.com/lib/index.css">
 
-  <script src="https://data.avuejs.com/config.js"></script>
 
-  <script src="https://cdn.bootcdn.net/ajax/libs/echarts/4.2.1/echarts.min.js"></script>
 
-  <script src="https://data.avuejs.com/cdn/echarts-wordcloud.min.js"></script>
 
-  <script src="https://data.avuejs.com/cdn/clappr.min.js"></script>
 
-  <script src="https://data.avuejs.com/const/theme/avue.project.js"></script>
 
-  <script src="https://data.avuejs.com/const/theme/halloween.project.js"></script>
 
-  <script src="https://data.avuejs.com/const/theme/wonderland.project.js"></script>
 
-  <script src="https://cdn.bootcdn.net/ajax/libs/vue/2.6.14/vue.min.js" charset="utf-8"></script>
 
-  <script src="https://cdn.bootcdn.net/ajax/libs/axios/0.21.1/axios.min.js" charset="utf-8"></script>
 
-  <script src="https://cdn.bootcdn.net/ajax/libs/element-ui/2.15.3/index.min.js" charset="utf-8"></script>
 
-  <script src="https://avuejs.com/lib/avue.min.js"></script>
 
-  <script src="https://data.avuejs.com/cdn/datav.min.vue.js"></script>
 
-  <script src="https://data.avuejs.com/lib/index.umd.min.js"></script>
 
-  <title>云仓智慧大屏</title>
 
-  <style>
 
-    * {
 
-      padding: 0;
 
-      margin: 0;
 
-    }
 
-
 
-    body,
 
-    html,
 
-    #app {
 
-      height: 100%;
 
-    }
 
-  </style>
 
-  <script>
 
-    function GetQueryString(name) {
 
-      var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)");
 
-      var r = window.location.search.substr(1).match(reg);
 
-      if (r != null) return unescape(r[2]); return null;
 
-    }
 
-    Vue.use(window.AVUE);
 
-  </script>
 
-</head>
 
-
 
-<body>
 
-  <div id="app">
 
-    <avue-data :props="props" :option="option"></avue-data>
 
-  </div>
 
-  <style>
 
-      .el-input--suffix .el-input__inner{
 
-          background-color: #000000;
 
-          color: #FFFFFF;
 
-          border: #FFFFFF solid 0;
 
-      }
 
-  </style>
 
-  <script>;
 
-    new Vue({
 
-      el: '#app',
 
-      data() {
 
-        return {
 
-          props: {
 
-            id: GetQueryString('id'),
 
-            name: 'view'
 
-          },
 
-          option: option
 
-        }
 
-      },
 
-      components: {
 
-        avueData
 
-      }
 
-    })
 
-  </script>
 
-</body>
 
-
 
-</html>

File diff suppressed because it is too large
+ 0 - 432
public/view.js


+ 23 - 12
src/views/Warehousing/cargoClearance/AddOrUpdate.vue
View File 

@@ -853,6 +853,7 @@
 
               align="center"
 
               :fixed="item.fixed"
 
               sortable
 
+              show-overflow-tooltip
 
             >
 
               <template slot-scope="scope">
 
                 <span v-if="item.label == 'fBillstatus'">
 
@@ -3184,10 +3185,6 @@ export default {
 
     this.getDicts("data_stltype_type").then((response) => {
 
       this.fStltypeOptions = response.data;
 
     });
 
-    this.getDicts("st_trans_type").then((response) => {
 
-      this.businessTypeOption = response.data;
 
-      localStorage.setItem("businessTypeList", JSON.stringify(response.data));
 
-    });
 
     this.getDicts("data_unitfees").then((response) => {
 
       this.fFeetUnitOptions = response.data;
 
     });
 
@@ -3197,10 +3194,6 @@ export default {
 
     this.getDicts("data_ifweigh_status").then((response) => {
 
       this.fIfweighOptions = response.data;
 
     });
 
-    this.getDicts("storage_type").then((response) => {
 
-      this.fStorageTypeOptions = response.data;
 
-      localStorage.setItem("fStorageTypeList", JSON.stringify(response.data));
 
-    });
 
     this.getDicts("sys_car_type").then((response) => {
 
       this.fCartypeOptions = response.data;
 
     });
 
@@ -3210,6 +3203,14 @@ export default {
 
     this.getDicts("data_ifdamage_status").then((response) => {
 
       this.fIfdamageOptions = response.data;
 
     });
 
+    this.getDicts("st_trans_type").then((response) => {
 
+      this.businessTypeOption = response.data;
 
+      localStorage.setItem("businessTypeList", JSON.stringify(response.data));
 
+    });
 
+    this.getDicts("storage_type").then((response) => {
 
+      this.fStorageTypeOptions = response.data;
 
+      localStorage.setItem("fStorageTypeList", JSON.stringify(response.data));
 
+    });
 
     this.getConfigKey("data_showcar").then((response) => {
 
       this.dataShowcar = response.msg;
 
       if (this.dataShowcar == "0") {
 
@@ -3256,6 +3257,16 @@ export default {
 
     this.getRow();
 
     this.getRow2();
 
   },
 
+  activated() {
 
+    this.getDicts("st_trans_type").then((response) => {
 
+      this.businessTypeOption = response.data;
 
+      localStorage.setItem("businessTypeList", JSON.stringify(response.data));
 
+    });
 
+    this.getDicts("storage_type").then((response) => {
 
+      this.fStorageTypeOptions = response.data;
 
+      localStorage.setItem("fStorageTypeList", JSON.stringify(response.data));
 
+    });
 
+  },
 
   filters: {
 
     fStorageFormat(row) {
 
       let name;
 
@@ -4748,7 +4759,7 @@ export default {
 
               fAmount: null,
 
               fCurrency: "RMB",
 
               fExrate: "1",
 
-              fTaxrate: this.fTaxrate,
 
+              fTaxrate: '0',
 
               fCxrate: null,
 
               fRate: null,
 
               remarks: null,
 
@@ -4784,7 +4795,7 @@ export default {
 
               fAmount: null,
 
               fCurrency: "RMB",
 
               fExrate: "1",
 
-              fTaxrate: this.fTaxrate,
 
+              fTaxrate: '0',
 
               fCxrate: null,
 
               fRate: null,
 
               remarks: null,
 
@@ -4836,7 +4847,7 @@ export default {
 
               fCurrency: "RMB",
 
               fExrate: 1,
 
               fAmount: fAmount,
 
-              fTaxrate: this.fTaxrate,
 
+              fTaxrate: '0',
 
               fMblno: this.form.fMblno,
 
               fProductName: this.form.fProductName,
 
               fMarks: this.form.fMarks,
 
@@ -4854,7 +4865,7 @@ export default {
 
               fCurrency: "RMB",
 
               fExrate: 1,
 
               fAmount: fAmount,
 
-              fTaxrate: this.fTaxrate,
 
+              fTaxrate: '0',
 
               fMblno: this.form.fMblno,
 
               fProductName: this.form.fProductName,
 
               fMarks: this.form.fMarks,

+ 14 - 33
src/views/Warehousing/components/incomeMoney.vue
View File 

@@ -675,7 +675,7 @@
 
             margin-bottom: 5px;
 
           "
 
         >
 
-          {{ company }}
 
+          {{ fCompanyName? fCompanyName: company }}
 
         </div>
 
         <div
 
           style="
 
@@ -746,12 +746,12 @@
 
           </table>
 
         </div>
 
         <div>人民币汇款路径：</div>
 
-        <div>公司名称：{{ company }}</div>
 
-        <div>纳税人识别号：{{ Identifier }}</div>
 
-        <div>地址：{{ address }}</div>
 
-        <div>电话：{{ phone }}</div>
 
-        <div>开户行：{{ bank }}</div>
 
-        <div>银行账户：{{ bankAccount }}</div>
 
+        <div>公司名称：{{ fCompanyName? fCompanyName: company }}</div>
 
+        <div>纳税人识别号：{{ printFeeConfirm.fTax }}</div>
 
+        <div>地址：{{ printFeeConfirm.fAddr }}</div>
 
+        <div>电话：{{ printFeeConfirm.fTel }}</div>
 
+        <div>开户行：{{ printFeeConfirm.fBankname }}</div>
 
+        <div>银行账户：{{ printFeeConfirm.fBankno }}</div>
 
       </div>
 
       <span slot="footer" class="dialog-footer">
 
         <el-button
 
@@ -843,6 +843,12 @@ export default {
 
       type: Array,
 
       default: [],
 
     },
 
+    fCompanyName: {
 
+      type: String
 
+    },
 
+    printFeeConfirm: {
 
+      type: Object,
 
+    },
 
   },
 
   data() {
 
     return {
 
@@ -864,16 +870,6 @@ export default {
 
       print_fyqr: false,
 
       company: '',
 
       warehouseOptions:[],
 
-      // 识别号
 
-      Identifier: '',
 
-      // 地址
 
-      address: '',
 
-      // 电话
 
-      phone: '',
 
-      // 开户行
 
-      bank: '',
 
-      // 银行账户
 
-      bankAccount: '',
 
       // 是否启用请款单
 
       isShowInvoice: null,
 
       // 是否启用费用确认单
 
@@ -881,21 +877,6 @@ export default {
 
     };
 
   },
 
   created() {
 
-    this.getConfigKey("taxpayer.identification.number").then((response) => {
 
-      this.Identifier = response.msg;
 
-    });
 
-    this.getConfigKey("print.address").then((response) => {
 
-      this.address = response.msg;
 
-    });
 
-    this.getConfigKey("print.phone").then((response) => {
 
-      this.phone = response.msg;
 
-    });
 
-    this.getConfigKey("print.bank").then((response) => {
 
-      this.bank = response.msg;
 
-    });
 
-    this.getConfigKey("print.bank.account").then((response) => {
 
-      this.bankAccount = response.msg;
 
-    });
 
     this.getConfigKey("warehouse.show.invoice").then((response) => {
 
       this.isShowInvoice = response.msg;
 
     });
 
@@ -1123,7 +1104,7 @@ export default {
 
             fCurrency: "RMB",
 
             fExrate: 1,
 
             fAmount: fAmount,
 
-            fTaxrate: this.fTaxrate,
 
+            fTaxrate: '0',
 
             fMblno: this.form.fMblno,
 
             fProductName: this.form.fProductName,
 
             fMarks: this.form.fMarks,

+ 1 - 1
src/views/Warehousing/components/payMoney.vue
View File 

@@ -1078,7 +1078,7 @@ export default {
 
             fCurrency: "RMB",
 
             fExrate: 1,
 
             fAmount: fAmount,
 
-            fTaxrate: this.fTaxrate,
 
+            fTaxrate: '0',
 
             fMblno: this.form.fMblno,
 
             fProductName: this.form.fProductName,
 
             fMarks: this.form.fMarks,

+ 58 - 29
src/views/Warehousing/costModify/AddOrUpdate.vue
View File 

@@ -11,6 +11,7 @@
 
         ref="form"
 
         :model="form"
 
         label-width="110px"
 
+        :rules="rules"
 
       >
 
         <el-row>
 
           <el-col :span="6">
 
@@ -124,13 +125,24 @@
 
             </el-form-item>
 
           </el-col>
 
           <el-col :span="6">
 
-            <div style="display: flex;justify-content: flex-end">
 
-              <el-button
 
-                type="primary"
 
-                v-if="!isDisabled"
 
-              >查询</el-button>
 
-            </div>
 
+            <el-form-item label="变更原因" prop="remark">
 
+              <el-input
 
+                placeholder="请输入变更原因"
 
+                size="small"
 
+                style="width: 100%"
 
+                :disabled="disabledtwo"
 
+                v-model="form.remark"
 
+              ></el-input>
 
+            </el-form-item>
 
           </el-col>
 
+<!--          <el-col :span="6">-->
 
+<!--            <div style="display: flex;justify-content: flex-end">-->
 
+<!--              <el-button-->
 
+<!--                type="primary"-->
 
+<!--                v-if="!isDisabled"-->
 
+<!--              >查询</el-button>-->
 
+<!--            </div>-->
 
+<!--          </el-col>-->
 
         </el-row>
 
       </el-form>
 
 
@@ -712,6 +724,12 @@ export default {
 
   },
 
   data() {
 
     return {
 
+      // 校验
 
+      rules: {
 
+        remark: [
 
+          {required: true, message: ' ', trigger: 'blur'}
 
+        ]
 
+      },
 
       // 控制弹出框显示隐藏
 
       showDialog: false,
 
       // 折叠面板激活
 
@@ -897,7 +915,6 @@ export default {
 
         fBilltype: this.form.fBilltype,
 
         fStltypeid: 1,
 
       }
 
-      console.log(list)
 
       this.formfeesList.push(list)
 
     },
 
     //变更按钮
 
@@ -942,31 +959,43 @@ export default {
 
     },
 
     // 保存
 
     handleSave() {
 
-      let data = {
 
-        warehouseId: this.warehouseId,
 
-        items: this.formfeesList,
 
-        itemDel: [],
 
-        fDc: this.fDc,
 
-      }
 
-      data = Object.assign({}, this.form, data)
 
-      saveWarehouseModify(data).then(res => {
 
-        this.form = res.data;
 
-        this.formfeesList = this.form.items
 
-        this.$message.success(res.msg)
 
+      this.$refs.form.validate(valid => {
 
+        if (valid) {
 
+          let data = {
 
+            warehouseId: this.warehouseId,
 
+            items: this.formfeesList,
 
+            itemDel: [],
 
+            fDc: this.fDc,
 
+          }
 
+          data = Object.assign({}, this.form, data)
 
+          saveWarehouseModify(data).then(res => {
 
+            this.form = res.data;
 
+            this.formfeesList = this.form.items
 
+            this.$message.success(res.msg)
 
+          })
 
+        } else {
 
+          return false
 
+        }
 
       })
 
     },
 
     pleaseCheckHandle() {
 
-      // this.handleSave()
 
-      let data = {
 
-        warehouseId: this.warehouseId,
 
-        items: this.formfeesList,
 
-        itemDel: [],
 
-        fDc: this.fDc,
 
-      }
 
-      data = Object.assign({}, this.form, data)
 
-      checkWarehouseModify(data).then(res => {
 
-        this.$message.success(res.msg)
 
-        this.showDialog = false
 
+      this.$refs.form.validate(valid => {
 
+        if (valid) {
 
+          // this.handleSave()
 
+          let data = {
 
+            warehouseId: this.warehouseId,
 
+            items: this.formfeesList,
 
+            itemDel: [],
 
+            fDc: this.fDc,
 
+          }
 
+          data = Object.assign({}, this.form, data)
 
+          checkWarehouseModify(data).then(res => {
 
+            this.$message.success(res.msg)
 
+            this.showDialog = false
 
+          })
 
+        } else {
 
+          return false
 
+        }
 
       })
 
     },
 
     addOrUpdateHandle(status) {

+ 99 - 44
src/views/Warehousing/goodsTransfer/AddOrUpdate.vue
View File 

@@ -244,6 +244,28 @@
 
       </el-row>
 
       <el-row>
 
         <el-col :span="8">
 
+          <el-form-item label="打印抬头">
 
+            <el-select
 
+              v-model="form.fCompany"
 
+              clearable
 
+              filterable
 
+              placeholder="请输入关键词"
 
+              style="width: 80%"
 
+              @change="changePrint"
 
+              :disabled="browseStatus || form.warehouseStatus > 3"
 
+            >
 
+              <el-option
 
+                v-for="(item, index) in fMblnoOptions"
 
+                :key="index.fId"
 
+                :label="item.fName"
 
+                :value="item.fId"
 
+              ></el-option>
 
+            </el-select>
 
+          </el-form-item>
 
+        </el-col>
 
+      </el-row>
 
+      <el-row>
 
+        <el-col :span="8">
 
           <el-form-item>
 
             <div style="display: flex; align-items: center">
 
               <el-table
 
@@ -459,6 +481,7 @@
 
               align="center"
 
               :fixed="item.fixed"
 
               sortable
 
+              show-overflow-tooltip
 
             >
 
               <template slot-scope="scope">
 
                 <span v-if="item.label == 'fBillstatus'">
 
@@ -1830,7 +1853,7 @@
 
             margin-bottom: 5px;
 
           "
 
         >
 
-          {{ company }}请款单
 
+          {{ fCompanyName? fCompanyName: company }}请款单
 
         </div>
 
         <div
 
           style="
 
@@ -1937,7 +1960,7 @@
 
             margin-bottom: 5px;
 
           "
 
         >
 
-          {{ company }}
 
+          {{ fCompanyName? fCompanyName: company }}
 
         </div>
 
         <div
 
           style="
 
@@ -2008,12 +2031,12 @@
 
           </table>
 
         </div>
 
         <div>人民币汇款路径：</div>
 
-        <div>公司名称：{{ company }}</div>
 
-        <div>纳税人识别号：{{ Identifier }}</div>
 
-        <div>地址：{{ address }}</div>
 
-        <div>电话：{{ phone }}</div>
 
-        <div>开户行：{{ bank }}</div>
 
-        <div>银行账户：{{ bankAccount }}</div>
 
+        <div>公司名称：{{ fCompanyName? fCompanyName: company }}</div>
 
+        <div>纳税人识别号：{{ printFeeConfirm.fTax }}</div>
 
+        <div>地址：{{ printFeeConfirm.fAddr }}</div>
 
+        <div>电话：{{ printFeeConfirm.fTel }}</div>
 
+        <div>开户行：{{ printFeeConfirm.fBankname }}</div>
 
+        <div>银行账户：{{ printFeeConfirm.fBankno }}</div>
 
       </div>
 
       <span slot="footer" class="dialog-footer">
 
         <el-button
 
@@ -2151,7 +2174,7 @@ import {
 
   fromMblno
 
 } from "@/api/warehouseBusiness/goodsTransfer";
 
 import { operationAgreement } from "@/api/agreement/agreement";
 
-import { listCorps } from "@/api/basicdata/corps";
 
+import { listCorps, getCorps } from "@/api/basicdata/corps";
 
 import { listFees, getFees } from "@/api/basicdata/fees";
 
 import {
 
   listWarehouse,
 
@@ -2453,6 +2476,13 @@ export default {
 
           width: 100,
 
         },
 
         {
 
+          surface: "18",
 
+          label: "fShipper",
 
+          name: "发货方",
 
+          checked: 0,
 
+          width: 100,
 
+        },
 
+        {
 
           surface: "19",
 
           label: "fLntype",
 
           name: "装卸方式",
 
@@ -2620,22 +2650,21 @@ export default {
 
       allDrAmount: 0,
 
       print_fyqr: false,
 
       activeName: 'searchList',
 
-      // 识别号
 
-      Identifier: '',
 
-      // 地址
 
-      address: '',
 
-      // 电话
 
-      phone: '',
 
-      // 开户行
 
-      bank: '',
 
-      // 银行账户
 
-      bankAccount: '',
 
       nowTime: null,
 
       print_Crfyqr: false,
 
       // 是否启用请款单
 
       isShowInvoice: null,
 
       // 是否启用费用确认单
 
       isShowFeesConfirm: null,
 
+      // 选择打印抬头中文名
 
+      fCompanyName: '',
 
+      printFeeConfirm: {
 
+        fAddr: '',
 
+        fBankname: '',
 
+        fBankno: '',
 
+        fTel: '',
 
+        fTax: '',
 
+      },
 
     };
 
   },
 
   created() {
 
@@ -2646,10 +2675,6 @@ export default {
 
     this.getDicts("data_stltype_type").then((response) => {
 
       this.fStltypeOptions = response.data;
 
     });
 
-    this.getDicts("st_goodstf_type").then((response) => {
 
-      this.businessTypeOption = response.data;
 
-      localStorage.setItem("businessTypeList", JSON.stringify(response.data));
 
-    });
 
     this.getDicts("data_unitfees").then((response) => {
 
       this.fFeetUnitOptions = response.data;
 
     });
 
@@ -2659,30 +2684,19 @@ export default {
 
     this.getDicts("data_ifweigh_status").then((response) => {
 
       this.fIfweighOptions = response.data;
 
     });
 
-    this.getDicts("storage_type").then((response) => {
 
-      this.fStorageTypeOptions = response.data;
 
-      localStorage.setItem("fStorageTypeList", JSON.stringify(response.data));
 
-    });
 
     this.getDicts("sys_car_type").then((response) => {
 
       this.fCartypeOptions = response.data;
 
     });
 
     this.getDicts("data_ifdamage_status").then((response) => {
 
       this.fIfdamageOptions = response.data;
 
     });
 
-    this.getConfigKey("taxpayer.identification.number").then((response) => {
 
-      this.Identifier = response.msg;
 
-    });
 
-    this.getConfigKey("print.address").then((response) => {
 
-      this.address = response.msg;
 
-    });
 
-    this.getConfigKey("print.phone").then((response) => {
 
-      this.phone = response.msg;
 
-    });
 
-    this.getConfigKey("print.bank").then((response) => {
 
-      this.bank = response.msg;
 
+    this.getDicts("st_goodstf_type").then((response) => {
 
+      this.businessTypeOption = response.data;
 
+      localStorage.setItem("businessTypeList", JSON.stringify(response.data));
 
     });
 
-    this.getConfigKey("print.bank.account").then((response) => {
 
-      this.bankAccount = response.msg;
 
+    this.getDicts("storage_type").then((response) => {
 
+      this.fStorageTypeOptions = response.data;
 
+      localStorage.setItem("fStorageTypeList", JSON.stringify(response.data));
 
     });
 
     this.getConfigKey("warehouse.show.invoice").then((response) => {
 
       this.isShowInvoice = response.msg;
 
@@ -2729,6 +2743,16 @@ export default {
 
     this.getRow();
 
     this.getRow2();
 
   },
 
+  activated() {
 
+    this.getDicts("st_goodstf_type").then((response) => {
 
+      this.businessTypeOption = response.data;
 
+      localStorage.setItem("businessTypeList", JSON.stringify(response.data));
 
+    });
 
+    this.getDicts("storage_type").then((response) => {
 
+      this.fStorageTypeOptions = response.data;
 
+      localStorage.setItem("fStorageTypeList", JSON.stringify(response.data));
 
+    });
 
+  },
 
   filters: {
 
     fStorageFormat(row) {
 
       let name;
 
@@ -3140,6 +3164,7 @@ export default {
 
           remark: null,
 
           fSrcid: e.fId,
 
           fSrcBsdate: e.fBsdate,
 
+          fShipper: e.fShipper,
 
         });
 
       });
 
       this.whgenlegVisible = false;
 
@@ -3534,6 +3559,7 @@ export default {
 
     getForm() {
 
       getGoodsTransfer(this.chiId).then((response) => {
 
         this.form = response.data.warehousebills;
 
+        if (this.form.fCompany) this.changePrint()
 
         if (this.form.fBillstatus > 3) {
 
           this.approvalStatus = false;
 
           this.browseStatus = true;
 
@@ -4238,7 +4264,7 @@ export default {
 
               fAmount: null,
 
               fCurrency: "RMB",
 
               fExrate: "1",
 
-              fTaxrate: this.fTaxrate,
 
+              fTaxrate: '0',
 
               fCxrate: null,
 
               fRate: null,
 
               remarks: null,
 
@@ -4274,7 +4300,7 @@ export default {
 
               fAmount: null,
 
               fCurrency: "RMB",
 
               fExrate: "1",
 
-              fTaxrate: this.fTaxrate,
 
+              fTaxrate: '0',
 
               fCxrate: null,
 
               fRate: null,
 
               remarks: null,
 
@@ -4326,7 +4352,7 @@ export default {
 
               fCurrency: "RMB",
 
               fExrate: 1,
 
               fAmount: fAmount,
 
-              fTaxrate: this.fTaxrate,
 
+              fTaxrate: '0',
 
               fMblno: this.form.fMblno,
 
               fProductName: this.form.fProductName,
 
               fMarks: this.form.fMarks,
 
@@ -4344,7 +4370,7 @@ export default {
 
               fCurrency: "RMB",
 
               fExrate: 1,
 
               fAmount: fAmount,
 
-              fTaxrate: this.fTaxrate,
 
+              fTaxrate: '0',
 
               fMblno: this.form.fMblno,
 
               fProductName: this.form.fProductName,
 
               fMarks: this.form.fMarks,
 
@@ -4489,6 +4515,14 @@ export default {
 
       this.warehouseCrList = [];
 
       this.warehouseDrList = [];
 
       this.CntrTable = [];
 
+      this.printFeeConfirm = {
 
+        fAddr: '',
 
+        fBankname: '',
 
+        fBankno: '',
 
+        fTel: '',
 
+        fTax: '',
 
+      }
 
+      this.fCompanyName = '';
 
       this.$emit("changeShow", "true");
 
     },
 
     goBack() {
 
@@ -4737,6 +4771,27 @@ export default {
 
         this.$message.error("请选择需要打印的明细!");
 
       }
 
     },
 
+    changePrint() {
 
+      if (this.form.fCompany) {
 
+        getCorps(this.form.fCompany).then(res => {
 
+          this.fCompanyName = res.data.corp.fName
 
+          this.printFeeConfirm.fAddr = res.data.corp.fAddr
 
+          this.printFeeConfirm.fTel = res.data.corp.fTel
 
+          this.printFeeConfirm.fBankname = res.data.corp.fBankname
 
+          this.printFeeConfirm.fBankno = res.data.corp.fBankno
 
+          this.printFeeConfirm.fTax = res.data.corp.fTax
 
+        })
 
+      } else {
 
+        this.fCompanyName = ''
 
+        this.printFeeConfirm = {
 
+          fAddr: '',
 
+          fBankname: '',
 
+          fBankno: '',
 
+          fTel: '',
 
+          fTax: '',
 
+        }
 
+      }
 
+    },
 
   },
 
   watch: {
 
     // 监听 addOrUpdateVisible 改变

+ 22 - 12
src/views/Warehousing/inAndOutStock/AddOrUpdate.vue
View File 

@@ -5019,10 +5019,6 @@ export default {
 
     this.getDicts("data_stltype_type").then((response) => {
 
       this.fStltypeOptions = response.data;
 
     });
 
-    this.getDicts("st_out_type").then((response) => {
 
-      this.businessTypeOption = response.data;
 
-      localStorage.setItem("businessTypeList", JSON.stringify(response.data));
 
-    });
 
     this.getDicts("data_unitfees").then((response) => {
 
       this.fFeetUnitOptions = response.data;
 
     });
 
@@ -5032,10 +5028,6 @@ export default {
 
     this.getDicts("data_ifweigh_status").then((response) => {
 
       this.fIfweighOptions = response.data;
 
     });
 
-    this.getDicts("storage_type").then((response) => {
 
-      this.fStorageTypeOptions = response.data;
 
-      localStorage.setItem("fStorageTypeList", JSON.stringify(response.data));
 
-    });
 
     this.getDicts("sys_car_type").then((response) => {
 
       this.fCartypeOptions = response.data;
 
     });
 
@@ -5048,6 +5040,14 @@ export default {
 
     this.getDicts("data_ifdamage_status").then((response) => {
 
       this.fIfdamageOptions = response.data;
 
     });
 
+    this.getDicts("st_out_type").then((response) => {
 
+      this.businessTypeOption = response.data;
 
+      localStorage.setItem("businessTypeList", JSON.stringify(response.data));
 
+    });
 
+    this.getDicts("storage_type").then((response) => {
 
+      this.fStorageTypeOptions = response.data;
 
+      localStorage.setItem("fStorageTypeList", JSON.stringify(response.data));
 
+    });
 
     this.getConfigKey("new.plan").then((response) => {
 
       this.newPlan = response.msg;
 
     });
 
@@ -5095,6 +5095,16 @@ export default {
 
     this.getRow();
 
     this.getRow2();
 
   },
 
+  activated() {
 
+    this.getDicts("st_out_type").then((response) => {
 
+      this.businessTypeOption = response.data;
 
+      localStorage.setItem("businessTypeList", JSON.stringify(response.data));
 
+    });
 
+    this.getDicts("storage_type").then((response) => {
 
+      this.fStorageTypeOptions = response.data;
 
+      localStorage.setItem("fStorageTypeList", JSON.stringify(response.data));
 
+    });
 
+  },
 
   filters: {
 
     fBsdateFormat(row) {
 
       if (row) {
 
@@ -7402,7 +7412,7 @@ export default {
 
               fAmount: null,
 
               fCurrency: "RMB",
 
               fExrate: "1",
 
-              fTaxrate: this.fTaxrate,
 
+              fTaxrate: '0',
 
               fCxrate: null,
 
               fRate: null,
 
               remarks: null,
 
@@ -7439,7 +7449,7 @@ export default {
 
               fAmount: null,
 
               fCurrency: "RMB",
 
               fExrate: "1",
 
-              fTaxrate: this.fTaxrate,
 
+              fTaxrate: '0',
 
               fCxrate: null,
 
               fRate: null,
 
               remarks: null,
 
@@ -7490,7 +7500,7 @@ export default {
 
               fCurrency: "RMB",
 
               fExrate: 1,
 
               fAmount: fAmount,
 
-              fTaxrate: this.fTaxrate,
 
+              fTaxrate: '0',
 
               fMblno: this.form.fMblno,
 
               fProductName: this.form.fProductName,
 
               fMarks: this.form.fMarks,
 
@@ -7508,7 +7518,7 @@ export default {
 
               fCurrency: "RMB",
 
               fExrate: 1,
 
               fAmount: fAmount,
 
-              fTaxrate: this.fTaxrate,
 
+              fTaxrate: '0',
 
               fMblno: this.form.fMblno,
 
               fProductName: this.form.fProductName,
 
               fMarks: this.form.fMarks,

+ 166 - 59
src/views/Warehousing/inStock/AddOrUpdate.vue
View File 

@@ -305,37 +305,37 @@
 
           </el-form-item>
 
         </el-col>
 
         <el-col :span="8">
 
-          <el-form-item label="计划净重(kg)" prop="fPlannetweight">
 
+          <el-form-item label="计划毛重(kg)" prop="fPlangrossweight">
 
             <el-input
 
-                v-model="form.fPlannetweight"
 
-                style="width: 80%"
 
-                maxlength="16"
 
-                v-input-limit="2"
 
-                placeholder="计划净重"
 
-                @input="changePlannetWeight"
 
-                :disabled="
 
+              v-model="form.fPlangrossweight"
 
+              style="width: 80%"
 
+              v-input-limit="2"
 
+              placeholder="计划毛重"
 
+              maxlength="16"
 
+              :disabled="
 
                 browseStatus || current !== before || form.warehouseStatus > 3
 
               "
 
-                @change="tfNetweight"
 
+              @change="tfGrossweight"
 
             >
 
-              <template slot="append">{{ tfNetweightnum }}吨</template>
 
+              <template slot="append">{{ tfGrossweightnum }}吨</template>
 
             </el-input>
 
           </el-form-item>
 
         </el-col>
 
         <el-col :span="8">
 
-          <el-form-item label="计划毛重(kg)" prop="fPlangrossweight">
 
+          <el-form-item label="计划净重(kg)" prop="fPlannetweight">
 
             <el-input
 
-                v-model="form.fPlangrossweight"
 
+                v-model="form.fPlannetweight"
 
                 style="width: 80%"
 
-                v-input-limit="2"
 
-                placeholder="计划毛重"
 
                 maxlength="16"
 
+                v-input-limit="2"
 
+                placeholder="计划净重"
 
+                @input="changePlannetWeight"
 
                 :disabled="
 
                 browseStatus || current !== before || form.warehouseStatus > 3
 
               "
 
-                @change="tfGrossweight"
 
+                @change="tfNetweight"
 
             >
 
-              <template slot="append">{{ tfGrossweightnum }}吨</template>
 
+              <template slot="append">{{ tfNetweightnum }}吨</template>
 
             </el-input>
 
           </el-form-item>
 
         </el-col>
 
@@ -529,6 +529,49 @@
 
                 </el-form-item>
 
               </el-col>
 
             </el-row>
 
+            <el-row>
 
+              <el-col :span="12">
 
+                <el-form-item label="发货方">
 
+                  <el-select
 
+                    v-model="form.fShipper"
 
+                    clearable
 
+                    filterable
 
+                    placeholder="请输入关键词"
 
+                    :disabled="browseStatus || form.warehouseStatus > 3"
 
+                    style="width: 80%"
 
+                    allow-create
 
+                    default-first-option
 
+                  >
 
+                    <el-option
 
+                      v-for="(item, index) in fMblnoOptions"
 
+                      :key="index.fId"
 
+                      :label="item.fName"
 
+                      :value="item.fName"
 
+                    ></el-option>
 
+                  </el-select>
 
+                </el-form-item>
 
+              </el-col>
 
+              <el-col :span="12">
 
+                <el-form-item label="打印抬头">
 
+                  <el-select
 
+                    v-model="form.fCompany"
 
+                    clearable
 
+                    filterable
 
+                    placeholder="请输入关键词"
 
+                    style="width: 80%"
 
+                    @change="changePrint"
 
+                    :disabled="browseStatus || form.warehouseStatus > 3"
 
+                  >
 
+                    <el-option
 
+                      v-for="(item, index) in fMblnoOptions"
 
+                      :key="index.fId"
 
+                      :label="item.fName"
 
+                      :value="item.fId"
 
+                    ></el-option>
 
+                  </el-select>
 
+                </el-form-item>
 
+              </el-col>
 
+            </el-row>
 
           </div>
 
           <el-row>
 
             <el-col :span="12">
 
@@ -1417,6 +1460,8 @@
 
             :CntrTable="CntrTable"
 
             :cntrList="cntrList"
 
             :goodsOptions="goodsOptions"
 
+            :fCompanyName="fCompanyName"
 
+            :printFeeConfirm="printFeeConfirm"
 
         ></income-money>
 
       </el-collapse-item>
 
 
@@ -1856,7 +1901,7 @@
 
             position: relative;
 
           "
 
         >
 
-          {{ company }}作业单
 
+          {{ fCompanyName? fCompanyName: company }}作业单
 
           <div
 
             style="
 
             display: flex;
 
@@ -1987,7 +2032,7 @@
 
             margin-bottom: 5px;
 
           "
 
         >
 
-          {{ company }}收货单
 
+          {{ fCompanyName? fCompanyName: company }}收货单
 
         </div>
 
         <div class="print_table" style="display: flex">
 
           <table border="0" cellspacing="0" cellpadding="0" style="width: 100%; line-height: 30px">
 
@@ -2058,7 +2103,7 @@
 
             margin-bottom: 5px;
 
           "
 
         >
 
-          {{ company }}进仓单
 
+          {{ fCompanyName? fCompanyName: company }}进仓单
 
         </div>
 
         <div
 
           style="
 
@@ -2213,7 +2258,10 @@
 
             margin-bottom: 5px;
 
           "
 
         >
 
-          {{ company }}入库单
 
+          {{ fCompanyName? fCompanyName: company }}入库单
 
+        </div>
 
+        <div style="display: flex;justify-content: flex-end">
 
+          <div>制单人：{{ form.createBy }}</div>
 
         </div>
 
         <div class="print_table" style="display: flex">
 
           <table border="0" cellspacing="0" cellpadding="0" style="width: 100%; line-height: 30px">
 
@@ -2318,7 +2366,10 @@
 
             margin-bottom: 5px;
 
           "
 
         >
 
-          {{ company }}入库单
 
+          {{ fCompanyName? fCompanyName: company }}入库单
 
+        </div>
 
+        <div style="display: flex;justify-content: flex-end">
 
+          <div>制单人：{{ form.createBy }}</div>
 
         </div>
 
         <div class="print_table" style="display: flex">
 
           <table
 
@@ -2427,7 +2478,10 @@
 
             margin-bottom: 5px;
 
           "
 
         >
 
-          {{ company }}入库单
 
+          {{ fCompanyName? fCompanyName: company }}入库单
 
+        </div>
 
+        <div style="display: flex;justify-content: flex-end">
 
+          <div>制单人：{{ form.createBy }}</div>
 
         </div>
 
         <div class="print_table" style="display: flex">
 
           <table border="0" cellspacing="0" cellpadding="0" style="width: 100%; line-height: 30px">
 
@@ -2535,7 +2589,7 @@
 
             margin-bottom: 5px;
 
           "
 
         >
 
-          {{ company }}入库单
 
+          {{ fCompanyName? fCompanyName: company }}入库单
 
         </div>
 
         <div style="width: 100%">
 
           <div style="width: 100%;display: flex">
 
@@ -2660,7 +2714,7 @@
 
             margin-bottom: 5px;
 
           "
 
         >
 
-          {{ company }}
 
+          {{ fCompanyName? fCompanyName: company }}
 
         </div>
 
         <div
 
             style="
 
@@ -2776,7 +2830,7 @@
 
             margin-bottom: 5px;
 
           "
 
         >
 
-          {{ company }}
 
+          {{ fCompanyName? fCompanyName: company }}
 
         </div>
 
         <div
 
             style="
 
@@ -2864,7 +2918,7 @@
 
             margin-bottom: 5px;
 
           "
 
         >
 
-          {{ company }}
 
+          {{ fCompanyName? fCompanyName: company }}
 
         </div>
 
         <div
 
             style="
 
@@ -2952,7 +3006,7 @@
 
             margin-bottom: 5px;
 
           "
 
         >
 
-          {{ company }}货物标识卡
 
+          {{ fCompanyName? fCompanyName: company }}货物标识卡
 
         </div>
 
         <div
 
             style="
 
@@ -3066,7 +3120,7 @@
 
             margin-bottom: 5px;
 
           "
 
         >
 
-          {{ company }}
 
+          {{ fCompanyName? fCompanyName: company }}
 
         </div>
 
         <div style="display: flex; flex-direction: column; margin-left: 70%">
 
           <div>{{ form.fBillno }}</div>
 
@@ -3157,7 +3211,7 @@
 
             margin-bottom: 5px;
 
           "
 
         >
 
-          {{ company }}货物标识卡
 
+          {{ fCompanyName? fCompanyName: company }}货物标识卡
 
         </div>
 
         <div class="print_table" style="display: flex;flex-direction: column">
 
           <table
 
@@ -3366,7 +3420,7 @@
 
             margin-bottom: 5px;
 
           "
 
         >
 
-          {{ company }}
 
+          {{ fCompanyName? fCompanyName: company }}
 
         </div>
 
         <div
 
             style="
 
@@ -3570,7 +3624,7 @@
 
             margin-bottom: 5px;
 
           "
 
         >
 
-          {{ company }}货物标识卡
 
+          {{ fCompanyName? fCompanyName: company }}货物标识卡
 
         </div>
 
         <div class="print_table" style="display: flex">
 
           <table border="0" cellspacing="0" cellpadding="0" style="width: 100%; line-height: 30px">
 
@@ -3612,11 +3666,13 @@
 
             </tr>
 
             <tr>
 
               <td>本垛件数</td>
 
-              <td colspan="2">{{ form.fPlanqty }}</td>
 
+              <td colspan="2"></td>
 
+<!--              <td colspan="2">{{ form.fPlanqty }}</td>-->
 
               <td v-if="radio == 1">本垛净重(吨)</td>
 
               <td v-if="radio == 2">本垛净重(千克)</td>
 
-              <td v-if="radio == 1" colspan="2">{{ (form.fPlannetweight / 1000).toFixed(4) }}</td>
 
-              <td v-if="radio == 2" colspan="2">{{ form.fPlannetweight }}</td>
 
+              <td colspan="2"></td>
 
+<!--              <td v-if="radio == 1" colspan="2">{{ (form.fPlannetweight / 1000).toFixed(4) }}</td>-->
 
+<!--              <td v-if="radio == 2" colspan="2">{{ form.fPlannetweight }}</td>-->
 
             </tr>
 
             <tr>
 
               <td>入库日期</td>
 
@@ -3770,7 +3826,7 @@
 
             margin-bottom: 5px;
 
           "
 
         >
 
-          {{ company }}
 
+          {{ fCompanyName? fCompanyName: company }}
 
         </div>
 
         <div style="display:flex;flex-direction: column;margin-left: 70%">
 
           <div>{{ form.fBillno }}</div>
 
@@ -3855,7 +3911,7 @@
 
             margin-bottom: 5px;
 
           "
 
         >
 
-          {{ company }}货物标识卡
 
+          {{ fCompanyName? fCompanyName: company }}货物标识卡
 
         </div>
 
         <div class="print_table" style="display: flex">
 
           <table border="0" cellspacing="0" cellpadding="0" style="width: 100%" v-for="(item, index) in Printinglist"
 
@@ -4048,7 +4104,7 @@
 
             margin-bottom: 5px;
 
           "
 
         >
 
-          {{ company }}
 
+          {{ fCompanyName? fCompanyName: company }}
 
         </div>
 
         <div
 
             style="
 
@@ -4243,7 +4299,7 @@
 
             margin-bottom: 5px;
 
           "
 
         >
 
-          {{ company }}货物标识卡
 
+          {{ fCompanyName? fCompanyName: company }}货物标识卡
 
         </div>
 
         <div
 
             style="
 
@@ -4355,7 +4411,7 @@
 
             margin-bottom: 5px;
 
           "
 
         >
 
-          {{ company }}货物标识卡
 
+          {{ fCompanyName? fCompanyName: company }}货物标识卡
 
         </div>
 
         <div class="print_table" style="display: flex">
 
           <table
 
@@ -4554,7 +4610,7 @@
 
             margin-bottom: 5px;
 
           "
 
         >
 
-          {{ company }}
 
+          {{ fCompanyName? fCompanyName: company }}
 
         </div>
 
         <div
 
             style="
 
@@ -4949,7 +5005,7 @@
 
             margin-bottom: 5px;
 
           "
 
         >
 
-          {{ company }}
 
+          {{ fCompanyName? fCompanyName: company }}
 
         </div>
 
         <div style="display:flex;flex-direction: column;margin-left: 70%">
 
           <div>{{ form.fBillno }}</div>
 
@@ -5040,7 +5096,7 @@
 
             margin-bottom: 5px;
 
           "
 
         >
 
-          {{ company }}货物标识卡
 
+          {{ fCompanyName? fCompanyName: company }}货物标识卡
 
         </div>
 
         <div class="print_table" style="display: flex">
 
           <table border="0" cellspacing="0" cellpadding="0" style="width: 100%" v-for="(item, index) in Printinglist"
 
@@ -5233,7 +5289,7 @@
 
             margin-bottom: 5px;
 
           "
 
         >
 
-          {{ company }}
 
+          {{ fCompanyName? fCompanyName: company }}
 
         </div>
 
         <div
 
             style="
 
@@ -5332,7 +5388,7 @@
 
             margin-bottom: 5px;
 
           "
 
         >
 
-          {{ company }}入库单
 
+          {{ fCompanyName? fCompanyName: company }}入库单
 
         </div>
 
         <div
 
             style="
 
@@ -5547,7 +5603,7 @@
 
                 margin-bottom: 5px;
 
               "
 
         >
 
-          {{ company }}货物标识卡
 
+          {{ fCompanyName? fCompanyName: company }}货物标识卡
 
         </div>
 
         <div class="print_table" style="display: flex;flex-direction: column">
 
           <table border="0" cellspacing="0" cellpadding="0" style="width: 100%" v-for="(item, index) in Printinglist"
 
@@ -5750,7 +5806,7 @@
 
                 margin-bottom: 5px;
 
               "
 
         >
 
-          {{ company }}
 
+          {{ fCompanyName? fCompanyName: company }}
 
         </div>
 
         <div
 
             style="
 
@@ -6238,7 +6294,7 @@ import {
 
   feesCheck
 
 } from "@/api/warehouseBusiness/warehouseInStock";
 
 import {operationAgreement} from "@/api/agreement/agreement";
 
-import {listCorps} from "@/api/basicdata/corps";
 
+import {listCorps, getCorps} from "@/api/basicdata/corps";
 
 import {listFees, getFees} from "@/api/basicdata/fees";
 
 import {
 
   listWarehouse,
 
@@ -6676,19 +6732,32 @@ export default {
 
       entryPrinting: 1,
 
       weighedRequired: 1,
 
       inTime: '',
 
-      bring: null
 
+      bring: null,
 
+      // 选择打印抬头中文名
 
+      fCompanyName: '',
 
+      printFeeConfirm: {
 
+        fAddr: '',
 
+        fBankname: '',
 
+        fBankno: '',
 
+        fTel: '',
 
+        fTax: '',
 
+      },
 
     };
 
   },
 
   created() {
 
     this.setRowList = this.tableDate;
 
     this.getRowList = this.tableDate.filter((e) => e.checked == 0);
 
-    this.getDicts("data_stltype_type").then((response) => {
 
-      this.fStltypeOptions = response.data;
 
-    });
 
     this.getDicts("st_in_type").then((response) => {
 
       this.businessTypeOption = response.data;
 
       localStorage.setItem("businessTypeList", JSON.stringify(response.data));
 
     });
 
+    this.getDicts("storage_type").then((response) => {
 
+      this.fStorageTypeOptions = response.data;
 
+      localStorage.setItem("fStorageTypeList", JSON.stringify(response.data));
 
+    });
 
+    this.getDicts("data_stltype_type").then((response) => {
 
+      this.fStltypeOptions = response.data;
 
+    });
 
     this.getDicts("data_unitfees").then((response) => {
 
       this.fFeetUnitOptions = response.data;
 
     });
 
@@ -6701,10 +6770,6 @@ export default {
 
     this.getDicts("data_ifweigh_status").then((response) => {
 
       this.fIfpledgeOptions = response.data;
 
     });
 
-    this.getDicts("storage_type").then((response) => {
 
-      this.fStorageTypeOptions = response.data;
 
-      localStorage.setItem("fStorageTypeList", JSON.stringify(response.data));
 
-    });
 
     this.getDicts("unload_mode").then((response) => {
 
       this.unloadModes = response.data;
 
     });
 
@@ -6758,7 +6823,6 @@ export default {
 
       this.showfPartNumber = response.msg;
 
     });
 
     this.getConfigKey("data_showcar").then((response) => {
 
-      console.log(response.msg)
 
       this.dataShowcar = response.msg;
 
       if (this.dataShowcar == "0") {
 
         this.detailsHidden2 = false;
 
@@ -6813,6 +6877,16 @@ export default {
 
     this.queryUser();
 
     this.getRow();
 
   },
 
+  activated() {
 
+    this.getDicts("st_in_type").then((response) => {
 
+      this.businessTypeOption = response.data;
 
+      localStorage.setItem("businessTypeList", JSON.stringify(response.data));
 
+    });
 
+    this.getDicts("storage_type").then((response) => {
 
+      this.fStorageTypeOptions = response.data;
 
+      localStorage.setItem("fStorageTypeList", JSON.stringify(response.data));
 
+    });
 
+  },
 
   filters: {
 
     fStorageFormat(row) {
 
       let name;
 
@@ -7207,6 +7281,8 @@ export default {
 
               "fStltypeid",
 
               e.fStltypeid ? e.fStltypeid.toString() : null
 
           );
 
+          // 选完客户带入发货方
 
+          this.$set(this.form, 'fShipper', e.fName)
 
         }
 
       });
 
     },
 
@@ -7641,6 +7717,8 @@ export default {
 
       if (this.form.fStltypeid || this.form.fStltypeid == 0) {
 
         this.$set(this.form, "fStltypeid", this.form.fStltypeid.toString());
 
       }
 
+      // 判断有没有打印抬头
 
+      if (this.form.fCompany) this.changePrint()
 
     },
 
     getForm() {
 
       let fId = null
 
@@ -8044,6 +8122,7 @@ export default {
 
               }
 
               this.detailList.forEach(item => {
 
                 this.$set(item, 'fOriginalbillno', this.form.fMblno)
 
+                this.$set(item, 'fShipper', this.form.fShipper)
 
               })
 
               for (let item in this.warehouseDrList) {
 
                 if (!this.warehouseDrList[item].fCorpid) {
 
@@ -8219,7 +8298,7 @@ export default {
 
               fAmount: null,
 
               fCurrency: "RMB",
 
               fExrate: "1",
 
-              fTaxrate: this.fTaxrate,
 
+              fTaxrate: '0',
 
               fCxrate: null,
 
               fRate: null,
 
               remarks: null,
 
@@ -8717,7 +8796,6 @@ export default {
 
                 this.container += item
 
               })
 
               this.container = this.container.slice(0, this.container.length - 1)
 
-              console.log(this.container)
 
               this.print_zpdkrkd = true
 
             } else if (command == "g") {
 
               let date = new Date();
 
@@ -8830,7 +8908,7 @@ export default {
 
               fAmount: null,
 
               fCurrency: "RMB",
 
               fExrate: "1",
 
-              fTaxrate: this.fTaxrate,
 
+              fTaxrate: '0',
 
               fCxrate: null,
 
               fRate: null,
 
               remarks: null,
 
@@ -9151,6 +9229,14 @@ export default {
 
       this.form.fId = ''
 
       this.resetForm("form");
 
       this.resetForm("importList");
 
+      this.printFeeConfirm = {
 
+        fAddr: '',
 
+        fBankname: '',
 
+        fBankno: '',
 
+        fTel: '',
 
+        fTax: '',
 
+      }
 
+      this.fCompanyName = '';
 
       this.detailList = [];
 
       this.relevantAttachments = [];
 
       this.warehouseCrList = [];
 
@@ -9281,6 +9367,27 @@ export default {
 
         this.$set(this.form, 'fTel', res.data.fTel)
 
       })
 
     },
 
+    changePrint() {
 
+      if (this.form.fCompany) {
 
+        getCorps(this.form.fCompany).then(res => {
 
+          this.fCompanyName = res.data.corp.fName
 
+          this.printFeeConfirm.fAddr = res.data.corp.fAddr
 
+          this.printFeeConfirm.fTel = res.data.corp.fTel
 
+          this.printFeeConfirm.fBankname = res.data.corp.fBankname
 
+          this.printFeeConfirm.fBankno = res.data.corp.fBankno
 
+          this.printFeeConfirm.fTax = res.data.corp.fTax
 
+        })
 
+      } else {
 
+        this.fCompanyName = ''
 
+        this.printFeeConfirm = {
 
+          fAddr: '',
 
+          fBankname: '',
 
+          fBankno: '',
 
+          fTel: '',
 
+          fTax: '',
 
+        }
 
+      }
 
+    },
 
   },
 
   watch: {
 
     // 监听 addOrUpdateVisible 改变

+ 174 - 84
src/views/Warehousing/outStock/AddOrUpdate.vue
View File 

@@ -248,36 +248,36 @@
 
           </el-form-item>
 
         </el-col>
 
         <el-col :span="8">
 
-          <el-form-item label="计划净重(kg)" prop="fPlannetweight">
 
+          <el-form-item label="计划毛重(kg)" prop="fPlangrossweight">
 
             <el-input
 
-                v-model="form.fPlannetweight"
 
-                style="width: 80%"
 
-                maxlength="16"
 
-                v-input-limit="2"
 
-                laceholder="计划净重"
 
-                :disabled="
 
+              v-model="form.fPlangrossweight"
 
+              v-input-limit="2"
 
+              style="width: 80%"
 
+              laceholder="计划毛重"
 
+              maxlength="16"
 
+              :disabled="
 
                 browseStatus || current !== before || form.warehouseStatus > 3
 
               "
 
-                @change="tfNetweight"
 
+              @change="tfGrossweight"
 
             >
 
-              <template slot="append">{{ tfNetweightnum }}吨</template>
 
+              <template slot="append">{{ tfGrossweightnum }}吨</template>
 
             </el-input>
 
           </el-form-item>
 
         </el-col>
 
         <el-col :span="8">
 
-          <el-form-item label="计划毛重(kg)" prop="fPlangrossweight">
 
+          <el-form-item label="计划净重(kg)" prop="fPlannetweight">
 
             <el-input
 
-                v-model="form.fPlangrossweight"
 
-                v-input-limit="2"
 
+                v-model="form.fPlannetweight"
 
                 style="width: 80%"
 
-                laceholder="计划毛重"
 
                 maxlength="16"
 
+                v-input-limit="2"
 
+                laceholder="计划净重"
 
                 :disabled="
 
                 browseStatus || current !== before || form.warehouseStatus > 3
 
               "
 
-                @change="tfGrossweight"
 
+                @change="tfNetweight"
 
             >
 
-              <template slot="append">{{ tfGrossweightnum }}吨</template>
 
+              <template slot="append">{{ tfNetweightnum }}吨</template>
 
             </el-input>
 
           </el-form-item>
 
         </el-col>
 
@@ -432,6 +432,26 @@
 
                 />
 
               </el-form-item>
 
             </el-col>
 
+            <el-col :span="12">
 
+              <el-form-item label="打印抬头">
 
+                <el-select
 
+                  v-model="form.fCompany"
 
+                  clearable
 
+                  filterable
 
+                  placeholder="请输入关键词"
 
+                  style="width: 80%"
 
+                  @change="changePrint"
 
+                  :disabled="browseStatus || form.warehouseStatus > 3"
 
+                >
 
+                  <el-option
 
+                    v-for="(item, index) in fMblnoOptions"
 
+                    :key="index.fId"
 
+                    :label="item.fName"
 
+                    :value="item.fId"
 
+                  ></el-option>
 
+                </el-select>
 
+              </el-form-item>
 
+            </el-col>
 
           </el-row>
 
           <el-row>
 
             <el-col :span="12">
 
@@ -947,6 +967,7 @@
 
                 align="center"
 
                 :fixed="item.fixed"
 
                 sortable
 
+                show-overflow-tooltip
 
             >
 
               <template slot-scope="scope">
 
                 <span v-if="item.label == 'fBillstatus'">
 
@@ -2292,6 +2313,7 @@
 
                   v-model="whgenlegParams.fCntrno"
 
                   placeholder="请输入箱号"
 
                   clearable
 
+                  @keyup.enter.native="getDetailsList()"
 
               />
 
             </el-form-item>
 
           </el-col>
 
@@ -2517,7 +2539,7 @@
 
             margin-bottom: 5px;
 
           "
 
         >
 
-          {{ company }}请款单
 
+          {{ fCompanyName? fCompanyName: company }}请款单
 
         </div>
 
         <div
 
           style="
 
@@ -2627,7 +2649,7 @@
 
             position:relative;
 
           "
 
         >
 
-          {{ company }}作业单
 
+          {{ fCompanyName? fCompanyName: company }}作业单
 
           <div
 
             style="
 
             display: flex;
 
@@ -2769,7 +2791,7 @@
 
             margin-bottom: 5px;
 
           "
 
         >
 
-          {{ company }}出库单
 
+          {{ fCompanyName? fCompanyName: company }}出库单
 
         </div>
 
         <div class="print_table" style="display: flex">
 
           <table
 
@@ -3014,7 +3036,7 @@
 
             margin-bottom: 5px;
 
           "
 
         >
 
-          {{ company }}
 
+          {{ fCompanyName? fCompanyName: company }}
 
         </div>
 
         <div style="font-size: 22px;margin-bottom: 5px;width: 100%;text-align: center">出库单</div>
 
         <div class="print_table" style="display: flex">
 
@@ -3122,7 +3144,7 @@
 
             margin-bottom: 5px;
 
           "
 
         >
 
-          {{ company }}出库单
 
+          {{ fCompanyName? fCompanyName: company }}出库单
 
         </div>
 
         <div class="print_table" style="display: flex">
 
           <table
 
@@ -3229,7 +3251,7 @@
 
             margin-bottom: 5px;
 
           "
 
         >
 
-          {{ company }}
 
+          {{ fCompanyName? fCompanyName: company }}
 
         </div>
 
         <div
 
             style="
 
@@ -3345,7 +3367,7 @@
 
             margin-bottom: 5px;
 
           "
 
         >
 
-          {{ company }}
 
+          {{ fCompanyName? fCompanyName: company }}
 
         </div>
 
         <div
 
             style="
 
@@ -3439,7 +3461,7 @@
 
             margin-bottom: 5px;
 
           "
 
         >
 
-          {{ company }}
 
+          {{ fCompanyName? fCompanyName: company }}
 
         </div>
 
 
         <div
 
@@ -3550,7 +3572,7 @@
 
             margin-bottom: 5px;
 
           "
 
         >
 
-          {{ company }}
 
+          {{ fCompanyName? fCompanyName: company }}
 
         </div>
 
 
         <div
 
@@ -3660,7 +3682,7 @@
 
             margin-bottom: 5px;
 
           "
 
         >
 
-          {{ company }}
 
+          {{ fCompanyName? fCompanyName: company }}
 
         </div>
 
 
         <div
 
@@ -3785,7 +3807,7 @@
 
             margin-bottom: 5px;
 
           "
 
         >
 
-          {{ company }}
 
+          {{ fCompanyName? fCompanyName: company }}
 
         </div>
 
         <div
 
           style="
 
@@ -3856,12 +3878,12 @@
 
           </table>
 
         </div>
 
         <div>人民币汇款路径：</div>
 
-        <div>公司名称：{{ company }}</div>
 
-        <div>纳税人识别号：{{ Identifier }}</div>
 
-        <div>地址：{{ address }}</div>
 
-        <div>电话：{{ phone }}</div>
 
-        <div>开户行：{{ bank }}</div>
 
-        <div>银行账户：{{ bankAccount }}</div>
 
+        <div>公司名称：{{ fCompanyName? fCompanyName: company }}</div>
 
+        <div>纳税人识别号：{{ printFeeConfirm.fTax }}</div>
 
+        <div>地址：{{ printFeeConfirm.fAddr }}</div>
 
+        <div>电话：{{ printFeeConfirm.fTel }}</div>
 
+        <div>开户行：{{ printFeeConfirm.fBankname }}</div>
 
+        <div>银行账户：{{ printFeeConfirm.fBankno }}</div>
 
       </div>
 
       <span slot="footer" class="dialog-footer">
 
         <el-button
 
@@ -4189,7 +4211,7 @@ import {
 
   revokefeeCheck
 
 } from "@/api/warehouseBusiness/warehouseOutStock";
 
 import {operationAgreement} from "@/api/agreement/agreement";
 
-import {listCorps} from "@/api/basicdata/corps";
 
+import {listCorps, getCorps} from "@/api/basicdata/corps";
 
 import {listFees, getFees} from "@/api/basicdata/fees";
 
 import {
 
   listWarehouse,
 
@@ -4503,102 +4525,109 @@ export default {
 
         },
 
         {
 
           surface: "17",
 
+          label: "fShipper",
 
+          name: "发货方",
 
+          checked: 0,
 
+          width: 100,
 
+        },
 
+        {
 
+          surface: "18",
 
           label: "fGoodsval",
 
           name: "货值",
 
           checked: 0,
 
           width: 100,
 
         },
 
         {
 
-          surface: "18",
 
+          surface: "19",
 
           label: "fFleet",
 
           name: "车队",
 
           checked: 0,
 
           width: 100,
 
         },
 
         {
 
-          surface: "19",
 
+          surface: "20",
 
           label: "fTruckno",
 
           name: "车号",
 
           checked: 0,
 
           width: 100,
 
         },
 
         {
 
-          surface: "20",
 
+          surface: "21",
 
           label: "fDriverName",
 
           name: "司机名称",
 
           checked: 0,
 
           width: 100,
 
         },
 
         {
 
-          surface: "21",
 
+          surface: "22",
 
           label: "fDriverTel",
 
           name: "司机电话",
 
           checked: 0,
 
           width: 100,
 
         },
 
         {
 
-          surface: "22",
 
+          surface: "23",
 
           label: "fDriverIdCar",
 
           name: "司机身份证",
 
           checked: 0,
 
           width: 150,
 
         },
 
         {
 
-          surface: "23",
 
+          surface: "24",
 
           label: "fIsPass",
 
           name: "是否放行",
 
           checked: 0,
 
           width: 150,
 
         },
 
         {
 
-          surface: "24",
 
+          surface: "25",
 
           label: "fLntype",
 
           name: "装卸方式",
 
           checked: 0,
 
           width: 100,
 
         },
 
         {
 
-          surface: "25",
 
+          surface: "26",
 
           label: "fForkliftman",
 
           name: "叉车工",
 
           checked: 0,
 
           width: 100,
 
         },
 
         {
 
-          surface: "26",
 
+          surface: "27",
 
           label: "fLocalcntrno",
 
           name: "库内箱号",
 
           checked: 0,
 
           width: 100,
 
         },
 
         {
 
-          surface: "27",
 
+          surface: "28",
 
           label: "fSealno",
 
           name: "封号",
 
           checked: 0,
 
           width: 100,
 
         },
 
         {
 
-          surface: "28",
 
+          surface: "29",
 
           label: "fSerialNumber",
 
           name: "流水号",
 
           checked: 0,
 
           width: 100,
 
         },
 
         {
 
-          surface: "29",
 
+          surface: "30",
 
           label: "remark",
 
           name: "备注",
 
           checked: 0,
 
           width: 100,
 
         }, {
 
-          surface: "30",
 
+          surface: "31",
 
           label: "fNowCarton",
 
           name: "现箱号",
 
           checked: 0,
 
           width: 100,
 
         }, {
 
-          surface: "31",
 
+          surface: "32",
 
           label: "fCartypeId",
 
           name: "车辆类型",
 
           checked: 0,
 
@@ -4734,22 +4763,21 @@ export default {
 
       allDrAmount: 0,
 
       print_fyqr: false,
 
       activeName: 'searchList',
 
-      // 识别号
 
-      Identifier: '',
 
-      // 地址
 
-      address: '',
 
-      // 电话
 
-      phone: '',
 
-      // 开户行
 
-      bank: '',
 
-      // 银行账户
 
-      bankAccount: '',
 
       // 付款信息费用确认单
 
       print_Crfyqr: false,
 
       // 是否启用请款单
 
       isShowInvoice: null,
 
       // 是否启用费用确认单
 
       isShowFeesConfirm: null,
 
+      // 选择打印抬头中文名
 
+      fCompanyName: '',
 
+      printFeeConfirm: {
 
+        fAddr: '',
 
+        fBankname: '',
 
+        fBankno: '',
 
+        fTel: '',
 
+        fTax: '',
 
+      },
 
     };
 
   },
 
   computed: {
 
@@ -4779,34 +4807,23 @@ export default {
 
     this.getConfigKey("entry.printing").then((response) => {
 
       this.entryPrinting = response.msg;
 
     });
 
-    this.getConfigKey("taxpayer.identification.number").then((response) => {
 
-      this.Identifier = response.msg;
 
-    });
 
-    this.getConfigKey("print.address").then((response) => {
 
-      this.address = response.msg;
 
-    });
 
-    this.getConfigKey("print.phone").then((response) => {
 
-      this.phone = response.msg;
 
-    });
 
-    this.getConfigKey("print.bank").then((response) => {
 
-      this.bank = response.msg;
 
-    });
 
-    this.getConfigKey("print.bank.account").then((response) => {
 
-      this.bankAccount = response.msg;
 
-    });
 
     this.getConfigKey("warehouse.show.invoice").then((response) => {
 
       this.isShowInvoice = response.msg;
 
     });
 
     this.getConfigKey("warehouse.show.feesConfirm").then((response) => {
 
       this.isShowFeesConfirm = response.msg;
 
     });
 
-    this.getDicts("data_stltype_type").then((response) => {
 
-      this.fStltypeOptions = response.data;
 
-    });
 
     this.getDicts("st_out_type").then((response) => {
 
       this.businessTypeOption = response.data;
 
       localStorage.setItem("businessTypeList", JSON.stringify(response.data));
 
     });
 
+    this.getDicts("storage_type").then((response) => {
 
+      this.fStorageTypeOptions = response.data;
 
+      localStorage.setItem("fStorageTypeList", JSON.stringify(response.data));
 
+    });
 
+    this.getDicts("data_stltype_type").then((response) => {
 
+      this.fStltypeOptions = response.data;
 
+    });
 
     this.getDicts("data_unitfees").then((response) => {
 
       this.fFeetUnitOptions = response.data;
 
     });
 
@@ -4816,10 +4833,6 @@ export default {
 
     this.getDicts("data_ifweigh_status").then((response) => {
 
       this.fIfweighOptions = response.data;
 
     });
 
-    this.getDicts("storage_type").then((response) => {
 
-      this.fStorageTypeOptions = response.data;
 
-      localStorage.setItem("fStorageTypeList", JSON.stringify(response.data));
 
-    });
 
     this.getDicts("sys_car_type").then((response) => {
 
       this.fCartypeOptions = response.data;
 
     });
 
@@ -4875,6 +4888,17 @@ export default {
 
     this.queryUser();
 
     this.getRow();
 
     this.getRow2();
 
+    this.form.fBstime = Date.parse(new Date());
 
+  },
 
+  activated() {
 
+    this.getDicts("st_out_type").then((response) => {
 
+      this.businessTypeOption = response.data;
 
+      localStorage.setItem("businessTypeList", JSON.stringify(response.data));
 
+    });
 
+    this.getDicts("storage_type").then((response) => {
 
+      this.fStorageTypeOptions = response.data;
 
+      localStorage.setItem("fStorageTypeList", JSON.stringify(response.data));
 
+    });
 
   },
 
   filters: {
 
     fBsdateFormat(row) {
 
@@ -5289,6 +5313,7 @@ export default {
 
             fWarehouseInformation: e.fWarehouseids,
 
             fSrcid: e.fId,
 
             fSrcBsdate: e.fBsdate,
 
+            fShipper: e.fShipper,
 
           });
 
         });
 
       } else {
 
@@ -5330,6 +5355,7 @@ export default {
 
             fWarehouseInformation: e.fWarehouseids,
 
             fSrcid: e.fId,
 
             fSrcBsdate: e.fBsdate,
 
+            fShipper: e.fShipper,
 
           });
 
         });
 
       }
 
@@ -5516,6 +5542,8 @@ export default {
 
       this.fMblnoOptions.map((e) => {
 
         if (row == e.fId) {
 
           this.$set(this.form, "fStltypeid", e.fStltypeid.toString());
 
+          // 选完客户带入发货方
 
+          // this.$set(this.form, 'fShipper', e.fName)
 
         }
 
       });
 
     },
 
@@ -6026,6 +6054,8 @@ export default {
 
     getForm() {
 
       getWarehousebills(this.chiId).then((response) => {
 
         this.form = response.data.warehousebills;
 
+        // 判断有没有打印抬头
 
+        if (this.form.fCompany) this.changePrint()
 
         // queryReviewer(this.form.fId).then(res => {
 
         //   if (!res.data) {
 
         //     this.firstReviewer = '';
 
@@ -6282,6 +6312,10 @@ export default {
 
         let fMarks = [];
 
         let fProductName = [];
 
         let fMblno = [];
 
+        let fShipper = [];
 
+        let fPlanqty = 0;
 
+        let fPlannetweight = 0;
 
+        let fPlangrossweight = 0;
 
         this.detailList.map((e) => {
 
           if (e.fMarks) {
 
             fMarks.push(e.fMarks);
 
@@ -6292,7 +6326,24 @@ export default {
 
           if (e.fMblno) {
 
             fMblno.push(e.fMblno);
 
           }
 
+          if (e.fShipper) {
 
+            fShipper.push(e.fShipper)
 
+          }
 
+          if (e.fPlanqty) {
 
+            fPlanqty += e.fPlanqty
 
+          }
 
+          if (e.fPlannetweight) {
 
+            fPlannetweight += e.fPlannetweight
 
+          }
 
+          if (e.fPlangrossweight) {
 
+            fPlangrossweight += e.fPlangrossweight
 
+          }
 
         });
 
+        // 如果计划件数、计划净重、计划毛重 为空或为0带入明细
 
+        this.form.fPlanqty == 0 || !this.form.fPlanqty? this.$set(this.form, "fPlanqty", fPlanqty): 0
 
+        this.form.fPlannetweight == 0 || !this.form.fPlannetweight? this.$set(this.form, "fPlannetweight", fPlanqty): 0
 
+        this.form.fPlangrossweight == 0 || !this.form.fPlangrossweight? this.$set(this.form, "fPlangrossweight", fPlanqty): 0
 
+        this.$set(this.form, "fShipper", [...new Set(fShipper)].join(","))
 
         this.$set(this.form, "fMarks", [...new Set(fMarks)].join(","));
 
         this.$set(
 
             this.form,
 
@@ -6913,14 +6964,24 @@ export default {
 
       this.$set(this.whgenlegParams, 'fCorpid', this.form.fCorpid)
 
       this.$set(this.whgenlegParams, 'fWarehouseid', this.form.fWarehouseid)
 
       this.$set(this.whgenlegParams, 'fTrademodeid', this.form.fTrademodeid)
 
+      let arr = [];
 
+      let total = 0;
 
       listWhgenleg(this.whgenlegParams).then((response) => {
 
         response.rows.map((e) => {
 
           e.fQtyblc2 = e.fQtyblc;
 
           e.fGrossweightblc2 = e.fGrossweightblc;
 
           e.fNetweightblc2 = e.fNetweightblc;
 
+          const index = this.detailList.findIndex(item => item.fSrcid === e.fId)
 
+          if (index == -1) {
 
+            arr.push(e)
 
+          } else {
 
+            response.total --
 
+          }
 
         });
 
-        this.whgenlegList = response.rows;
 
+        // this.whgenlegList = response.rows;
 
         this.whgenlegTotal = response.total;
 
+        this.whgenlegList = arr;
 
+        // this.whgenlegTotal = total;
 
       });
 
     },
 
     async printZyd() {
 
@@ -7220,7 +7281,7 @@ export default {
 
               fAmount: null,
 
               fCurrency: "RMB",
 
               fExrate: "1",
 
-              fTaxrate: this.fTaxrate,
 
+              fTaxrate: '0',
 
               fCxrate: null,
 
               fRate: null,
 
               remarks: null,
 
@@ -7257,7 +7318,7 @@ export default {
 
               fAmount: null,
 
               fCurrency: "RMB",
 
               fExrate: "1",
 
-              fTaxrate: this.fTaxrate,
 
+              fTaxrate: '0',
 
               fCxrate: null,
 
               fRate: null,
 
               remarks: null,
 
@@ -7308,7 +7369,7 @@ export default {
 
               fCurrency: "RMB",
 
               fExrate: 1,
 
               fAmount: fAmount,
 
-              fTaxrate: this.fTaxrate,
 
+              fTaxrate: '0',
 
               fMblno: this.form.fMblno,
 
               fProductName: this.form.fProductName,
 
               fMarks: this.form.fMarks,
 
@@ -7328,7 +7389,7 @@ export default {
 
               fCurrency: "RMB",
 
               fExrate: 1,
 
               fAmount: fAmount,
 
-              fTaxrate: this.fTaxrate,
 
+              fTaxrate: '0',
 
               fMblno: this.form.fMblno,
 
               fProductName: this.form.fProductName,
 
               fMarks: this.form.fMarks,
 
@@ -7716,6 +7777,14 @@ export default {
 
       this.warehouseCrList = [];
 
       this.warehouseDrList = [];
 
       this.CntrTable = [];
 
+      this.printFeeConfirm = {
 
+        fAddr: '',
 
+        fBankname: '',
 
+        fBankno: '',
 
+        fTel: '',
 
+        fTax: '',
 
+      }
 
+      this.fCompanyName = '';
 
       this.$emit("changeShow", "true");
 
     },
 
     goBack() {
 
@@ -7993,6 +8062,27 @@ export default {
 
         this.$message.error("请选择需要打印的明细!");
 
       }
 
     },
 
+    changePrint() {
 
+      if (this.form.fCompany) {
 
+        getCorps(this.form.fCompany).then(res => {
 
+          this.fCompanyName = res.data.corp.fName
 
+          this.printFeeConfirm.fAddr = res.data.corp.fAddr
 
+          this.printFeeConfirm.fTel = res.data.corp.fTel
 
+          this.printFeeConfirm.fBankname = res.data.corp.fBankname
 
+          this.printFeeConfirm.fBankno = res.data.corp.fBankno
 
+          this.printFeeConfirm.fTax = res.data.corp.fTax
 
+        })
 
+      } else {
 
+        this.fCompanyName = ''
 
+        this.printFeeConfirm = {
 
+          fAddr: '',
 
+          fBankname: '',
 
+          fBankno: '',
 
+          fTel: '',
 
+          fTax: '',
 
+        }
 
+      }
 
+    },
 
   },
 
   watch: {
 
     // 监听 addOrUpdateVisible 改变

+ 116 - 64
src/views/Warehousing/stockTransfer/AddOrUpdate.vue
View File 

@@ -251,32 +251,32 @@
 
           </el-form-item>
 
         </el-col>
 
         <el-col :span="8">
 
-          <el-form-item label="计划调拨净重(kg)" prop="fPlannetweight">
 
+          <el-form-item label="计划调拨毛重(kg)" prop="fPlangrossweight">
 
             <el-input
 
-              v-model="form.fPlannetweight"
 
+              v-model="form.fPlangrossweight"
 
+              v-input-limit="2"
 
               style="width: 80%"
 
+              laceholder="计划毛重"
 
               maxlength="16"
 
-              v-input-limit="2"
 
-              laceholder="计划净重"
 
               :disabled="browseStatus || current !== before"
 
-              @change="tfNetweight"
 
+              @change="tfGrossweight"
 
             >
 
-              <template slot="append">{{ tfNetweightnum }}吨</template>
 
+              <template slot="append">{{ tfGrossweightnum }}吨</template>
 
             </el-input>
 
           </el-form-item>
 
         </el-col>
 
         <el-col :span="8">
 
-          <el-form-item label="计划调拨毛重(kg)" prop="fPlangrossweight">
 
+          <el-form-item label="计划调拨净重(kg)" prop="fPlannetweight">
 
             <el-input
 
-              v-model="form.fPlangrossweight"
 
-              v-input-limit="2"
 
+              v-model="form.fPlannetweight"
 
               style="width: 80%"
 
-              laceholder="计划毛重"
 
               maxlength="16"
 
+              v-input-limit="2"
 
+              laceholder="计划净重"
 
               :disabled="browseStatus || current !== before"
 
-              @change="tfGrossweight"
 
+              @change="tfNetweight"
 
             >
 
-              <template slot="append">{{ tfGrossweightnum }}吨</template>
 
+              <template slot="append">{{ tfNetweightnum }}吨</template>
 
             </el-input>
 
           </el-form-item>
 
         </el-col>
 
@@ -475,6 +475,26 @@
 
                 </el-select>
 
               </el-form-item>
 
             </el-col>
 
+            <el-col :span="12">
 
+              <el-form-item label="打印抬头">
 
+                <el-select
 
+                  v-model="form.fCompany"
 
+                  clearable
 
+                  filterable
 
+                  placeholder="请输入关键词"
 
+                  style="width: 80%"
 
+                  @change="changePrint"
 
+                  :disabled="browseStatus || form.warehouseStatus > 3"
 
+                >
 
+                  <el-option
 
+                    v-for="(item, index) in fMblnoOptions"
 
+                    :key="index.fId"
 
+                    :label="item.fName"
 
+                    :value="item.fId"
 
+                  ></el-option>
 
+                </el-select>
 
+              </el-form-item>
 
+            </el-col>
 
           </el-row>
 
           <el-row>
 
             <el-col :span="24">
 
@@ -841,6 +861,7 @@
 
               align="center"
 
               :fixed="item.fixed"
 
               sortable
 
+              show-overflow-tooltip
 
             >
 
               <template slot-scope="scope">
 
                 <span v-if="item.label == 'fBillstatus'">
 
@@ -2465,7 +2486,7 @@
 
             margin-bottom: 5px;
 
           "
 
         >
 
-          {{ company }}作业单
 
+          {{ fCompanyName? fCompanyName: company }}作业单
 
         </div>
 
         <div
 
           style="
 
@@ -2569,7 +2590,7 @@
 
             margin-bottom: 5px;
 
           "
 
         >
 
-          {{ company }}进仓单
 
+          {{ fCompanyName? fCompanyName: company }}进仓单
 
         </div>
 
         <div class="print_table" style="display: flex">
 
           <table border="0" cellspacing="0" cellpadding="0" style="width: 100%">
 
@@ -2701,7 +2722,7 @@
 
             margin-bottom: 5px;
 
           "
 
         >
 
-          {{ company }}收货单
 
+          {{ fCompanyName? fCompanyName: company }}收货单
 
         </div>
 
         <div class="print_table" style="display: flex">
 
           <table border="0" cellspacing="0" cellpadding="0" style="width: 100%">
 
@@ -2772,7 +2793,7 @@
 
             margin-bottom: 5px;
 
           "
 
         >
 
-          {{ company }}
 
+          {{ fCompanyName? fCompanyName: company }}
 
         </div>
 
         <div
 
           style="
 
@@ -2867,7 +2888,7 @@
 
             margin-bottom: 5px;
 
           "
 
         >
 
-          {{ company }}
 
+          {{ fCompanyName? fCompanyName: company }}
 
         </div>
 
 <!--        <div-->
 
 <!--          style="-->
 
@@ -3155,7 +3176,7 @@
 
             margin-bottom: 5px;
 
           "
 
         >
 
-          {{ company }}请款单
 
+          {{ fCompanyName? fCompanyName: company }}请款单
 
         </div>
 
         <div
 
           style="
 
@@ -3263,7 +3284,7 @@
 
             margin-bottom: 5px;
 
           "
 
         >
 
-          {{ company }}
 
+          {{ fCompanyName? fCompanyName: company }}
 
         </div>
 
         <div
 
           style="
 
@@ -3334,12 +3355,12 @@
 
           </table>
 
         </div>
 
         <div>人民币汇款路径：</div>
 
-        <div>公司名称：{{ company }}</div>
 
-        <div>纳税人识别号：{{ Identifier }}</div>
 
-        <div>地址：{{ address }}</div>
 
-        <div>电话：{{ phone }}</div>
 
-        <div>开户行：{{ bank }}</div>
 
-        <div>银行账户：{{ bankAccount }}</div>
 
+        <div>公司名称：{{ fCompanyName? fCompanyName: company }}</div>
 
+        <div>纳税人识别号：{{ printFeeConfirm.fTax }}</div>
 
+        <div>地址：{{ printFeeConfirm.fAddr }}</div>
 
+        <div>电话：{{ printFeeConfirm.fTel }}</div>
 
+        <div>开户行：{{ printFeeConfirm.fBankname }}</div>
 
+        <div>银行账户：{{ printFeeConfirm.fBankno }}</div>
 
       </div>
 
       <span slot="footer" class="dialog-footer">
 
         <el-button
 
@@ -3482,7 +3503,7 @@ import {
 
   revokefeeCheck
 
 } from "@/api/warehouseBusiness/stockTransfer";
 
 import { operationAgreement } from "@/api/agreement/agreement";
 
-import { listCorps } from "@/api/basicdata/corps";
 
+import { listCorps, getCorps } from "@/api/basicdata/corps";
 
 import { listFees, getFees } from "@/api/basicdata/fees";
 
 import {
 
   listWarehouse,
 
@@ -3749,7 +3770,6 @@ export default {
 
           checked: 0,
 
           width: 120,
 
         },
 
-
 
         {
 
           surface: "14",
 
           label: "fPackagespecs",
 
@@ -3758,6 +3778,13 @@ export default {
 
           width: 100,
 
         },
 
         {
 
+          surface: "14",
 
+          label: "fShipper",
 
+          name: "发货方",
 
+          checked: 0,
 
+          width: 100,
 
+        },
 
+        {
 
           surface: "15",
 
           label: "fFleet",
 
           name: "车队",
 
@@ -3992,22 +4019,21 @@ export default {
 
       allDrAmount: 0,
 
       print_fyqr: false,
 
       activeName: 'searchList',
 
-      // 识别号
 
-      Identifier: '',
 
-      // 地址
 
-      address: '',
 
-      // 电话
 
-      phone: '',
 
-      // 开户行
 
-      bank: '',
 
-      // 银行账户
 
-      bankAccount: '',
 
       nowTime: null,
 
       print_Crfyqr: false,
 
       // 是否启用请款单
 
       isShowInvoice: null,
 
       // 是否启用费用确认单
 
       isShowFeesConfirm: null,
 
+      // 选择打印抬头中文名
 
+      fCompanyName: '',
 
+      printFeeConfirm: {
 
+        fAddr: '',
 
+        fBankname: '',
 
+        fBankno: '',
 
+        fTel: '',
 
+        fTax: '',
 
+      },
 
     };
 
   },
 
   created() {
 
@@ -4018,10 +4044,6 @@ export default {
 
     this.getDicts("data_stltype_type").then((response) => {
 
       this.fStltypeOptions = response.data;
 
     });
 
-    this.getDicts("st_trans_type").then((response) => {
 
-      this.businessTypeOption = response.data;
 
-      localStorage.setItem("businessTypeList", JSON.stringify(response.data));
 
-    });
 
     this.getDicts("data_unitfees").then((response) => {
 
       this.fFeetUnitOptions = response.data;
 
     });
 
@@ -4031,10 +4053,6 @@ export default {
 
     this.getDicts("data_ifweigh_status").then((response) => {
 
       this.fIfweighOptions = response.data;
 
     });
 
-    this.getDicts("storage_type").then((response) => {
 
-      this.fStorageTypeOptions = response.data;
 
-      localStorage.setItem("fStorageTypeList", JSON.stringify(response.data));
 
-    });
 
     this.getDicts("sys_car_type").then((response) => {
 
       this.fCartypeOptions = response.data;
 
     });
 
@@ -4044,6 +4062,14 @@ export default {
 
     this.getDicts("data_ifdamage_status").then((response) => {
 
       this.fIfdamageOptions = response.data;
 
     });
 
+    this.getDicts("st_trans_type").then((response) => {
 
+      this.businessTypeOption = response.data;
 
+      localStorage.setItem("businessTypeList", JSON.stringify(response.data));
 
+    });
 
+    this.getDicts("storage_type").then((response) => {
 
+      this.fStorageTypeOptions = response.data;
 
+      localStorage.setItem("fStorageTypeList", JSON.stringify(response.data));
 
+    });
 
     this.getConfigKey("data_showcar").then((response) => {
 
       this.dataShowcar = response.msg;
 
       if (this.dataShowcar == "0") {
 
@@ -4052,21 +4078,6 @@ export default {
 
         this.detailsHidden2 = true;
 
       }
 
     });
 
-    this.getConfigKey("taxpayer.identification.number").then((response) => {
 
-      this.Identifier = response.msg;
 
-    });
 
-    this.getConfigKey("print.address").then((response) => {
 
-      this.address = response.msg;
 
-    });
 
-    this.getConfigKey("print.phone").then((response) => {
 
-      this.phone = response.msg;
 
-    });
 
-    this.getConfigKey("print.bank").then((response) => {
 
-      this.bank = response.msg;
 
-    });
 
-    this.getConfigKey("print.bank.account").then((response) => {
 
-      this.bankAccount = response.msg;
 
-    });
 
     this.getConfigKey("warehouse.show.invoice").then((response) => {
 
       this.isShowInvoice = response.msg;
 
     });
 
@@ -4111,6 +4122,16 @@ export default {
 
     this.getRow();
 
     this.getRow2();
 
   },
 
+  activated() {
 
+    this.getDicts("st_trans_type").then((response) => {
 
+      this.businessTypeOption = response.data;
 
+      localStorage.setItem("businessTypeList", JSON.stringify(response.data));
 
+    });
 
+    this.getDicts("storage_type").then((response) => {
 
+      this.fStorageTypeOptions = response.data;
 
+      localStorage.setItem("fStorageTypeList", JSON.stringify(response.data));
 
+    });
 
+  },
 
   filters: {
 
     fStorageFormat(row) {
 
       let name;
 
@@ -4495,6 +4516,7 @@ export default {
 
           remark: null,
 
           fSrcid: e.fId,
 
           fSrcBsdate: e.fBsdate,
 
+          fShipper: e.fShipper,
 
         });
 
       });
 
       this.whgenlegVisible = false;
 
@@ -4903,6 +4925,7 @@ export default {
 
     getForm() {
 
       getStockTransfer(this.chiId).then((response) => {
 
         this.form = response.data.warehousebills;
 
+        if (this.form.fCompany) this.changePrint()
 
         if (this.form.fBillstatus > 3) {
 
           this.approvalStatus = false;
 
           this.browseStatus = true;
 
@@ -5822,7 +5845,7 @@ export default {
 
               fAmount: null,
 
               fCurrency: "RMB",
 
               fExrate: "1",
 
-              fTaxrate: this.fTaxrate,
 
+              fTaxrate: '0',
 
               fCxrate: null,
 
               fRate: null,
 
               remarks: null,
 
@@ -5858,7 +5881,7 @@ export default {
 
               fAmount: null,
 
               fCurrency: "RMB",
 
               fExrate: "1",
 
-              fTaxrate: this.fTaxrate,
 
+              fTaxrate: '0',
 
               fCxrate: null,
 
               fRate: null,
 
               remarks: null,
 
@@ -5909,7 +5932,7 @@ export default {
 
               fCurrency: "RMB",
 
               fExrate: 1,
 
               fAmount: fAmount,
 
-              fTaxrate: this.fTaxrate,
 
+              fTaxrate: '0',
 
               fMblno: this.form.fMblno,
 
               fProductName: this.form.fProductName,
 
               fMarks: this.form.fMarks,
 
@@ -5927,7 +5950,7 @@ export default {
 
               fCurrency: "RMB",
 
               fExrate: 1,
 
               fAmount: fAmount,
 
-              fTaxrate: this.fTaxrate,
 
+              fTaxrate: '0',
 
               fMblno: this.form.fMblno,
 
               fProductName: this.form.fProductName,
 
               fMarks: this.form.fMarks,
 
@@ -6225,6 +6248,14 @@ export default {
 
       this.warehouseCrList = [];
 
       this.warehouseDrList = [];
 
       this.CntrTable = [];
 
+      this.printFeeConfirm = {
 
+        fAddr: '',
 
+        fBankname: '',
 
+        fBankno: '',
 
+        fTel: '',
 
+        fTax: '',
 
+      }
 
+      this.fCompanyName = '';
 
       this.$emit("changeShow", "true");
 
     },
 
     goBack() {
 
@@ -6439,6 +6470,27 @@ export default {
 
         this.$message.error("请选择需要打印的明细!");
 
       }
 
     },
 
+    changePrint() {
 
+      if (this.form.fCompany) {
 
+        getCorps(this.form.fCompany).then(res => {
 
+          this.fCompanyName = res.data.corp.fName
 
+          this.printFeeConfirm.fAddr = res.data.corp.fAddr
 
+          this.printFeeConfirm.fTel = res.data.corp.fTel
 
+          this.printFeeConfirm.fBankname = res.data.corp.fBankname
 
+          this.printFeeConfirm.fBankno = res.data.corp.fBankno
 
+          this.printFeeConfirm.fTax = res.data.corp.fTax
 
+        })
 
+      } else {
 
+        this.fCompanyName = ''
 
+        this.printFeeConfirm = {
 
+          fAddr: '',
 
+          fBankname: '',
 
+          fBankno: '',
 
+          fTel: '',
 
+          fTax: '',
 
+        }
 
+      }
 
+    },
 
   },
 
   watch: {
 
     // 监听 addOrUpdateVisible 改变

+ 2 - 2
src/views/agreement/agreementTask/index.vue
View File 

@@ -556,7 +556,7 @@
 
           prop="fFeeid"
 
           header-align="center"
 
           align="center"
 
-          width="240px"
 
+          width="160px"
 
           show-overflow-tooltip
 
           label="费用名称"
 
         >
 
@@ -582,7 +582,7 @@
 
           prop="fFeeunitid"
 
           header-align="center"
 
           align="center"
 
-          width="180px"
 
+          width="130px"
 
           label="计价单位"
 
         >
 
           <template slot-scope="scope">

+ 0 - 19
src/views/appVersion/version/index.vue
View File 

@@ -79,15 +79,6 @@
 
           v-hasPermi="['appVersion:version:export']"
 
         >导出</el-button>
 
       </el-col>
 
-      <el-col :span="1.5">
 
-        <el-button
 
-          type="primary"
 
-          icon="el-icon-download"
 
-          size="mini"
 
-          @click="smartScreen"
 
-          v-hasPermi="['appVersion:version:export']"
 
-        >智慧大屏</el-button>
 
-      </el-col>
 
 	  <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
 
     </el-row>
 
 
@@ -328,16 +319,6 @@ export default {
 
           this.download(response.msg);
 
         })
 
     },
 
-    smartScreen(){
 
-      // window.open( process.env.VUE_APP_BASE_API.length - 10 + '/view.html?Authorization=' + getToken())
 
-      currentLogin().then(res=>{
 
-        if (res.data.userName === 'admin'){
 
-          window.open( 'https://op.zdgjqd.com/view.html?Authorization=' + getToken())
 
-        }else {
 
-          this.$message.warning('您无此权限查看面板');
 
-        }
 
-      })
 
-    },
 
   }
 
 };
 
 </script>

+ 1 - 1
src/views/basicdata/dept/index.vue
View File 

@@ -49,7 +49,7 @@
 
       :load="getTreeLoad"
 
       ref="table"
 
     >
 
-      <el-table-column prop="fName" label="仓库名称" width="200"></el-table-column>
 
+      <el-table-column prop="fName" label="仓库名称" width="310"></el-table-column>
 
       <el-table-column prop="fTotalgross" label="库容（吨）" width="100"></el-table-column>
 
       <el-table-column prop="fLocation" label="库位" width="100">
 
         <template slot-scope="scope">

+ 151 - 0
src/views/finance/contrast/index.vue
View File 

@@ -699,6 +699,12 @@
 
                 size="mini"
 
                 >新 增</el-button
 
               >
 
+              <el-button
 
+                type="warning"
 
+                size="mini"
 
+                @click="printHandle"
 
+                :disabled="DzfeeList.length == 0"
 
+              >打印</el-button>
 
             </div>
 
             <div style="margin: 0 12px">
 
               <el-button
 
@@ -1720,6 +1726,90 @@
 
         </el-dialog>
 
       </div>
 
     </div>
 
+
 
+    <!--      打印明细-->
 
+    <el-dialog
 
+      :visible.sync="print_qkd"
 
+      width="70%"
 
+      :close-on-click-modal="false"
 
+      :modal="false">
 
+      <div id="print_qkd" class="print-div">
 
+        <div
 
+          class="print-title"
 
+          style="
 
+            display: flex;
 
+            justify-content: center;
 
+            font-size: 24px;
 
+            margin-bottom: 5px;
 
+          "
 
+        >
 
+          请款单
 
+        </div>
 
+        <div style="display: flex;justify-content: space-between;margin-bottom: 5px;">
 
+          <div>
 
+            <div>请款单号：{{ queryParams.fBillno }}</div>
 
+            <div>结算单位：{{ queryParams.fCorpid | corpFormat(fMblnoOptions) }}</div>
 
+          </div>
 
+          <div>
 
+            <div>请款日期：{{ queryParams.fAccbilldate }}</div>
 
+          </div>
 
+        </div>
 
+        <div class="print_table" style="display: flex">
 
+          <table
 
+            border="0"
 
+            cellspacing="0"
 
+            cellpadding="0"
 
+            style="width: 100%; line-height: 30px"
 
+          >
 
+            <tr>
 
+              <td>委托单位</td>
 
+              <td>M B/L NO</td>
 
+              <td>源业务编号</td>
 
+              <td>ETD/ETA</td>
 
+              <td>数量</td>
 
+              <td>价格</td>
 
+              <td>费用</td>
 
+              <td>人民币</td>
 
+              <td>美元</td>
 
+            </tr>
 
+            <tr v-for="(item,index) in DzfeeList">
 
+              <td></td>
 
+              <td>{{item.fMblno}}</td>
 
+              <td>{{item.srcBillNo}}</td>
 
+              <td>{{item.fBsdate}}</td>
 
+              <td>{{item.fQty}}</td>
 
+              <td>{{item.fAmt}}</td>
 
+              <td>{{item.fFeeName}}</td>
 
+              <td>{{item.fAmtdr}}</td>
 
+              <td></td>
 
+            </tr>
 
+            <tr>
 
+              <td colspan="7">合计</td>
 
+              <td>¥{{ allAmtdr }}</td>
 
+              <td></td>
 
+            </tr>
 
+          </table>
 
+        </div>
 
+        <div style="display: flex;justify-content: space-between;margin-top: 5px">
 
+          <div>领款人：</div>
 
+          <div>业务经理：</div>
 
+          <div>财务：</div>
 
+          <div style="margin-right: 20px">经理：</div>
 
+        </div>
 
+      </div>
 
+      <span lot="footer" class="dialog-footer">
 
+        <el-button
 
+          type="primary"
 
+          size="mini"
 
+          @click="
 
+            print_qkd = false;
 
+            addprint('qkd');
 
+          "
 
+        >打印
 
+        </el-button>
 
+        <el-button @click="print_qkd = false" size="mini">取消 </el-button>
 
+      </span>
 
+    </el-dialog>
 
   </div>
 
 </template>
 
 
@@ -2557,6 +2647,8 @@ export default {
 
         timeExamine: [{ required: true, message: " ", trigger: "blur" }],
 
       },
 
       fStltypeOptions: [],
 
+      print_qkd: false,
 
+      allAmtdr: 0,
 
     };
 
   },
 
   components: {
 
@@ -2608,6 +2700,17 @@ export default {
 
       }
 
     }
 
   },
 
+  filters: {
 
+    corpFormat(row, fMblnoOptions) {
 
+      let name;
 
+      fMblnoOptions.map((e) => {
 
+        if (row == e.fId) {
 
+          name = e.fName;
 
+        }
 
+      });
 
+      return name;
 
+    },
 
+  },
 
   methods: {
 
     changeMoney() {
 
       if (
 
@@ -4849,6 +4952,33 @@ export default {
 
         this.doNot = true;
 
       }
 
     },
 
+    /** 打印准备 */
 
+    printHandle() {
 
+      console.log(this.DzfeeList)
 
+      for (let item in this.DzfeeList) {
 
+        if (!this.DzfeeList[item].fId) {
 
+          return this.$message.error("请先保存!");
 
+        }
 
+      }
 
+      this.allAmtdr = 0;
 
+      this.DzfeeList.forEach(e => {
 
+        this.allAmtdr += e.fAmtdr
 
+      })
 
+      this.print_qkd = true
 
+    },
 
+    addprint(status) {
 
+      const style =
 
+        "@page {  } " +
 
+        "@media print { .print-div{ padding:8px;background-color:#cccccc;} .print-title{display:flex;justify-content: center;font-size:24px} .print_form{font-size:12px} .print_table table {border-right: 1px solid #000;border-bottom: 1px solid #000;font-size:12px} .print_table table td {border-left: 1px solid #000;border-top: 1px solid #000;padding:2px;vertical-align:middle;text-align: center;}";
 
+      if (status == 'qkd') {
 
+        print({
 
+          printable: "print_qkd",
 
+          type: "html",
 
+          style: style, // 亦可使用引入的外部css;
 
+          scanStyles: false,
 
+        });
 
+      }
 
+    },
 
   },
 
 };
 
 </script>
 
@@ -4903,6 +5033,27 @@ export default {
 
 .el-icon-full-screen:before {
 
   content: "\e719";
 
 }
 
+
 
+.print_table {
 
+  table {
 
+    border-right: 1px solid #000;
 
+    border-bottom: 1px solid #000;
 
+    font-size: 12px;
 
+    margin-bottom: 5px;
 
+  }
 
+
 
+  table td {
 
+    border-left: 1px solid #000;
 
+    border-top: 1px solid #000;
 
+    vertical-align: middle;
 
+    padding: 2px;
 
+    text-align: center;
 
+  }
 
+}
 
+
 
+.print_form {
 
+  font-size: 12px;
 
+}
 
 </style>
 
 <style lang="scss">
 
 .el-dialog__body {

+ 6 - 4
src/views/index.vue
View File 

@@ -46,7 +46,7 @@
 
                   class="el-icon-takeaway-box"
 
                   style="font-size: 50px; text-align: center"
 
                 ></i>
 
-                <p>货转</p>
 
+                <p>货权转移</p>
 
               </div>
 
             </li>
 
             <li @click="jump('/business/stockTransfer')">
 
@@ -55,7 +55,7 @@
 
                   class="el-icon-connection"
 
                   style="font-size: 50px; text-align: center"
 
                 ></i>
 
-                <p>调拨</p>
 
+                <p>库间调拨</p>
 
               </div>
 
             </li>
 
             <li @click="smartScreen()">
 
@@ -64,7 +64,7 @@
 
                     class="el-icon-s-order"
 
                     style="font-size: 50px; text-align: center"
 
                 ></i>
 
-                <p>看板</p>
 
+                <p>数据中心</p>
 
               </div>
 
             </li>
 
             <li @click="jump('/finance/charge')">
 
@@ -1661,7 +1661,9 @@ export default {
 
     smartScreen(){
 
       currentLogin().then(res=>{
 
         if (res.data.userName === 'admin'){
 
-          window.open( 'https://op.zdgjqd.com/view.html?Authorization=' + getToken())
 
+          this.getConfigKey("large.screen").then((response) => {
 
+            window.open( 'http://119.3.74.195:9527/view/'+ response.msg +'?Authorization=' + getToken())
 
+          });
 
         }else {
 
           this.$message.warning('您无此权限查看面板');
 
         }

+ 3 - 2
src/views/morePage/stock/index.vue
View File 

@@ -276,7 +276,7 @@
 
       :data="selectAuditList"
 
       :header-cell-style="{ borderBottom: '1px dashed #dfe6ec' }"
 
     >
 
-      <el-table-column type="index" label="#"></el-table-column>
 
+      <el-table-column type="index" label="#" fixed="left"></el-table-column>
 
       <el-table-column
 
         v-for="(item, index) in getRowList"
 
         :key="index"
 
@@ -447,7 +447,8 @@ export default {
 
         },
 
         {
 
           surface: "2",
 
-          label: Cookies.get("sysType") == 3 ? "sendTime" : "billTime",
 
+          // label: Cookies.get("sysType") == 3 ? "sendTime" : "billTime",
 
+          label: "sendTime",
 
           name: "日期",
 
           checked: 0,
 
           width: 150,

+ 5 - 5
src/views/reportManagement/whgenleg/index.vue
View File 

@@ -112,7 +112,7 @@
 
           />
 
         </el-select>
 
       </el-form-item>
 
-      <el-form-item label="按照箱号">
 
+      <el-form-item label="分组条件">
 
         <el-select
 
           v-model="queryParams.isCntrno"
 
           filterable
 
@@ -653,12 +653,12 @@ export default {
 
       allCheck: false,
 
       isCntrnoOptions: [
 
         {
 
-          id: 0,
 
-          name: "是",
 
+          id: 1,
 
+          name: "箱号",
 
         },
 
         {
 
-          id: 1,
 
-          name: "否",
 
+          id: 2,
 
+          name: "提单号",
 
         },
 
       ],
 
     };

+ 18 - 15
src/views/warehouseBusiness/agreement/index.vue
View File 

@@ -312,13 +312,13 @@
 
       </div>
 
       <el-table v-loading="loading_s" :data="agreementitemsList" @selection-change="handleSelectionChange">
 
         <!--        <el-table-column type="selection" width="55" align="center"/>-->
 
-        <el-table-column label="行号" align="center" type="index"/>
 
+        <el-table-column label="行号" align="center" type="index" fixed="left"/>
 
 
         <el-table-column
 
           prop="fFeeunitid"
 
           header-align="center"
 
           align="center"
 
-          width="180px"
 
+          width="125px"
 
           label="计价单位"
 
         >
 
           <template slot-scope="scope">
 
@@ -338,7 +338,7 @@
 
             </el-select>
 
           </template>
 
         </el-table-column>
 
-        <el-table-column label="开始天数" align="center" width="120">
 
+        <el-table-column label="开始天数" align="center" width="90">
 
           <template slot-scope="scope">
 
             <el-input
 
               v-model="scope.row.fFromdays"
 
@@ -350,7 +350,7 @@
 
             />
 
           </template>
 
         </el-table-column>
 
-        <el-table-column label="结束天数" align="center" width="120">
 
+        <el-table-column label="结束天数" align="center" width="90">
 
           <template slot-scope="scope">
 
             <el-input
 
               v-model="scope.row.fEndays"
 
@@ -362,7 +362,7 @@
 
             />
 
           </template>
 
         </el-table-column>
 
-        <el-table-column label="单价" align="center" width="120">
 
+        <el-table-column label="单价" align="center" width="90">
 
           <el-input
 
             slot-scope="scope"
 
             v-model="scope.row.fPrice"
 
@@ -383,7 +383,7 @@
 
             size="small"
 
           />
 
         </el-table-column>
 
-        <el-table-column label="录入时间" align="center" width="120">
 
+        <el-table-column label="录入时间" align="center" width="150">
 
           <el-input
 
             slot-scope="scope"
 
             v-model="scope.row.createTime"
 
@@ -419,7 +419,7 @@
 
             </el-select>
 
           </template>
 
         </el-table-column>
 
-        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
 
+        <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right">
 
           <template slot-scope="scope">
 
             <el-button
 
               size="mini"
 
@@ -969,7 +969,7 @@ export default {
 
         this.cancelButton = false
 
         this.reset()
 
         getAgreement(this.approval.billId).then(response => {
 
-          this.deptName = response.data.dept.deptName
 
+          this.deptName = response.data.dept?response.data.dept.deptName: ''
 
           this.form = response.data.tWarehouseAgreement
 
           //--
 
           // this.fMblnoOptions = response.data.corps
 
@@ -1060,7 +1060,8 @@ export default {
 
       this.register()
 
       getAgreement(row.fId).then(response => {
 
         // this.fMblnoOptions = response.data.corps
 
-        this.deptName = response.data.dept.deptName
 
+        // this.deptName = response.data.dept.deptName
 
+        this.deptName = response.data.dept?response.data.dept.deptName: ''
 
         this.form = response.data.tWarehouseAgreement
 
         this.operator = this.form.createBy
 
         this.agreementitemsList = response.data.tWarehouseAgreementitems
 
@@ -1207,8 +1208,8 @@ export default {
 
         }
 
 
         // this.$set("deptName", response.dept.deptName);
 
-        this.deptName = response.dept.deptName
 
-        this.form.fDeptid = response.dept.deptId
 
+        this.deptName = response.dept?response.dept.deptName: ''
 
+        this.form.fDeptid = response.dept? response.dept.deptId: ''
 
         this.agreementitemsList.createBy = response.user.userName
 
 
         // this.$set(this.agreementitemsList, "createBy", response.user.userName);
 
@@ -1358,8 +1359,8 @@ export default {
 
       this.title = '添加仓储费'
 
       queryUserVal().then((response) => {
 
         // this.$set("deptName", response.dept.deptName);
 
-        this.deptName = response.dept.deptName
 
-        this.form.fDeptid = response.dept.deptId
 
+        this.deptName = response.dept?response.dept.deptName: ''
 
+        this.form.fDeptid = response.dept? response.dept.deptId: ''
 
         // this.agreementitemsList.createBy = response.user.userName
 
 
         // this.$set(this.agreementitemsList, "createBy", response.user.userName);
 
@@ -1373,7 +1374,8 @@ export default {
 
       if (num === 2){
 
         this.notChange = false
 
         getAgreement(this.idCopy).then(response => {
 
-          this.deptName = response.data.dept.deptName
 
+          // this.deptName = response.data.dept.deptName
 
+          this.deptName = response.data.dept?response.data.dept.deptName: ''
 
           this.form = response.data.tWarehouseAgreement
 
           this.form.fId = null
 
           this.form.fBillstatus = ''
 
@@ -1402,7 +1404,8 @@ export default {
 
         this.browseStatus = false
 
         const fId = row.fId || this.ids
 
         getAgreement(fId).then(response => {
 
-          this.deptName = response.data.dept.deptName
 
+          // this.deptName = response.data.dept.deptName
 
+          this.deptName = response.data.dept?response.data.dept.deptName: ''
 
           this.form = response.data.tWarehouseAgreement
 
           if (response.data.tWarehouseAgreement.tPackages) {
 
             this.form.tPackages = this.form.tPackages

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