报表统计修改

src/views/agreement/agreementTask/index.vue

@@ -1,95 +1,91 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
-      <!--      <el-form-item label="业务编号" prop="fBillno">-->
-      <!--        <el-input-->
-      <!--          v-model="queryParams.fBillno"-->
-      <!--          placeholder="请输入业务编号"-->
-      <!--          clearable-->
-      <!--          size="small"-->
-      <!--          @keyup.enter.native="handleQuery"-->
-      <!--        />-->
-      <!--      </el-form-item>-->
-      <el-form-item label="客户名称" prop="fCorpid">
-        <el-select
-          v-model="queryParams.fCorpid"
-          filterable
-          remote
-          clearable
-          style="width: 200px"
-          @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-form-item label="货物品名" prop="fGoodsid">-->
-<!--        <el-select-->
-<!--          v-model="queryParams.fGoodsid"-->
-<!--          filterable-->
-<!--          remote-->
-<!--          clearable-->
-<!--          style="width: 200px"-->
-<!--          :remote-method="goodsRemoteMethod"-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--          placeholder="请输入货物品名"-->
-<!--        >-->
-<!--          <el-option-->
-<!--            v-for="(dict, index) in goodsOptions"-->
-<!--            :key="index.fId"-->
-<!--            :label="dict.fName"-->
-<!--            :value="dict.fId"-->
-<!--          ></el-option>-->
-<!--        </el-select>-->
-<!--      </el-form-item>-->
-      <el-form-item label="制单部门" prop="fDeptid">
-        <el-input
-          v-model="queryParams.fDeptid"
-          placeholder="请输入制单部门"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="有效期起" prop="fBegindate">
-        <el-date-picker clearable size="small" style="width: 200px"
-                        v-model="queryParams.fBegindate"
-                        type="date"
-                        value-format="yyyy-MM-dd"
-                        placeholder="选择有效期起"
-        >
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="有效期至" prop="fEnddate">
-        <el-date-picker clearable size="small" style="width: 200px"
-                        v-model="queryParams.fEnddate"
-                        type="date"
-                        value-format="yyyy-MM-dd"
-                        placeholder="选择有效期至"
-        >
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="协议编号" prop="fContractno">
-        <el-input
-          v-model="queryParams.fContractno"
-          placeholder="请输入协议编号"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="88px">
       <el-row>
-        <el-form-item style="float: right;padding: 5px">
+        <el-form-item label="客户名称" prop="fCorpid">
+          <el-select
+            v-model="queryParams.fCorpid"
+            filterable
+            remote
+            clearable
+            style="width: 200px"
+            @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-form-item label="制单部门" prop="fDeptid">
+          <el-input
+            v-model="queryParams.fDeptid"
+            placeholder="请输入制单部门"
+            clearable
+            size="small"
+            @keyup.enter.native="handleQuery"
+          />
+        </el-form-item>
+          <el-form-item label="有效期起" prop="fBegindate">
+            <el-date-picker clearable size="small" style="width: 200px"
+              v-model="queryParams.fBegindate"
+              type="date"
+              value-format="yyyy-MM-dd"
+              placeholder="选择有效期起"
+          >
+          </el-date-picker>
+        </el-form-item>
+          <el-form-item label="有效期至" prop="fEnddate">
+            <el-date-picker clearable size="small" style="width: 200px"
+            v-model="queryParams.fEnddate"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="选择有效期至"
+            >
+            </el-date-picker>
+        </el-form-item>
+          <el-form-item label="协议编号" prop="fContractno">
+            <el-input
+              v-model="queryParams.fContractno"
+              placeholder="请输入协议编号"
+              clearable
+              size="small"
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
+          <el-form-item label="作业费类型" prop="fTaskType" label-width="90px">
+            <el-select v-model="queryParams.fTaskType" clearable placeholder="请选择作业费类型" :disabled="browseStatus">
+              <el-option label="车队作业费" value="1"/>
+              <el-option label="劳务作业费" value="2"/>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="商品类别" prop="tPackages">
+            <el-select v-model="queryParams.tPackages" clearable placeholder="请选择商品类别" :disabled="browseStatus">
+              <el-option
+                v-for="dict in fTypeidOptions"
+                :key="dict.dictValue"
+                :label="dict.dictLabel"
+                :value="dict.dictValue"
+                style="width: 200px;"
+              ></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="费用类型" prop="fDc">
+            <el-select v-model="queryParams.fDc" clearable placeholder="请选择费用类型" style="width: 200px;" :disabled="browseStatus">
+              <el-option label="收" value="D"></el-option>
+              <el-option label="付" value="C"></el-option>
+            </el-select>
+          </el-form-item>
+        <el-form-item>
           <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
           <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
         </el-form-item>
       </el-row>
+
     </el-form>
 
     <el-row :gutter="10" class="mb8">
@@ -150,7 +146,21 @@
     </el-row>
     <el-table v-loading="loading" :data="agreementList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center"/>
-      <el-table-column label="客户名称" sortable align="center" prop="fCorpid" width="220"/>
+      <el-table-column type="index" label="行号" align="center" fixed/>
+      <el-table-column label="客户名称" sortable align="center" prop="fCorpid" fixed width="220"/>
+      <el-table-column label="作业费类型" sortable align="center" prop="fTaskType" fixed width="220">
+        <template slot-scope="scope">
+          <span v-if="scope.row.fTaskType === 1">车队作业费</span>
+          <span v-if="scope.row.fTaskType === 2">劳务作业费</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="商品类别" sortable align="center" prop="tPackages" fixed width="220" :formatter="tPackagesFormat"/>
+      <el-table-column label="费用类型" sortable align="center" prop="fDc" fixed width="220">
+        <template slot-scope="scope">
+          <span v-if="scope.row.fDc === 'D'">收</span>
+          <span v-if="scope.row.fDc === 'C'">付</span>
+        </template>
+      </el-table-column>
       <el-table-column label="协议编号" sortable align="center" prop="fContractno" show-overflow-tooltip/>
 <!--      <el-table-column label="费用名称" align="center" prop="fFeeid"/>-->
       <el-table-column label="有效期起" sortable align="center" prop="fBegindate" width="180">
@@ -531,7 +541,9 @@ export default {
         fFreedays: null,
         fBegindate: null,
         fEnddate: null,
-        fBillstatus: null
+        fBillstatus: null,
+        fTaskType:null,
+        fDc:null,
       },
       // 表单参数
       form: {
@@ -579,6 +591,10 @@ export default {
     this.getDicts("data_unitfees").then(response => {
       this.jFeetunitOptions = response.data;
     });
+    let queryParams = { pageNum: 1, type: 1 };
+    listCorps(queryParams).then((response) => {
+      this.fMblnoOptions = response.rows;
+    });
     this.register()
   },
   activated(){
@@ -621,7 +637,6 @@ export default {
           this.form = response.data.tWarehouseAgreement
           this.$set(this.form, 'fEnddate', Date.parse(this.form.fEnddate))
           this.$set(this.form, 'fBegindate', Date.parse(this.form.fBegindate))
-          this.fMblnoOptions = response.data.corps
           this.agreementitemsList = response.data.tWarehouseAgreementitems
           for (let item in this.agreementitemsList) {
             this.$set(this.agreementitemsList[item], 'fFeeunitid', this.agreementitemsList[item].fFeeunitid + '')
@@ -709,7 +724,6 @@ export default {
         this.$set(this.form, 'fEnddate', Date.parse(this.form.fEnddate))
         this.$set(this.form, 'fBegindate', Date.parse(this.form.fBegindate))
         this.operator = this.form.createBy
-        this.fMblnoOptions = response.data.corps
         this.agreementitemsList = response.data.tWarehouseAgreementitems
         for (let item in this.agreementitemsList) {
           this.$set(this.agreementitemsList[item], 'fFeeunitid', this.agreementitemsList[item].fFeeunitid + '')
@@ -729,7 +743,6 @@ export default {
       this.approvalProhibit = false
       const fId = row.fId || this.ids
       getAgreement(fId).then(response => {
-        this.fMblnoOptions = response.data.corps
         this.deptName = response.data.dept.deptName
         this.form = response.data.tWarehouseAgreement
         this.$set(this.form, 'fEnddate', Date.parse(this.form.fEnddate))
@@ -827,14 +840,13 @@ export default {
         this.loading = false
       })
     },
-
     // 结算方式,也可以从表t_stltypes中下拉选择，存储id，显示name字典翻译
     fStltypeidFormat(row, column) {
       return this.selectDictLabel(this.fStltypeidOptions, row.fStltypeid)
     },
     // 货物类别,存储t_packages，f_id 显示名称，可以多选t_packages 中的no或 name，模糊查找选择后，存储f_id，显示name字典翻译
     tPackagesFormat(row, column) {
-      return this.selectDictLabel(this.tPackagesOptions, row.tPackages)
+      return this.selectDictLabel(this.fTypeidOptions, row.tPackages)
     },
     // 贸易方式,对应t_trademodels 字典翻译
     fTrademodeidFormat(row, column) {
@@ -973,7 +985,6 @@ export default {
           this.$set(this.form, 'fEnddate', Date.parse(this.form.fEnddate))
           this.$set(this.form, 'fBegindate', Date.parse(this.form.fBegindate))
           this.operator = this.form.createBy
-          this.fMblnoOptions = response.data.corps
           this.agreementitemsList = response.data.tWarehouseAgreementitems
           for (let item in this.agreementitemsList) {
             this.$set(this.agreementitemsList[item], 'fFeeunitid', this.agreementitemsList[item].fFeeunitid + '')
@@ -997,7 +1008,6 @@ export default {
           this.$set(this.form, 'fEnddate', Date.parse(this.form.fEnddate))
           this.$set(this.form, 'fBegindate', Date.parse(this.form.fBegindate))
           this.operator = this.form.createBy
-          this.fMblnoOptions = response.data.corps
           this.agreementitemsList = response.data.tWarehouseAgreementitems
           for (let item in this.agreementitemsList) {
             this.$set(this.agreementitemsList[item], 'fFeeunitid', this.agreementitemsList[item].fFeeunitid + '')
@@ -1013,8 +1023,9 @@ export default {
       if (name == null || name === "") {
         return false;
       }
-      let queryParams = { pageNum: 1, pageSize: 10, fName: name, type: 1 };
+      let queryParams = { pageNum: 1, fName: name, type: 1 };
       listCorps(queryParams).then((response) => {
+        console.log(response)
         this.fMblnoOptions = response.rows;
         this.KHblnoOptions = response.rows;
       });

src/views/basicdata/corps/index.vue

@@ -184,7 +184,7 @@
         <el-row>
           <el-col :span="8">
             <el-form-item label="客户类别" prop="fTypeid">
-              <el-select style="width: 250px" v-model="form.fTypeid" placeholder="请选择客户类别">
+              <el-select style="width: 250px" v-model="form.fTypeid" multiple placeholder="请选择客户类别">
                 <el-option
                   v-for="dict in fTypeidOptions"
                   :key="dict.dictValue"
@@ -575,7 +575,6 @@
       // 客户类别默认为客户结算方式默认月结
       query() {
         this.$set(this.form, "fStltypeid", 1);
-        this.$set(this.form, "fTypeid", "1");
       },
       // 添加行
       addRow(tableData,event){
@@ -701,7 +700,9 @@
         this.reset();
         const fId = row.fId || this.ids
         getCorps(fId).then(response => {
+          console.log(this.form)
           this.form = response.data["corp"];
+          console.log(this.form)
           var contactList1=response.data["customerContact"];
           if(contactList1!=null){
             this.contactList=contactList1;

src/views/basicdata/goods/index.vue

@@ -149,6 +149,7 @@
       <el-table-column label="编号" align="center" prop="fNo" :show-overflow-tooltip="true" />
       <el-table-column label="名称" align="center" prop="fName" :show-overflow-tooltip="true" />
       <el-table-column label="英文名称" align="center" prop="fEnam" :show-overflow-tooltip="true" />
+      <el-table-column label="商品类别" align="center" prop="fTypeid" :show-overflow-tooltip="true" :formatter="fTypeidFormat"/>
       <el-table-column label="规格" align="center" prop="fSpecs" :show-overflow-tooltip="true" />
       <el-table-column label="包装规格" align="center" prop="fPackagespecs" :show-overflow-tooltip="true"  />
       <el-table-column label="颜色" align="center" prop="fColor" :show-overflow-tooltip="true" />
@@ -390,6 +391,10 @@
       fIdFormat(row, column) {
         return this.selectDictLabel(this.fIdOptions, row.fId);
       },
+      // 货物类别，字典翻译
+      fTypeidFormat(row, column) {
+        return this.selectDictLabel(this.fTypeidOptions, row.fTypeid)
+      },
       // 删除状态字典翻译
       delFlagFormat(row, column) {
         return this.selectDictLabel(this.delFlagOptions, row.delFlag);

src/views/reportManagement/Statistics/index.vue

@@ -141,6 +141,7 @@
         </template>
       </el-table-column>
       <el-table-column label="提单号" sortable align="center" prop="fMblno" show-overflow-tooltip width="216"/>
+      <el-table-column label="出入库类型" align="center" prop="fBilltype" width="120"/>
       <el-table-column label="货物属性" align="center" prop="fBusinessTypes" width="120"/>
       <el-table-column label="属性详情" align="center" prop="fMarks" width="120"/>
       <el-table-column label="品名" align="center" prop="fGoodsName" width="120"/>
@@ -346,7 +347,7 @@ export default {
         fMarks: null,
         fBusinessType:null,
         fBusinessTypes:null,
-        fBilltype:null,
+        fBilltype:'SJRK',
         fwarehouseid:null
       },
       // 表单参数
@@ -464,7 +465,6 @@ export default {
       this.loading = true;
       console.log(this.queryParams)
       listWhgenleg(this.queryParams).then(response => {
-        console.log(response)
         this.whgenlegList = response.rows;
         this.total = response.total;
         this.loading = false;

src/views/warehouseBusiness/inStock/index.vue

@@ -8,10 +8,10 @@
       label-width="88px"
     >
       <el-row>
-          <el-form-item label="业务编号" prop="fBillno">
+        <el-form-item label="业务编号" prop="fBillno">
             <el-input
               v-model="queryParams.fBillno"
-              placeholder="请输入业务编号"
+              placeholder="所有状态"
               style="width: 200px"
               clearable
               size="small"
@@ -26,7 +26,7 @@
             clearable
             style="width: 200px"
             :remote-method="userRemoteMethod"
-            placeholder="请选择制单人"
+            placeholder="所有状态"
           >
             <el-option
               v-for="(dict, index) in userOptions"
@@ -39,7 +39,7 @@
         <el-form-item label="贸易方式" prop="fTrademodeid">
           <el-select
             v-model="queryParams.fTrademodeid"
-            placeholder="请选择贸易方式"
+            placeholder="所有状态"
             clearable
             style="width: 200px"
             @keyup.enter.native="handleQuery"
@@ -61,7 +61,7 @@
             style="width: 200px"
             @keyup.enter.native="handleQuery"
             :remote-method="corpsRemoteMethod"
-            placeholder="请输入模糊查找"
+            placeholder="所有状态"
           >
             <el-option
               v-for="(dict, index) in fMblnoOptions"
@@ -74,7 +74,7 @@
         <el-form-item label="提单号" prop="fMblno">
           <el-input
             v-model="queryParams.fMblno"
-            placeholder="请输入提单号"
+            placeholder="所有状态"
             clearable
             style="width: 200px"
             size="small"
@@ -90,7 +90,7 @@
             :remote-method="fSbuRemoteMethod"
             @keyup.enter.native="handleQuery"
             style="width: 200px"
-            placeholder="请选择经营单位"
+            placeholder="所有状态"
           >
             <el-option
               v-for="(dict, index) in fMblnoOptions"
@@ -109,7 +109,7 @@
             style="width: 200px"
             :remote-method="goodsRemoteMethod"
             @keyup.enter.native="handleQuery"
-            placeholder="请选择货物名称"
+            placeholder="所有状态"
           >
             <el-option
               v-for="(dict, index) in goodsOptions"
@@ -128,7 +128,7 @@
             :disabled="browseStatus || formBrowseStatus"
             style="width: 200px"
             @keyup.enter.native="handleQuery"
-            placeholder="请选择"
+            placeholder="所有状态"
           >
             <el-option
               v-for="(dict, index) in warehouseOptions"
@@ -141,7 +141,7 @@
         <el-form-item label="品牌" prop="fMarks">
           <el-input
             v-model="queryParams.fMarks"
-            placeholder="请输入品牌"
+            placeholder="所有状态"
             clearable
             style="width: 200px"
             size="small"
@@ -152,7 +152,7 @@
           <el-select
             style="width:200px"
             v-model="queryParams.fBillstatus"
-            placeholder="请输入费用状态"
+            placeholder="所有状态"
           >
             <el-option label="录入" value="1"></el-option>
             <el-option label="暂存" value="2"></el-option>
@@ -166,7 +166,7 @@
           <el-select
             style="width:200px"
             v-model="queryParams.fItemsStatus"
-            placeholder="请输入入库状态"
+            placeholder="所有状态"
           >
             <el-option label="计划" value="1"></el-option>
             <el-option label="待入库" value="2"></el-option>
@@ -3288,7 +3288,7 @@ export default {
         fIfdamage: null,
         fBankcorpid: null,
         fBilltype: null,
-        fBillstatus: null,
+        fBillstatus: '',
         fBusinessType: null,
         fCreateby: null,
         fCreatetime: null,
@@ -3399,12 +3399,6 @@ export default {
     this.getDicts("data_stltype_type").then(response => {
       this.fStltypeidOptions = response.data;
     });
-    // this.getDicts("data_customer_category").then(response => {
-    //   this.fCompanyOptIons = response.data;
-    // });
-    // this.getDicts("data_customer_category").then(response => {
-    //   this.fleetOptions = response.data;
-    // });
     treeselect().then(response => {
       this.warehouseOptions = response.data
     })
@@ -4406,7 +4400,7 @@ export default {
         fGoodsid:null,
         fWarehouseid:null,
         fMarks:null,
-        fBillstatus:null,
+        fBillstatus:'',
         fItemsStatus:null
       }
       this.resetForm("queryForm");

src/views/warehouseBusiness/outStock/index.vue

@@ -4152,6 +4152,7 @@ export default {
       this.whgenlegParams.fWarehouseid = this.form.fWarehouseid;
       this.whgenlegParams.fTrademodeid = this.form.fTrademodeid;
       listWhgenleg(this.whgenlegParams).then((response) => {
+        console.log(response)
         this.whgenlegList = response.rows;
         this.whgenlegTotal = response.total;
       });
@@ -4649,11 +4650,14 @@ export default {
         if (valid) {
           let listSelection = JSON.parse(JSON.stringify(this.dataListSelection))
           let formData = new window.FormData();
+          console.log(this.dataListSelection)
+          console.log(this.form)
           formData.append("warehouseBills", JSON.stringify(this.form));
           formData.append("tEnclosure", JSON.stringify(this.relevantAttachments));
           formData.append("warehousebillsitems", JSON.stringify(this.dataListSelection));
           formData.append("warehousebillsfeesCr", JSON.stringify(this.warehouseCrList));
           formData.append("warehousebillsfeesDr", JSON.stringify(this.warehouseDrList));
+
           addWhgenleg(formData).then((response) => {
             this.fid = response.data.fPid;
             // 暂时注释掉，后续可能会加回来 仓储费得出的明细
@@ -4805,6 +4809,7 @@ export default {
           this.$refs.tableList.clearSelection();
           if (dataList.length !== 0) {
             let formData = new window.FormData();
+            console.log(this.form)
             formData.append("warehouseBills", JSON.stringify(this.form));
             formData.append("tEnclosure", JSON.stringify(this.relevantAttachments));
             formData.append("warehousebillsitems", JSON.stringify(this.dataList));
@@ -4909,6 +4914,7 @@ export default {
         if (valid) {
           let withdrawList = JSON.parse(JSON.stringify(this.dataListSelection))
           let formData = new window.FormData()
+          console.log(this.form)
           formData.append("warehouseBills", JSON.stringify(this.form));
           formData.append("tEnclosure", JSON.stringify(this.relevantAttachments));
           formData.append("warehousebillsitems", JSON.stringify(this.dataListSelection));
@@ -5048,6 +5054,7 @@ export default {
               }
             })
           }, 200);
+          console.log(this.form)
         }
       })
     },