报表统计完善

src/api/reportAnalysis/inoutStatistics.js

@@ -26,3 +26,11 @@ export function productName(query) {
     params:query
   })
 }
+// 导出数据
+export function listExport(query) {
+  return request({
+    url: '/anpin/stockControl/tWarehouseInorOutExcePorrt/export',
+    method: 'get',
+    params:query
+  })
+}

src/api/reportAnalysis/salesStatistics.js

@@ -0,0 +1,46 @@
+import request from '@/utils/request'
+
+// 查询数据主列表
+export function queryData(query) {
+return request({
+url: '/anpin/stockControl/salesOfOutbound',
+method: 'get',
+params: query
+})
+}
+// 查询供应商开票单位付款单位
+export function company(query) {
+  return request({
+    url: '/basicdata/corps/getCorpName',
+    method: 'post',
+    data: {
+      fTypeid:query
+    }
+  })
+}
+// 查询品名数据
+export function productName(query) {
+  return request({
+    url: '/basicdata/fees/list',
+    method: 'get',
+    params:query
+  })
+}
+// 查询项目名称
+export function queryItem(query) {
+  return request({
+    url: '/anpin/project/projectName',
+    method: 'post',
+    data: {
+      projectName:query
+    }
+  })
+}
+// 导出数据
+export function listExport(query) {
+  return request({
+    url: '/anpin/stockControl/salesOfOutboundExcePorrt/export',
+    method: 'get',
+    params:query
+  })
+}

src/store/modules/user.js

@@ -1,5 +1,6 @@
 import { login, logout, getInfo } from '@/api/login'
 import { getToken, setToken, removeToken } from '@/utils/auth'
+import Cookies from 'js-cookie'
 
 const user = {
   state: {
@@ -50,7 +51,7 @@ const user = {
     GetInfo({ commit, state }) {
       return new Promise((resolve, reject) => {
         getInfo(state.token).then(res => {
-          console.log(res)
+          console.log(res.user.userSystem)
           const user = res.user
           const avatar = user.avatar == "" ? require("@/assets/images/profile.jpg") : process.env.VUE_APP_BASE_API + user.avatar;
           if (res.roles && res.roles.length > 0) { // 验证返回的roles是否是一个非空数组
@@ -62,6 +63,7 @@ const user = {
           commit('SET_NAME', user.userName)
           commit('SET_AVATAR', avatar)
           resolve(res)
+
           Cookies.set("userType",res.user.userType)
           Cookies.set("userName",res.user.userName)
           Cookies.set("sysType",res.user.userSystem)

src/views/finance/charge/index.vue

@@ -2209,7 +2209,7 @@ export default {
           fFeesName: "", //结算单位
           fCorpid: "", //结算单位ID
         };
-        if(Cookies.get("sysType") == 1 || Cookies.get("sysType") == 2){
+        if(Cookies.get("sysType") == 1 || Cookies.get("sysType") == 2 || Cookies.get("sysType") == 4){
           getCharge(this.approval.billId).then((response) => {
             this.Operator = response.data.tFee.createBy;
             if (response.data.feeDoList != 0) {
@@ -2333,7 +2333,7 @@ export default {
     check(row, res) {
       this.notChange = true;
       this.doNot = true
-      if (Cookies.get("sysType") == 1) {
+      if (Cookies.get("sysType") == 1 || Cookies.get("sysType") == 4) {
         //大木
         getCharge(row.fId).then((response) => {
           this.Operator = response.data.tFee.createBy;
@@ -2662,7 +2662,7 @@ export default {
             formDate.append("tFee", JSON.stringify(this.queryParams));
             formDate.append("tFeeDo", JSON.stringify(this.increase_s));
 
-            if (Cookies.get("sysType") == 1) {
+            if (Cookies.get("sysType") == 1 || Cookies.get("sysType") == 4) {
               collectFee(formDate).then((response) => {
                 this.open = false;
                 this.msgSuccess("操作成功");
@@ -2937,7 +2937,7 @@ export default {
       this.getDicts("approval_process").then((response) => {
         this.options = response.data;
       });
-      if (Cookies.get("sysType") == 1) {
+      if (Cookies.get("sysType") == 1 || Cookies.get("sysType") == 4) {
         //大木
         listCharge(this.tableFilter).then((response) => {
           this.chargeList = response.rows;
@@ -3031,7 +3031,7 @@ export default {
       if (this.queryParameter.fStatementNo) {
         this.rules = {};
 
-        if (Cookies.get("sysType") == 1) {
+        if (Cookies.get("sysType") == 1 || Cookies.get("sysType") == 4) {
           search(this.queryParameter).then((response) => {
             this.chargeList_s = response.rows;
             this.$message.success("查询成功");
@@ -3068,7 +3068,7 @@ export default {
         if (this.rules) {
           this.$refs["form"].validate((valid) => {
             if (valid) {
-              if (Cookies.get("sysType") == 1) {
+              if (Cookies.get("sysType") == 1 || Cookies.get("sysType") == 4) {
                 search(this.queryParameter).then((response) => {
                   this.chargeList_s = response.rows;
                   if (this.chargeList_s.length !== 0) {
@@ -3223,7 +3223,7 @@ export default {
         fCorpid: "", //结算单位ID
       };
       const fId = row.fId || this.ids;
-      if (Cookies.get("sysType") == 1) {
+      if (Cookies.get("sysType") == 1 || Cookies.get("sysType") == 4) {
         //大木
         getCharge(fId).then((response) => {
           this.Operator = response.data.tFee.createBy;
@@ -3320,7 +3320,7 @@ export default {
             let formData = new window.FormData();
             formData.append("tFee", JSON.stringify(this.queryParams));
             formData.append("tFeeDo", JSON.stringify(this.increase_s));
-            if (Cookies.get("sysType") == 1) {
+            if (Cookies.get("sysType") == 1 || Cookies.get("sysType") == 4) {
               addCharge(formData).then((response) => {
                 let feeBills = response.data.tFee;
                 this.$set(this.queryParams, "fId", response.data.tFee.fId);
@@ -3357,7 +3357,7 @@ export default {
                 this.getList()
               });
             }
-          } else if(Cookies.get("sysType") == 1 || Cookies.get("sysType") == 2){
+          } else if(Cookies.get("sysType") == 1 || Cookies.get("sysType") == 2 || Cookies.get("sysType") == 4){
             this.queryParams.fBillstatus = "1";
             let formData = new window.FormData();
             formData.append("tFee", JSON.stringify(this.queryParams));
@@ -3389,7 +3389,7 @@ export default {
     handleDelete(row) {
       const fIds = row.fId || this.ids;
       let tips = "";
-      if (Cookies.get("sysType") == 1) {
+      if (Cookies.get("sysType") == 1 || Cookies.get("sysType") == 4) {
         //大木
         delCharge_s(fIds).then((data) => {
           switch (data.msg) {
@@ -3466,7 +3466,7 @@ export default {
         type: "warning",
       })
         .then(function () {
-          if (Cookies.get("sysType") == 1) {
+          if (Cookies.get("sysType") == 1 || Cookies.get("sysType") == 4) {
             return delCharge(fIds);
           } else if (Cookies.get("sysType") == 2) {
             return delCharges(fIds);

src/views/finance/contrast/index.vue

@@ -476,23 +476,23 @@
             :disabled="notChange"
           />
         </el-form-item>
-        <el-form-item label="业务类型" prop="fSystemType">
-          <el-select
-            v-model="queryParams.fSystemType"
-            placeholder="请选择业务类型"
-            size="small"
-            disabled
-            style="width: 200px"
-          >
-            <el-option
-              v-for="item in typeoptions"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            >
-            </el-option>
-          </el-select>
-        </el-form-item>
+<!--        <el-form-item label="业务类型" prop="fSystemType">-->
+<!--          <el-select-->
+<!--            v-model="queryParams.fSystemType"-->
+<!--            placeholder="请选择业务类型"-->
+<!--            size="small"-->
+<!--            disabled-->
+<!--            style="width: 200px"-->
+<!--          >-->
+<!--            <el-option-->
+<!--              v-for="item in typeoptions"-->
+<!--              :key="item.value"-->
+<!--              :label="item.label"-->
+<!--              :value="item.value"-->
+<!--            >-->
+<!--            </el-option>-->
+<!--          </el-select>-->
+<!--        </el-form-item>-->
         <div style="width: 100%; display: flex; justify-content: space-between">
           <div style="display: flex">
             <el-button icon="el-icon-arrow-left" type="danger" v-if="cancelButton === true" size="mini" @click="cancel"
@@ -1892,7 +1892,6 @@ export default {
     ApprovalComments,
   },
   created() {
-    console.log(Cookies.get('sysType'))
     this.setRowList = this.tableDate;
     this.getRowList = this.tableDate;
     this.setRowList2 = this.tableDate2;
@@ -2388,7 +2387,7 @@ export default {
             let formDate = new window.FormData();
             formDate.append("tFee", JSON.stringify(this.queryParams));
             formDate.append("tFeeDo", JSON.stringify(this.DzfeeList));
-            if (Cookies.get("sysType") == 1 ||  !Cookies.get("sysType")) {
+            if (Cookies.get("sysType") == 1 || Cookies.get("sysType") == 4) {
               Cfee(formDate).then((response) => {
                 this.open = false;
                 this.msgSuccess("操作成功");
@@ -2793,7 +2792,7 @@ export default {
         // this.feeList = response.rows;
         this.options = response.data;
       });
-      if (Cookies.get("sysType") == 1 ||  !Cookies.get("sysType")) {
+      if (Cookies.get("sysType") == 1 || Cookies.get("sysType") == 4) {
         listFee(this.tablefilter).then((response) => {
           this.contrastList = response.rows;
           this.total = response.total;
@@ -2990,7 +2989,7 @@ export default {
     check(row, res) {
       this.doNot = true;
       this.notChange = true;
-      if (Cookies.get("sysType") == 1 ||  !Cookies.get("sysType")) {
+      if (Cookies.get("sysType") == 1 || Cookies.get("sysType") == 4) {
         getFee(row.fId).then((response) => {
           this.Operator = response.data.tFee.createBy;
           if (response.data.feeDoList != 0) {
@@ -3347,7 +3346,7 @@ export default {
         fCorpid: "", //结算单位ID
       };
       const fId = row.fId || this.ids;
-      if (Cookies.get("sysType") == 1 ||  !Cookies.get("sysType")) {
+      if (Cookies.get("sysType") == 1 || Cookies.get("sysType") == 4) {
         getFee(fId).then((response) => {
           this.Operator = response.data.tFee.createBy;
           if (response.data.feeDoList != 0) {
@@ -3549,7 +3548,7 @@ export default {
     handleDelete(row) {
       const fIds = row.fId || this.ids;
       let tips = "";
-      if (Cookies.get("sysType") == 1 ||  !Cookies.get("sysType")) {
+      if (Cookies.get("sysType") == 1 || Cookies.get("sysType") == 4) {
         detailFee(fIds).then((res) => {
           switch (res.msg) {
             case "0": {
@@ -3624,7 +3623,7 @@ export default {
         type: "warning",
       })
         .then(function () {
-          if (Cookies.get("sysType") == 1 ||  !Cookies.get("sysType")) {
+          if (Cookies.get("sysType") == 1 || Cookies.get("sysType") == 4) {
             return delFee(fIds);
           } else if (Cookies.get("sysType") == 2) {
             return delFleet(fIds);

src/views/finance/payment/index.vue

@@ -822,9 +822,7 @@
           label-width="80px"
           style="display: flex; flex-wrap: wrap"
         >
-          <el-row>
-            <el-col :span="6">
-               <el-form-item label="货权方" prop="fCtrlcorpid">
+          <el-form-item label="货权方" prop="fCtrlcorpid">
             <!--            <el-input v-model="queryParameter.fCorpid" placeholder="请输入货权方" style="width: 200px;"/>-->
             <el-select
               v-model="queryParams.fCorpid"
@@ -832,7 +830,7 @@
               remote
               clearable
               size="small"
-              style="width: 160px"
+              style="width: 80%"
               @keyup.enter.native="handleQuery"
               :remote-method="corpsRemoteMethod"
               placeholder="请选择货权方"
@@ -845,9 +843,7 @@
               ></el-option>
             </el-select>
           </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="结算单位" prop="fToCorpid">
+          <el-form-item label="结算单位" prop="fToCorpid">
             <el-select
               v-model="queryParameter.fToCorpid"
               filterable
@@ -855,7 +851,7 @@
               clearable
               size="small"
               :disabled="doNot"
-              style="width: 160px"
+              style="width: 80%"
               @keyup.enter.native="handleQuery"
               :remote-method="corpsRemoteMethod"
               placeholder="请输入结算单位"
@@ -868,39 +864,31 @@
               ></el-option>
             </el-select>
           </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="提单号" prop="tMblno">
+          <el-form-item label="提单号" prop="tMblno">
             <el-input
               v-model="queryParameter.fMblno"
               placeholder="请输入提单号"
-              style="width: 160px"
+              style="width: 80%"
               size="small"
             />
           </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="对账单号" prop="fStatementNo">
+          <el-form-item label="对账单号" prop="fStatementNo">
             <el-input
               v-model="queryParameter.fStatementNo"
               placeholder="请输入提单号"
               size="small"
               @change="noNull"
-              style="width: 160px"
+              style="width: 80%"
             />
           </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="6">
-              <el-form-item label="费用名称" prop="fFeeid">
+          <el-form-item label="费用名称" prop="fFeeid">
             <template>
               <el-select
                 v-model="queryParameter.fFeeid"
                 filterable
                 remote
                 size="small"
-                style="width: 160px"
+                style="width: 80%"
                 :remote-method="fWRemoteMethod"
                 placeholder="费用名称"
                 multiple
@@ -915,30 +903,13 @@
               </el-select>
             </template>
           </el-form-item>
-            </el-col>
-            <el-col :span="6">
-               <el-form-item label="仓储业务" prop="fFeeid" v-if="typevalue == 1 || typevalue == 3">
-            <el-select
-              v-model="queryParameter.fBilltype"
-              size="small"
-              style="width: 160px"
-              @change="changefBilltype"
-              placeholder="请选择仓储业务"
-            >
-              <el-option label="入库" value="SJRK"></el-option>
-              <el-option label="出库" value="SJCK"></el-option>
-              <el-option label="货权转移" value="HQZY"></el-option>
-            </el-select>
-          </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="作业类型" prop="fBusinessType">
+          <el-form-item label="作业类型" prop="fBusinessType">
             <el-select
               v-model="queryParameter.fBusinessType"
               filterable
               remote
               size="small"
-              style="width: 160px"
+              style="width: 80%"
               placeholder="作业类型"
               multiple
             >
@@ -951,31 +922,37 @@
               </el-option>
             </el-select>
           </el-form-item>
-            </el-col>
-            <el-col :span="6" style="width: 240px"></el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="8">
-              <el-form-item
-                label="审核日期"
-                prop="timeExamine"
-                v-if="typevalue == 1 || typevalue == 3"
-              >
-                <el-date-picker
-                  size="small"
-                  style="width: 240px"
-                  v-model="queryParameter.timeExamine"
-                  type="daterange"
-                  start-placeholder="开始日期"
-                  end-placeholder="结束日期"
-                  value-format="yyyy-MM-dd"
-                  :default-time="['00:00:00', '23:59:59']"
-                >
-                </el-date-picker>
-              </el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <el-form-item
+          <el-form-item label="仓储业务" prop="fFeeid" v-if="typevalue == 1 || typevalue == 3">
+            <el-select
+              v-model="queryParameter.fBilltype"
+              size="small"
+              style="width: 80%"
+              @change="changefBilltype"
+              placeholder="请选择仓储业务"
+            >
+              <el-option label="入库" value="SJRK"></el-option>
+              <el-option label="出库" value="SJCK"></el-option>
+              <el-option label="货权转移" value="HQZY"></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item
+            label="审核日期"
+            prop="timeExamine"
+            v-if="typevalue == 1 || typevalue == 3"
+          >
+            <el-date-picker
+              size="small"
+              style="width: 80%"
+              v-model="queryParameter.timeExamine"
+              type="daterange"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+              value-format="yyyy-MM-dd"
+              :default-time="['00:00:00', '23:59:59']"
+            >
+            </el-date-picker>
+          </el-form-item>
+          <el-form-item
             label="出入库日期"
             label-width="85px"
             prop="fAccbilldate"
@@ -983,7 +960,7 @@
           >
             <el-date-picker
               size="small"
-              style="width: 240px"
+              style="width: 80%"
               v-model="queryParameter.timeInterval"
               type="daterange"
               start-placeholder="开始日期"
@@ -993,12 +970,183 @@
             >
             </el-date-picker>
           </el-form-item>
-            </el-col>
-            <el-col :span="8" style="width: 320px">
-              <el-form-item>
-          </el-form-item>
-            </el-col>
-          </el-row>
+<!--          <el-row>-->
+<!--            <el-col :span="6">-->
+<!--               <el-form-item label="货权方" prop="fCtrlcorpid">-->
+<!--            &lt;!&ndash;            <el-input v-model="queryParameter.fCorpid" placeholder="请输入货权方" style="width: 200px;"/>&ndash;&gt;-->
+<!--            <el-select-->
+<!--              v-model="queryParams.fCorpid"-->
+<!--              filterable-->
+<!--              remote-->
+<!--              clearable-->
+<!--              size="small"-->
+<!--              style="width: 160px"-->
+<!--              @keyup.enter.native="handleQuery"-->
+<!--              :remote-method="corpsRemoteMethod"-->
+<!--              placeholder="请选择货权方"-->
+<!--            >-->
+<!--              <el-option-->
+<!--                v-for="(dict, index) in fMblnoOptions"-->
+<!--                :key="index.fId"-->
+<!--                :label="dict.fName"-->
+<!--                :value="dict.fId"-->
+<!--              ></el-option>-->
+<!--            </el-select>-->
+<!--          </el-form-item>-->
+<!--            </el-col>-->
+<!--            <el-col :span="6">-->
+<!--              <el-form-item label="结算单位" prop="fToCorpid">-->
+<!--            <el-select-->
+<!--              v-model="queryParameter.fToCorpid"-->
+<!--              filterable-->
+<!--              remote-->
+<!--              clearable-->
+<!--              size="small"-->
+<!--              :disabled="doNot"-->
+<!--              style="width: 160px"-->
+<!--              @keyup.enter.native="handleQuery"-->
+<!--              :remote-method="corpsRemoteMethod"-->
+<!--              placeholder="请输入结算单位"-->
+<!--            >-->
+<!--              <el-option-->
+<!--                v-for="(dict, index) in fMblnoOptions"-->
+<!--                :key="index.fId"-->
+<!--                :label="dict.fName"-->
+<!--                :value="dict.fId"-->
+<!--              ></el-option>-->
+<!--            </el-select>-->
+<!--          </el-form-item>-->
+<!--            </el-col>-->
+<!--            <el-col :span="6">-->
+<!--              <el-form-item label="提单号" prop="tMblno">-->
+<!--            <el-input-->
+<!--              v-model="queryParameter.fMblno"-->
+<!--              placeholder="请输入提单号"-->
+<!--              style="width: 160px"-->
+<!--              size="small"-->
+<!--            />-->
+<!--          </el-form-item>-->
+<!--            </el-col>-->
+<!--            <el-col :span="6">-->
+<!--              <el-form-item label="对账单号" prop="fStatementNo">-->
+<!--            <el-input-->
+<!--              v-model="queryParameter.fStatementNo"-->
+<!--              placeholder="请输入提单号"-->
+<!--              size="small"-->
+<!--              @change="noNull"-->
+<!--              style="width: 160px"-->
+<!--            />-->
+<!--          </el-form-item>-->
+<!--            </el-col>-->
+<!--          </el-row>-->
+<!--          <el-row>-->
+<!--            <el-col :span="6">-->
+<!--              <el-form-item label="费用名称" prop="fFeeid">-->
+<!--            <template>-->
+<!--              <el-select-->
+<!--                v-model="queryParameter.fFeeid"-->
+<!--                filterable-->
+<!--                remote-->
+<!--                size="small"-->
+<!--                style="width: 160px"-->
+<!--                :remote-method="fWRemoteMethod"-->
+<!--                placeholder="费用名称"-->
+<!--                multiple-->
+<!--              >-->
+<!--                <el-option-->
+<!--                  v-for="item in fWbuOptions"-->
+<!--                  :key="item.fId"-->
+<!--                  :label="item.fName"-->
+<!--                  :value="item.fId"-->
+<!--                >-->
+<!--                </el-option>-->
+<!--              </el-select>-->
+<!--            </template>-->
+<!--          </el-form-item>-->
+<!--            </el-col>-->
+<!--            <el-col :span="6">-->
+<!--              <el-form-item label="作业类型" prop="fBusinessType">-->
+<!--                <el-select-->
+<!--                  v-model="queryParameter.fBusinessType"-->
+<!--                  filterable-->
+<!--                  remote-->
+<!--                  size="small"-->
+<!--                  style="width: 160px"-->
+<!--                  placeholder="作业类型"-->
+<!--                  multiple-->
+<!--                >-->
+<!--                  <el-option-->
+<!--                    v-for="(dict, index) in businessTypeOption"-->
+<!--                    :key="index.dictValue"-->
+<!--                    :label="dict.dictLabel"-->
+<!--                    :value="dict.dictValue"-->
+<!--                  >-->
+<!--                  </el-option>-->
+<!--                </el-select>-->
+<!--              </el-form-item>-->
+<!--            </el-col>-->
+<!--            <el-col :span="6">-->
+<!--               <el-form-item label="仓储业务" prop="fFeeid" v-if="typevalue == 1 || typevalue == 3">-->
+<!--            <el-select-->
+<!--              v-model="queryParameter.fBilltype"-->
+<!--              size="small"-->
+<!--              style="width: 160px"-->
+<!--              @change="changefBilltype"-->
+<!--              placeholder="请选择仓储业务"-->
+<!--            >-->
+<!--              <el-option label="入库" value="SJRK"></el-option>-->
+<!--              <el-option label="出库" value="SJCK"></el-option>-->
+<!--              <el-option label="货权转移" value="HQZY"></el-option>-->
+<!--            </el-select>-->
+<!--          </el-form-item>-->
+<!--            </el-col>-->
+<!--            <el-col :span="6" style="width: 500px"></el-col>-->
+<!--          </el-row>-->
+<!--          <el-row>-->
+<!--            <el-col :span="8">-->
+<!--              <el-form-item-->
+<!--                label="审核日期"-->
+<!--                prop="timeExamine"-->
+<!--                v-if="typevalue == 1 || typevalue == 3"-->
+<!--              >-->
+<!--                <el-date-picker-->
+<!--                  size="small"-->
+<!--                  style="width: 240px"-->
+<!--                  v-model="queryParameter.timeExamine"-->
+<!--                  type="daterange"-->
+<!--                  start-placeholder="开始日期"-->
+<!--                  end-placeholder="结束日期"-->
+<!--                  value-format="yyyy-MM-dd"-->
+<!--                  :default-time="['00:00:00', '23:59:59']"-->
+<!--                >-->
+<!--                </el-date-picker>-->
+<!--              </el-form-item>-->
+<!--            </el-col>-->
+<!--            <el-col :span="8">-->
+<!--              <el-form-item-->
+<!--            label="出入库日期"-->
+<!--            label-width="85px"-->
+<!--            prop="fAccbilldate"-->
+<!--            v-if="typevalue == 1 || typevalue == 3"-->
+<!--          >-->
+<!--            <el-date-picker-->
+<!--              size="small"-->
+<!--              style="width: 240px"-->
+<!--              v-model="queryParameter.timeInterval"-->
+<!--              type="daterange"-->
+<!--              start-placeholder="开始日期"-->
+<!--              end-placeholder="结束日期"-->
+<!--              value-format="yyyy-MM-dd"-->
+<!--              :default-time="['00:00:00', '23:59:59']"-->
+<!--            >-->
+<!--            </el-date-picker>-->
+<!--          </el-form-item>-->
+<!--            </el-col>-->
+<!--            <el-col :span="8" style="width: 320px">-->
+<!--              <el-form-item>-->
+<!--          </el-form-item>-->
+<!--            </el-col>-->
+<!--          </el-row>-->
         </el-form>
         <el-dialog
           title="自定义列显示"
@@ -2884,7 +3032,7 @@ export default {
           fFeesName: "", //结算单位
           fCorpid: "", //结算单位ID
         };
-        if (Cookies.get("sysType") == 1) {
+        if (Cookies.get("sysType") == 1 || Cookies.get("sysType") == 4) {
           //大木
           getCharge(this.approval.billId).then((response) => {
             this.Operator = response.data.tFee.createBy;
@@ -3041,7 +3189,7 @@ export default {
     check(row, res) {
       this.notChange = true;
       this.doNot = true
-      if (Cookies.get("sysType") == 1) {
+      if (Cookies.get("sysType") == 1 || Cookies.get("sysType") == 4) {
         //大木
         getCharge(row.fId).then((response) => {
           this.Operator = response.data.tFee.createBy;
@@ -3369,7 +3517,7 @@ export default {
             let formDate = new window.FormData();
             formDate.append("tFee", JSON.stringify(this.queryParams));
             formDate.append("tFeeDo", JSON.stringify(this.increase_s));
-            if (Cookies.get("sysType") == 1) {
+            if (Cookies.get("sysType") == 1 || Cookies.get("sysType") == 4) {
               collectFee(formDate).then((response) => {
                 this.msgSuccess("操作成功");
                 this.open = false;
@@ -3644,7 +3792,7 @@ export default {
       this.getDicts("approval_process").then((response) => {
         this.options = response.data;
       });
-      if (Cookies.get("sysType") == 1) {
+      if (Cookies.get("sysType") == 1 || Cookies.get("sysType") == 4) {
         //大木
         listCharge(this.tableFilter).then((response) => {
           this.chargeList = response.rows;
@@ -3738,7 +3886,7 @@ export default {
       this.chargeList_s = [];
       if (this.queryParameter.fStatementNo) {
         this.rules = {};
-        if (Cookies.get("sysType") == 1) {
+        if (Cookies.get("sysType") == 1 || Cookies.get("sysType") == 4) {
           search(this.queryParameter).then((response) => {
             this.chargeList_s = response.rows;
             this.$message.success("查询成功");
@@ -3771,7 +3919,7 @@ export default {
         if (this.rules) {
           this.$refs["form"].validate((valid) => {
             if (valid) {
-              if (Cookies.get("sysType") == 1) {
+              if (Cookies.get("sysType") == 1 || Cookies.get("sysType") == 4) {
                 search(this.queryParameter).then((response) => {
                   this.chargeList_s = response.rows;
                   if (this.chargeList_s.length !== 0) {
@@ -3927,7 +4075,7 @@ export default {
         fCorpid: "", //结算单位ID
       };
       const fId = row.fId || this.ids;
-      if (Cookies.get("sysType") == 1) {
+      if (Cookies.get("sysType") == 1 || Cookies.get("sysType") == 4) {
         //大木
         getCharge(fId).then((response) => {
           this.Operator = response.data.tFee.createBy;
@@ -4009,7 +4157,7 @@ export default {
             let formData = new window.FormData();
             formData.append("tFee", JSON.stringify(this.queryParams));
             formData.append("tFeeDo", JSON.stringify(this.increase_s))
-            if (Cookies.get("sysType") == 1) {
+            if (Cookies.get("sysType") == 1 || Cookies.get("sysType") == 4) {
               addCharge(formData).then((response) => {
                 this.msgSuccess("新增成功");
                 this.getList();
@@ -4048,7 +4196,7 @@ export default {
             let formData = new window.FormData();
             formData.append("tFee", JSON.stringify(this.queryParams));
             formData.append("tFeeDo", JSON.stringify(this.increase_s));
-            if (Cookies.get("sysType") == 1) {
+            if (Cookies.get("sysType") == 1 || Cookies.get("sysType") == 4) {
               addCharge(formData).then((response) => {
                 this.msgSuccess("修改成功");
                 // this.increase_s = []
@@ -4082,7 +4230,7 @@ export default {
     handleDelete(row) {
       const fIds = row.fId || this.ids;
       let tips = "";
-      if (Cookies.get("sysType") == 1) {
+      if (Cookies.get("sysType") == 1 || Cookies.get("sysType") == 4) {
         //大木
         delCharge_s(fIds).then((data) => {
           switch (data.msg) {
@@ -4159,7 +4307,7 @@ export default {
         type: "warning",
       })
         .then(function () {
-          if (Cookies.get("sysType") == 1) {
+          if (Cookies.get("sysType") == 1 || Cookies.get("sysType") == 4) {
             return delCharge(fIds);
           } else if (Cookies.get("sysType") == 2) {
             return delCharges(fIds);

src/views/purchaseIssue/index.vue

@@ -98,6 +98,7 @@
           <h1 style="text-align: center;font-weight:bold">{{ formList.fsbuName }}</h1>
           <div style="display: flex;justify-content: space-between;margin-bottom: 10px">
             <div style="width: 200px;height: 20px;font-size: 14px;">客户项目：{{projectName}}</div>
+            <div style="width: 200px;height: 20px;font-size: 14px;">销售出库单</div>
             <div style="width: 200px;height: 20px;font-size: 14px;">出库日期：{{formList.fBsdate}}</div>
           </div>
           <div style="display: flex;justify-content: space-between;margin-bottom: 10px">
@@ -169,7 +170,7 @@ import {
   warehouse,
   listDelete,
   tableDeleteQuery,
-  confirmDeletion, pleaseCheck, revoke, queryUserVal, getName, revokeBill
+  confirmDeletion, pleaseCheck, revoke, queryUserVal, getName, revokeBill, copyNew
 } from '@/api/purchaseIssue/index'
 import Cookies from 'js-cookie'
 
@@ -1168,6 +1169,18 @@ export default {
     },
     //选择框
     selectionbox(selection) {
+      if (selection.length > 1){
+        this.customButton.forEach(item =>{
+          if (item.name === '复制新增'){
+            item.disabled = true
+          }else {
+            item.disabled = false
+          }
+        })
+      }else {
+        this.customButton.forEach(item => item.disabled = false)
+        this.selection = selection
+      }
     },
     addOrUpdateHand() {
       this.addOrUpdateVisib = true
@@ -1225,6 +1238,7 @@ export default {
     Printing() {
       this.$print(this.$refs.print)
     },
+
     //所以按钮
     buttonList(row) {
       let data
@@ -1250,6 +1264,30 @@ export default {
           this.contentStyle.forEach(item => item.disabled = false)
           // this.$refs.avatar.form.createBy = Cookies.get('userName')
           break
+        case '复制新增':
+          if (this.selection.length > 0){
+            let datae = {
+              fId:this.selection[0].fId,
+              fBilltype:'XS'
+            }
+            copyNew(datae).then(res=>{
+              this.$message({
+                message: '复制新增成功',
+                type: 'success',
+                showClose:true
+              });
+              let scope = {
+                row:{
+                  fId:res.data
+                }
+              }
+              this.query(this.formDataList)
+              this.viewMethod(scope)
+            })
+          }else {
+            this.$message.warning('未选择列表，请选择后再点击');
+          }
+          break
         case '保存':
           this.$refs.avatar.submitForm('submit')
           break

src/views/purchaseRequest/index.vue

@@ -1264,7 +1264,13 @@ export default {
                 type: 'success',
                 showClose:true
               });
+              let scope = {
+                row:{
+                  fId:res.data
+                }
+              }
               this.query(this.formDataList)
+              this.viewMethod(scope)
             })
           }else {
             this.$message.warning('未选择列表，请选择后再点击');

src/views/reportAnalysis/inoutStatistics.vue

@@ -46,7 +46,7 @@
 
 <script>
 import { select } from '@/api/system/set'
-import{ queryData, company, productName} from '@/api/reportAnalysis/inoutStatistics'
+import{ queryData, company, productName, listExport} from '@/api/reportAnalysis/inoutStatistics'
 import Cookies from 'js-cookie'
 
 export default {
@@ -78,7 +78,7 @@ export default {
           icon: 'el-icon-edit',
           name: '导出',
           disabled: false,
-          hasPermi:['anpin:stockControl:anPingApply']
+          hasPermi:['anpin:stockControl:tWarehouseInorOutExcePorrt']
         }],
       inDex: 4,
       total:0,
@@ -96,6 +96,14 @@ export default {
           onabort: ''
         },{
           surface: '2',
+          label: 'fBilltypeName',
+          name: '出入库类别',
+          checked: 0,
+          width: 100,
+          onabort: ''
+        },
+        {
+          surface: '3',
           label: 'fBsdate',
           name: '进货时间',
           checked: 0,
@@ -103,14 +111,14 @@ export default {
           onabort: ''
         },
         {
-          surface: '3',
+          surface: '4',
           label: 'fFeetype',
           name: '货物类别',
           checked: 0,
           width: 100,
           onabort: ''
         },{
-          surface: '4',
+          surface: '5',
           label: 'feeName',
           name: '产品名称',
           checked: 0,
@@ -118,7 +126,7 @@ export default {
           onabort: ''
         },
         {
-          surface: '5',
+          surface: '6',
           label: 'fCurrencyName',
           name: '规格',
           checked: 0,
@@ -126,7 +134,7 @@ export default {
           onabort: ''
         },
         {
-          surface: '6',
+          surface: '7',
           label: 'fQty',
           name: '数量',
           checked: 0,
@@ -134,7 +142,7 @@ export default {
           onabort: ''
         },
         {
-          surface: '7',
+          surface: '8',
           label: 'corpName',
           name: '供货商',
           checked: 0,
@@ -142,7 +150,7 @@ export default {
           onabort: ''
         },
         {
-          surface: '8',
+          surface: '9',
           label: 'fManage',
           name: '供货人',
           checked: 0,
@@ -150,7 +158,7 @@ export default {
           onabort: ''
         },
         {
-          surface: '9',
+          surface: '10',
           label: 'fTel',
           name: '联系电话',
           checked: 0,
@@ -158,14 +166,14 @@ export default {
           onabort: ''
         },
         {
-          surface: '10',
+          surface: '11',
           label: 'tProductdate',
           name: '生产日期',
           checked: 0,
           width: 100,
           onabort: ''
         },{
-          surface: '11',
+          surface: '12',
           label: 'fLotno',
           name: '批号',
           checked: 0,
@@ -173,7 +181,7 @@ export default {
           onabort: ''
         },
         {
-          surface: '12',
+          surface: '13',
           label: 'quality',
           name: '保质期限',
           checked: 0,
@@ -181,7 +189,7 @@ export default {
           onabort: ''
         },
         {
-          surface: '13',
+          surface: '14',
           label: 'fStoreEnvName',
           name: '保存条件',
           checked: 0,
@@ -189,7 +197,7 @@ export default {
           onabort: ''
         },
         {
-          surface: '14',
+          surface: '15',
           label: 'fIsfillesName',
           name: '索证索票',
           checked: 0,
@@ -197,7 +205,7 @@ export default {
           onabort: ''
         },
         {
-          surface: '15',
+          surface: '16',
           label: 'purchaseName',
           name: '采购人',
           checked: 0,
@@ -205,7 +213,7 @@ export default {
           onabort: ''
         },
         {
-          surface: '16',
+          surface: '17',
           label: 'checkoutName',
           name: '感官',
           checked: 0,
@@ -213,7 +221,7 @@ export default {
           onabort: ''
         },
         {
-          surface: '17',
+          surface: '18',
           label: 'checkoutName',
           name: '数量',
           checked: 0,
@@ -221,7 +229,7 @@ export default {
           onabort: ''
         },
         {
-          surface: '18',
+          surface: '19',
           label: 'checkName',
           name: '验收人',
           checked: 0,
@@ -342,6 +350,22 @@ export default {
     //所以按钮
     buttonList(row){
       console.log(row)
+      switch (row.name){
+        case '导出':
+          const queryParams = this.formDataList;
+          this.$confirm("是否确认导出所有出入库数据项?", "警告", {
+            confirmButtonText: "确定",
+            cancelButtonText: "取消",
+            type: "warning",
+          })
+            .then(function () {
+              return listExport(queryParams);
+            })
+            .then((response) => {
+              this.download(response.msg);
+            });
+          break
+      }
     },
     // 显示搜索条件、点击后会调用此方法
     showSearch() {

src/views/reportAnalysis/salesStatistics.vue

@@ -22,26 +22,43 @@
       :listStyle="listStyle"
       :queryList="queryList"
       :setRowList="setRowList"
+      :tatolLabel="tatolLabel"
     />
-    <el-pagination
-      style="float: right;margin-top: 10px"
-      @size-change="handleSizeChange"
-      @current-change="handleCurrentChange"
-      :page-sizes="[10, 20, 30, 50]"
-      :page-size="this.formDataList.pageSize"
-      background
-      layout="sizes, prev, pager, next"
-      :total="total">
-    </el-pagination>
+    <pagination
+      v-show="total > 0"
+      :total="total"
+      :page.sync="formDataList.pageNum"
+      :limit.sync="formDataList.pageSize"
+      @pagination="getList"
+    />
+<!--    <el-pagination-->
+<!--      style="float: right;margin-top: 10px"-->
+<!--      @size-change="handleSizeChange"-->
+<!--      @current-change="handleCurrentChange"-->
+<!--      :page-sizes="[10, 20, 30, 50]"-->
+<!--      :page-size="this.formDataList.pageSize"-->
+<!--      background-->
+<!--      layout="sizes, prev, pager, next"-->
+<!--      :total="total">-->
+<!--    </el-pagination>-->
   </div>
 </template>
 
 <script>
+import { queryItem, productName,queryData,listExport } from '@/api/reportAnalysis/salesStatistics'
+import Cookies from 'js-cookie'
+import { select } from '@/api/system/set'
+
 export default {
   name: 'salesStatistics',
   data(){
     return{
-      dataList:{},
+      tatolLabel:['数量','金额'],
+      dataList:{
+        fGoodsid:[],
+        fFeeType:[],
+        fFeeid:[],
+      },
       tableData:[],
       setRowList:[],
       isItHidden: true,
@@ -60,7 +77,7 @@ export default {
           icon: 'el-icon-edit',
           name: '导出',
           disabled: false,
-          hasPermi:['anpin:stockControl:anPingApply']
+          hasPermi:['anpin:stockControl:salesOfOutboundExcePorrt']
         }],
       inDex: 4,
       total:0,
@@ -78,56 +95,56 @@ export default {
           onabort: ''
         },{
           surface: '2',
-          label: 'fBillno',
+          label: 'projectName',
           name: '客户项目',
           checked: 0,
           width: 100,
           onabort: ''
         },{
           surface: '3',
-          label: 'fBillno',
+          label: 'ffeetypeName',
           name: '物资类别',
           checked: 0,
           width: 100,
           onabort: ''
         },{
           surface: '4',
-          label: 'fBillno',
+          label: 'fname',
           name: '物资',
           checked: 0,
           width: 100,
           onabort: ''
         },{
           surface: '5',
-          label: 'fBillno',
+          label: 'fcurrency',
           name: '规格',
           checked: 0,
           width: 100,
           onabort: ''
         },{
           surface: '6',
-          label: 'fBillno',
+          label: 'fqty',
           name: '数量',
           checked: 0,
           width: 100,
           onabort: ''
         },{
           surface: '7',
-          label: 'fBillno',
+          label: 'ffeeunitidName',
           name: '计量单位',
           checked: 0,
           width: 100,
           onabort: ''
         },{
           surface: '8',
-          label: 'fBillno',
+          label: 'price',
           name: '单价',
           checked: 0,
           width: 100,
           onabort: ''
         },{
           surface: '9',
-          label: 'fBillno',
+          label: 'famount',
           name: '金额',
           checked: 0,
           width: 100,
@@ -137,7 +154,7 @@ export default {
       formOption:[
         {
           span: 6,
-          label: 'fBillno',
+          label: 'fGoodsid',
           name: '客户项目',
           inputType: 1,
           width: 200,
@@ -145,7 +162,7 @@ export default {
           rules: [{ required: false, message: ' ' }]
         },{
           span: 6,
-          label: 'fBillno',
+          label: 'fFeeType',
           name: '物资类别',
           inputType: 1,
           width: 200,
@@ -153,29 +170,79 @@ export default {
           rules: [{ required: false, message: ' ' }]
         },{
           span: 6,
-          label: 'fBillno',
-          name: '期间',
-          inputType: 3,
+          label: 'fFeeid',
+          name: '物资名称',
+          inputType: 1,
           width: 240,
           labelSize: '80',
           rules: [{ required: false, message: ' ' }]
         },{
           span: 6,
-          label: 'fBillno',
-          name: '物资名称',
-          inputType: 1,
+          label: 'cLoadDate',
+          name: '期间',
+          inputType: 3,
           width: 240,
           labelSize: '80',
           rules: [{ required: false, message: ' ' }]
-        }
+        },
       ]
     }
   },
   created() {
     this.queryList.columnList = this.listStyle
     this.setRowList = this.listStyle
+    queryItem().then(res => {
+      for (let item in res.data) {
+        this.dataList.fGoodsid.push({
+          label: res.data[item].projectName,
+          value: res.data[item].fId,
+        })
+      }
+    })
+    this.getDicts("data_cost_attribute").then((response) => {
+      for(let item in response.data){
+        this.dataList.fFeeType.push({
+          value: response.data[item].dictValue,
+          label:response.data[item].dictLabel
+        })
+      }
+    });
+    productName().then(res => {
+      console.log(res)
+      if (res.code === 200) {
+        for (let item in res.rows) {
+          this.dataList.fFeeid.push({
+            label: res.rows[item].fName,
+            value: res.rows[item].fId,
+          })
+        }
+      }
+    })
+    this.getList()
+    let data = {
+      tableName: this.queryList.tableName,
+      userId: Cookies.get('userName')
+    }
+    this.getRow(data)
   },
   methods:{
+    getRow(data,list) {
+      select(data).then((res) => {
+        if (res.data.length != 0) {
+          this.queryList.columnList = res.data.filter((e) => e.checked == 0)
+          this.queryList.columnList = res.data
+          this.setRowList = res.data
+          this.queryList.columnList = this.queryList.columnList.filter((e) => e.checked == 0)
+          // this.waitFor = true
+        } else {
+          this.$set(this.queryList, 'columnList', this.$options.data().listStyle)
+          this.setRowList = this.$options.data().listStyle
+        }
+        this.isItHidden = true
+        // this.inDex = this.formOption.length
+        this.inDex = 4
+      })
+    },
     //修改
     modification(scope) {
       console.log(scope)
@@ -185,6 +252,22 @@ export default {
     //所以按钮
     buttonList(row){
       console.log(row)
+      switch (row.name){
+        case '导出':
+          const queryParams = this.formDataList;
+          this.$confirm("是否确认导出所有销售出库数据项?", "警告", {
+            confirmButtonText: "确定",
+            cancelButtonText: "取消",
+            type: "warning",
+          })
+            .then(function () {
+              return listExport(queryParams);
+            })
+            .then((response) => {
+              this.download(response.msg);
+            });
+          break
+      }
     },
     // 显示搜索条件、点击后会调用此方法
     showSearch() {
@@ -210,10 +293,15 @@ export default {
     //点击刷新会调用此方法
     getList() {
       console.log('到我了2')
+      queryData(this.formDataList).then(res=>{
+        this.tableData = res.rows
+        this.total = res.total
+      })
     },
     submitForm() {
       console.log(this.$refs.avatar.form)
       this.formDataList = this.$refs.avatar.form
+      this.getList()
     },
     returnToForm(row) {
       console.log(row, 111)