作业费业务类型多选

src/views/agreement/agreementTask/index.vue

@@ -340,6 +340,24 @@
             <el-option label="付" value="C"></el-option>
           </el-select>
         </el-form-item>
+        <el-form-item label="业务类型" prop="">
+          <el-select
+            v-model="form.fBilltype"
+            placeholder="请选择业务类型"
+            clearable
+            style="width:200px"
+            size="small"
+            multiple
+            @keyup.enter.native="handleQuery"
+          >
+            <el-option
+              v-for="(dict,index) in options"
+              :key="index.key"
+              :label="dict.name"
+              :value="dict.key"/>
+
+          </el-select>
+        </el-form-item>
       </el-form>
       <el-button @click="confirmCharge" :disabled="stop" v-if="form.fBillstatus < 4" type="primary">请 核</el-button>
       <el-button @click="revokeCharge" v-if="form.fBillstatus === '6'" type="danger">撤销请核</el-button>
@@ -542,6 +560,16 @@ export default {
   },
   data() {
     return {
+      options:[{
+        name:'出库',
+        key:'SJCK'
+      },{
+        name:'入库',
+        key:'SJRK'
+      },{
+        name:'调拨',
+        key:'CKDB'
+      }],
       //全屏放大
       dialogFull:false,
       addOrEdid:1,
@@ -623,7 +651,8 @@ export default {
       // 表单参数
       form: {
         fTaskType: '1',
-        fDc : "D"
+        fDc : "D",
+        fBilltype:''
       },
       // 表单校验
       rules: {
@@ -1073,6 +1102,7 @@ export default {
     /** 修改按钮操作 */
     handleUpdate(row,num) {
       if(num === 2){
+        console.log("111")
         getAgreement(this.idCopy).then(response => {
           this.register()
           this.deptName = response.data.dept.deptName
@@ -1087,6 +1117,7 @@ export default {
           for (let item in this.agreementitemsList) {
             this.$set(this.agreementitemsList[item], 'fFeeunitid', this.agreementitemsList[item].fFeeunitid + '')
           }
+          this.form.fBilltype = response.data.tWarehouseAgreement.fBilltype.replace(/\[|]/g, '').replace(/\"/g, "").split(",")
           this.fWbuOptions = response.data.feesList
           this.open = true
           this.title = '修改作业费'
@@ -1110,6 +1141,7 @@ export default {
           for (let item in this.agreementitemsList) {
             this.$set(this.agreementitemsList[item], 'fFeeunitid', this.agreementitemsList[item].fFeeunitid + '')
           }
+          this.form.fBilltype = response.data.tWarehouseAgreement.fBilltype.replace(/\[|]/g, '').replace(/\"/g, "").split(",")
           this.fWbuOptions = response.data.feesList
           this.open = true
           this.title = '修改作业费'
@@ -1143,6 +1175,7 @@ export default {
             this.$set(this.form, 'fTaskType', this.form.fTaskType + '')
             this.$set(this.form, 'fEnddate', Date.parse(this.form.fEnddate))
             this.$set(this.form, 'fBegindate', Date.parse(this.form.fBegindate))
+            this.form.fBilltype = response.data.tWarehouseAgreement.fBilltype.replace(/\[|]/g, '').replace(/\"/g, "").split(",")
           })
         }
       })

src/views/basicdata/fleet/companyMsg-add-or-update.vue

@@ -205,46 +205,46 @@ export default {
       doNot:true,
       dialogFull:false,
       dataForm_s:{
-        annualDate: '',
-        bankAccount: '',
-        billStatus: '',
-        businessArea: '',
-        businessDeadline: '',
-        carNum: '',
-        companyAddress:'',
-        companyName: '',
-        companyType: '',
-        creatTime: '',
-        createBy: '',
-        createTime: '',
-        creditLv: '',
-        creditNum: '',
-        dateOfEstablishment: '',
-        delFlag: '',
-        email: '',
-        fax: '',
-        headOffice: '',
-        id: '',
-        industryCommerceNum: '',
-        insdustry: '',
-        legalPerson: '',
-        linkMan: '',
-        linkPhone:'',
-        loginAccount: '',
-        manageScope: '',
-        modificationTime: '',
-        openingBank: '',
-        organizationNum: '',
-        params: '',
-        paymentDays: '',
-        registerOrganization: '',
-        registerdAddress: '',
-        registerdCapital: '',
-        remark: '',
-        searchValue: '',
-        taxpayerNum: '',
-        updateBy: '',
-        updateTime: '',
+        annualDate:null,
+        bankAccount: null,
+        billStatus: null,
+        businessArea: null,
+        businessDeadline: null,
+        carNum: null,
+        companyAddress:null,
+        companyName: null,
+        companyType: null,
+        creatTime: null,
+        createBy: null,
+        createTime: null,
+        creditLv: null,
+        creditNum: null,
+        dateOfEstablishment: null,
+        delFlag: null,
+        email: null,
+        fax: null,
+        headOffice: null,
+        id: null,
+        industryCommerceNum: null,
+        insdustry: null,
+        legalPerson: null,
+        linkMan: null,
+        linkPhone:null,
+        loginAccount: null,
+        manageScope: null,
+        modificationTime: null,
+        openingBank: null,
+        organizationNum: null,
+        params: null,
+        paymentDays: null,
+        registerOrganization: null,
+        registerdAddress: null,
+        registerdCapital: null,
+        remark: null,
+        searchValue: null,
+        taxpayerNum: null,
+        updateBy: null,
+        updateTime: null,
       },
       visible: false,
       edit: true,
@@ -315,46 +315,46 @@ export default {
           })
         }else{
           this.dataForm_s = {
-            annualDate: '',
-              bankAccount: '',
-              billStatus: '',
-              businessArea: '',
-              businessDeadline: '',
-              carNum: '',
-              companyAddress:'',
-              companyName: '',
-              companyType: '',
-              creatTime: '',
-              createBy: '',
-              createTime: '',
-              creditLv: '',
-              creditNum: '',
-              dateOfEstablishment: '',
-              delFlag: '',
-              email: '',
-              fax: '',
-              headOffice: '',
-              id: '',
-              industryCommerceNum: '',
-              insdustry: '',
-              legalPerson: '',
-              linkMan: '',
-              linkPhone:'',
-              loginAccount: '',
-              manageScope: '',
-              modificationTime: '',
-              openingBank: '',
-              organizationNum: '',
-              params: '',
-              paymentDays: '',
-              registerOrganization: '',
-              registerdAddress: '',
-              registerdCapital: '',
-              remark: '',
-              searchValue: '',
-              taxpayerNum: '',
-              updateBy: '',
-              updateTime: '',
+            annualDate:null,
+            bankAccount: null,
+            billStatus: null,
+            businessArea: null,
+            businessDeadline: null,
+            carNum: null,
+            companyAddress:null,
+            companyName: null,
+            companyType: null,
+            creatTime: null,
+            createBy: null,
+            createTime: null,
+            creditLv: null,
+            creditNum: null,
+            dateOfEstablishment: null,
+            delFlag: null,
+            email: null,
+            fax: null,
+            headOffice: null,
+            id: null,
+            industryCommerceNum: null,
+            insdustry: null,
+            legalPerson: null,
+            linkMan: null,
+            linkPhone:null,
+            loginAccount: null,
+            manageScope: null,
+            modificationTime: null,
+            openingBank: null,
+            organizationNum: null,
+            params: null,
+            paymentDays: null,
+            registerOrganization: null,
+            registerdAddress: null,
+            registerdCapital: null,
+            remark: null,
+            searchValue: null,
+            taxpayerNum: null,
+            updateBy: null,
+            updateTime: null,
           }
           this.hide = false
           this.doNot = false
@@ -371,6 +371,7 @@ export default {
           console.log(valid)
           preservation(this.dataForm_s).then(data=>{
             this.$message.success('操作成功');
+            
           })
         }
       })

src/views/reportManagement/Statistics/index.vue

@@ -2,7 +2,7 @@
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label="仓库" prop="fwarehouseid">
-        <treeselect style="width:160px"
+        <treeselect style="width:200px"
                     v-model="queryParams.fWarehouseid"
                     :options="fWarehouseidOption"
                     @select="treeseLect"
@@ -17,6 +17,7 @@
           remote
           clearable
           size="small"
+          style="width:200px"
           :remote-method="goodsRemoteMethod"
           @keyup.enter.native="handleQuery"
           placeholder="请选择货物名称"
@@ -29,25 +30,12 @@
           ></el-option>
         </el-select>
       </el-form-item>
-      <el-form-item label="业务日期" prop="timeInterval">
-        <el-date-picker
-          v-model="queryParams.timeInterval"
-          type="daterange"
-          value-format="yyyy-MM-dd"
-          clearable
-          style="width: 60%"
-          range-separator="至"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期"
-          @keyup.enter.native="handleQuery"
-        >
-        </el-date-picker>
-      </el-form-item>
       <el-form-item label="贸易方式" prop="fTrademodeid">
         <el-select
           v-model="queryParams.fTrademodeid"
           placeholder="请选择贸易方式"
           clearable
+          style="width:200px"
           size="small"
           @keyup.enter.native="handleQuery"
         >
@@ -66,6 +54,7 @@
           remote
           clearable
           size="small"
+          style="width:200px"
           @keyup.enter.native="handleQuery"
           :remote-method="corpsRemoteMethod"
           placeholder="请选择货权方"
@@ -83,6 +72,7 @@
           v-model="queryParams.fMblno"
           placeholder="请输入提单号"
           clearable
+          style="width:200px"
           size="small"
           @keyup.enter.native="handleQuery"
         />
@@ -101,6 +91,7 @@
           v-model="queryParams.fBilltype"
           placeholder="请选择出库/入库"
           clearable
+          style="width:200px"
           size="small"
           @keyup.enter.native="handleQuery"
         >
@@ -112,6 +103,20 @@
 
         </el-select>
       </el-form-item>
+      <el-form-item label="业务日期" prop="timeInterval">
+        <el-date-picker
+          v-model="queryParams.timeInterval"
+          type="daterange"
+          value-format="yyyy-MM-dd"
+          clearable
+          style="width:280px"
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          @keyup.enter.native="handleQuery"
+        >
+        </el-date-picker>
+      </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>

src/views/warehouseBusiness/inStock/index.vue

@@ -334,63 +334,72 @@
     <el-table
       v-loading="loading"
       :data="warehousebillsList"
+      @filter-change="filterChange"
       @selection-change="handleSelectionChange"
       show-summary :summary-method="getSum"
     >
       <el-table-column type="selection" width="60" fixed align="center" />
       <el-table-column type="index" label="行号" align="center" fixed/>
+      <el-table-column
+        v-for="(item, index) in getRowList"
+        :key="index"
+        :label="item.name"
+        :width="item.width"
+        :prop="item.label"
+        align="center"
+        sortable
+      />
+
+<!--      <el-table-column  label="制单人" align="center" prop="createBy" fixed/>-->
 <!--      <el-table-column-->
-<!--        v-for="(item, index) in getRowList"-->
-<!--        :key="index"-->
-<!--        :label="item.name"-->
-<!--        :width="item.width"-->
-<!--        :fixed="item.fixed"-->
-<!--        :prop="item.label"-->
-<!--        sortable-->
+<!--        label="仓管员"-->
+<!--        width="100"-->
 <!--        align="center"-->
-<!--        :show-overflow-tooltip="true"-->
-<!--      />-->
-
-      <el-table-column  label="制单人" align="center" prop="createBy" fixed/>
-      <el-table-column  label="仓管员" width="100" align="center" sortable prop="fStorekeeper" fixed/>
-      <el-table-column width="100" label="入库状态" fixed sortable align="center" prop="fItemsStatus">
-        <template slot-scope="scope">
-          <span v-if="scope.row.fItemsStatus === 1">计划</span>
-          <span v-if="scope.row.fItemsStatus === 2">待入库</span>
-          <span v-if="scope.row.fItemsStatus === 3">入库中</span>
-          <span v-if="scope.row.fItemsStatus === 4">已入库</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="货权方" fixed sortable width="220" align="center" prop="fCorpid"/>
-      <el-table-column label="提单号" sortable fixed width="216" align="center" prop="fMblno" show-overflow-tooltip />
-      <el-table-column label="计划品名" sortable fixed align="center" prop="fGoodsid" width="100" />
-      <el-table-column label="品名" fixed :show-overflow-tooltip="true" align="center" prop="fProductName" />
-      <el-table-column label="品牌" fixed align="center" prop="fMarks" />
-      <el-table-column label="入库日期" fixed sortable align="center" prop="fBsdate" width="100">
-        <template slot-scope="scope">
-        <span>{{ parseTime(scope.row.fBsdate, "{y}-{m}-{d}") }}</span>
-      </template>
-      </el-table-column>
-      <el-table-column label="仓库" fixed sortable align="center" prop="fWarehouseid" />
-      <el-table-column label="计划件数" align="center" prop="fPlanqty" />
-      <el-table-column label="入库件数" align="center" prop="fQty" />
-      <el-table-column label="入库毛重(kg)" align="center" width="100" prop="fGrossweight" />
-      <el-table-column label="入库净重(kg)" align="center" width="100" prop="fNetweight" />
-      <el-table-column label="车号" align="center" prop="fTruckno" width="100"/>
-      <el-table-column label="司机名称" align="center" prop="fDriverName" />
-      <el-table-column label="司机电话" align="center" prop="fDriverTel" width="120"/>
-      <el-table-column label="司机身份证" align="center" prop="fDriverIdCar" width="180"/>
-      <el-table-column label="业务类别" align="center" prop="fBusinessType" :formatter="fBusinessTypeFormat"/>
-      <el-table-column width="100" label="费用状态" align="center" prop="fBillstatus">
-        <template slot-scope="scope">
-          <span v-if="scope.row.fBillstatus === 1">录入</span>
-          <span v-if="scope.row.fBillstatus === 2">暂存</span>
-          <span v-if="scope.row.fBillstatus === 3">驳回</span>
-          <span v-if="scope.row.fBillstatus === 4">请核</span>
-          <span v-if="scope.row.fBillstatus === 5">审核中</span>
-          <span v-if="scope.row.fBillstatus === 6">全部入账</span>
-        </template>
-      </el-table-column>
+<!--        :filter-multiple="false"-->
+<!--        :filters="[{text:this.fStorekeeper,value: this.fStorekeeper}]"-->
+<!--        filter-placement="bottom-end"-->
+<!--        :filter-method="filterHandler"-->
+<!--        :column-key="'fStorekeeper'"-->
+<!--        prop="fStorekeeper"-->
+<!--        fixed/>-->
+<!--      <el-table-column width="100" label="入库状态" fixed sortable align="center" prop="fItemsStatus">-->
+<!--        <template slot-scope="scope">-->
+<!--          <span v-if="scope.row.fItemsStatus === 1">计划</span>-->
+<!--          <span v-if="scope.row.fItemsStatus === 2">待入库</span>-->
+<!--          <span v-if="scope.row.fItemsStatus === 3">入库中</span>-->
+<!--          <span v-if="scope.row.fItemsStatus === 4">已入库</span>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
+<!--      <el-table-column label="货权方" fixed sortable width="220" align="center" prop="fCorpid"/>-->
+<!--      <el-table-column label="提单号" sortable fixed width="216" align="center" prop="fMblno" show-overflow-tooltip />-->
+<!--      <el-table-column label="计划品名" sortable fixed align="center" prop="fGoodsid" width="100" />-->
+<!--      <el-table-column label="品名" fixed :show-overflow-tooltip="true" align="center" prop="fProductName" />-->
+<!--      <el-table-column label="品牌" fixed align="center" prop="fMarks" />-->
+<!--      <el-table-column label="入库日期" fixed sortable align="center" prop="fBsdate" width="100">-->
+<!--        <template slot-scope="scope">-->
+<!--        <span>{{ parseTime(scope.row.fBsdate, "{y}-{m}-{d}") }}</span>-->
+<!--      </template>-->
+<!--      </el-table-column>-->
+<!--      <el-table-column label="仓库" fixed sortable align="center" prop="fWarehouseid" />-->
+<!--      <el-table-column label="计划件数" align="center" prop="fPlanqty" />-->
+<!--      <el-table-column label="入库件数" align="center" prop="fQty" />-->
+<!--      <el-table-column label="入库毛重(kg)" align="center" width="100" prop="fGrossweight" />-->
+<!--      <el-table-column label="入库净重(kg)" align="center" width="100" prop="fNetweight" />-->
+<!--      <el-table-column label="车号" align="center" prop="fTruckno" width="100"/>-->
+<!--      <el-table-column label="司机名称" align="center" prop="fDriverName" />-->
+<!--      <el-table-column label="司机电话" align="center" prop="fDriverTel" width="120"/>-->
+<!--      <el-table-column label="司机身份证" align="center" prop="fDriverIdCar" width="180"/>-->
+<!--      <el-table-column label="业务类别" align="center" prop="fBusinessType" :formatter="fBusinessTypeFormat"/>-->
+<!--      <el-table-column width="100" label="费用状态" align="center" prop="fBillstatus">-->
+<!--        <template slot-scope="scope">-->
+<!--          <span v-if="scope.row.fBillstatus === 1">录入</span>-->
+<!--          <span v-if="scope.row.fBillstatus === 2">暂存</span>-->
+<!--          <span v-if="scope.row.fBillstatus === 3">驳回</span>-->
+<!--          <span v-if="scope.row.fBillstatus === 4">请核</span>-->
+<!--          <span v-if="scope.row.fBillstatus === 5">审核中</span>-->
+<!--          <span v-if="scope.row.fBillstatus === 6">全部入账</span>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width" min-width="180">
         <template slot-scope="scope">
           <el-button
@@ -3645,7 +3654,8 @@ export default {
         fTocorpid: [{ required: true, message: " ", trigger: "blur", },],
         fGoodsid: [{ required: true, message: " ", trigger: "blur", },],
       },
-      defaultTitle:[]
+      defaultTitle:[],
+      fStorekeeper:''
     };
   },
   created() {
@@ -3706,6 +3716,23 @@ export default {
     this.adoPt()
   },
   methods: {
+    filterChange(filters){
+      console.log(filters.fStorekeeper);
+      console.log(filters);
+      //调用接口获取数据
+      listWarehousebills().then(response => {
+        console.log(response)
+        for(let item in response.rows){
+          console.log(response.rows[item].fStorekeeper)
+          this.fStorekeeper = response.rows[item].fStorekeeper
+        }
+      })
+
+    },
+    filterHandler(value, row, column) {
+      const property = column['property'];
+      return row[property] === value;
+    },
     full(){
       this.dialogFull = !this.dialogFull
     },
@@ -4467,8 +4494,8 @@ export default {
           pageNum:1,
           pageSize:10,
           fTaskType:Number(fTaskType),
-          fFleet:this.form.fFleet
-
+          fFleet:this.form.fFleet,
+          fBilltype:'SJRK'
         }
       }else {
         this.Navigation = false
@@ -4476,7 +4503,7 @@ export default {
         data = {
           pageNum:1,
           pageSize:10,
-          fCorpid:this.form.fCorpid
+          fCorpid:this.form.fCorpid,
         }
       }
       operationAgreement(data).then( response => {

src/views/warehouseBusiness/outStock/index.vue

@@ -3989,7 +3989,8 @@ export default {
           pageNum:1,
           pageSize:10,
           fTaskType:Number(fTaskType),
-          fFleet:this.form.fFleet
+          fFleet:this.form.fFleet,
+
         }
         this.key_s = kye
       }else {