自定义列修改

src/views/agreement/agreementTask/index.vue

@@ -148,19 +148,21 @@
       <el-table-column type="selection" width="55" align="center"/>
       <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">
+      <el-table-column label="作业费类型" sortable align="center" prop="fTaskType" fixed width="120">
         <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">
+      <el-table-column label="商品类别" sortable align="center" prop="tPackages" fixed width="100" :formatter="tPackagesFormat"/>
+      <el-table-column label="费用类型" sortable align="center" prop="fDc" fixed width="100">
         <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="fBilltypeName" fixed width="120" show-overflow-tooltip/>
+
       <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">
@@ -340,11 +342,12 @@
             <el-option label="付" value="C"></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="业务类型" prop="">
+        <el-form-item label="业务类型" prop="fBilltype">
           <el-select
             v-model="form.fBilltype"
             placeholder="请选择业务类型"
             clearable
+            :disabled="browseStatus"
             style="width:200px"
             size="small"
             multiple
@@ -652,7 +655,7 @@ export default {
       form: {
         fTaskType: '1',
         fDc : "D",
-        fBilltype:''
+        fBilltype:'',
       },
       // 表单校验
       rules: {
@@ -1161,12 +1164,22 @@ export default {
     },
     /** 提交按钮 */
     submitForm() {
+      this.form.fBilltypeName = ''
       if(this.addOrEdid == 2){
         this.$set(this.form, 'fId', null)
       }
       this.$refs['form'].validate(valid => {
         if (valid) {
           let formData = new window.FormData()
+          for(let index in this.options){
+            for(let item in this.form.fBilltype){
+              console.log(this.options[index].key,this.form.fBilltype[item])
+              if(this.options[index].key == this.form.fBilltype[item]){
+                this.form.fBilltypeName += this.options[index].name + ','
+              }
+            }
+          }
+          this.form.fBilltypeName = this.form.fBilltypeName.substring(0,this.form.fBilltypeName.length-1)
           formData.append('agreement', JSON.stringify(this.form))
           formData.append('agreementitems', JSON.stringify(this.agreementitemsList))
           addAgreement(formData).then(response => {

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

@@ -371,7 +371,7 @@ export default {
           console.log(valid)
           preservation(this.dataForm_s).then(data=>{
             this.$message.success('操作成功');
-            
+
           })
         }
       })

src/views/warehouseBusiness/goodsTransfer/index.vue

@@ -315,48 +315,48 @@
     >
       <el-table-column type="selection" width="60" align="center"/>
       <el-table-column type="index" label="行号" align="center"/>
-<!--            <el-table-column-->
-<!--              v-for="(item, index) in getRowList"-->
-<!--              :key="index"-->
-<!--              :label="item.name"-->
-<!--              :width="item.width"-->
-<!--              :prop="item.label"-->
-<!--              align="center"-->
-<!--              :fixed="item.fixed"-->
-<!--            />-->
-      <el-table-column  label="制单人" align="center" prop="createBy" fixed />
-      <el-table-column width="220" label="货权方" sortable align="center" prop="fCorpid" fixed/>
-      <el-table-column width="220" label="转货权方" sortable align="center" prop="fTocorpid" fixed/>
-      <el-table-column label="品名" :show-overflow-tooltip="true" align="ceter" prop="fProductName" fixed/>
-      <el-table-column :show-overflow-tooltip="true" label="品牌" align="center" prop="fMarks" fixed/>
-      <el-table-column width="160" label="业务编号" align="center" prop="fBillno" fixed/>
-      <el-table-column label="货转日期" sortable align="center" prop="fBsdate" width="180">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.fBsdate, '{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="贸易方式" align="center" prop="fTrademodeid" :formatter="fTrademodeidFormat"/>
-      <el-table-column label="仓库" sortable align="center" prop="fWarehouseid"/>
-      <el-table-column label="件数" align="center" prop="fQty"/>
-      <el-table-column label="毛重(kg)" align="center" prop="fGrossweight"/>
-      <el-table-column label="净重(kg)" align="center" prop="fNetweight"/>
-      <el-table-column width="100" label="货转状态" 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 === 6">已货转</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="费用状态" align="center" prop="fBillstatus" width="120">
-        <template slot-scope="scope">
-          <span v-if="scope.row.fBillstatus == '1'">保存</span>
-          <span v-else-if="scope.row.fBillstatus == '2'">暂存</span>
-          <span v-else-if="scope.row.fBillstatus == '3'">审批驳回</span>
-          <span v-else-if="scope.row.fBillstatus == '4'">提交审核</span>
-          <span v-else-if="scope.row.fBillstatus == '5'">审核中</span>
-          <span v-else-if="scope.row.fBillstatus == '6'">审核完成</span>
-        </template>
-      </el-table-column>
+            <el-table-column
+              v-for="(item, index) in getRowList"
+              :key="index"
+              :label="item.name"
+              :width="item.width"
+              :prop="item.label"
+              align="center"
+              :fixed="item.fixed"
+            />
+<!--      <el-table-column  label="制单人" align="center" prop="createBy" fixed />-->
+<!--      <el-table-column width="220" label="货权方" sortable align="center" prop="fCorpid" fixed/>-->
+<!--      <el-table-column width="220" label="转货权方" sortable align="center" prop="fTocorpid" fixed/>-->
+<!--      <el-table-column label="品名" :show-overflow-tooltip="true" align="ceter" prop="fProductName" fixed/>-->
+<!--      <el-table-column :show-overflow-tooltip="true" label="品牌" align="center" prop="fMarks" fixed/>-->
+<!--      <el-table-column width="160" label="业务编号" align="center" prop="fBillno" fixed/>-->
+<!--      <el-table-column label="货转日期" sortable align="center" prop="fBsdate" width="180">-->
+<!--        <template slot-scope="scope">-->
+<!--          <span>{{ parseTime(scope.row.fBsdate, '{y}-{m}-{d}') }}</span>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
+<!--      <el-table-column label="贸易方式" align="center" prop="fTrademodeid" :formatter="fTrademodeidFormat"/>-->
+<!--      <el-table-column label="仓库" sortable align="center" prop="fWarehouseid"/>-->
+<!--      <el-table-column label="件数" align="center" prop="fQty"/>-->
+<!--      <el-table-column label="毛重(kg)" align="center" prop="fGrossweight"/>-->
+<!--      <el-table-column label="净重(kg)" align="center" prop="fNetweight"/>-->
+<!--      <el-table-column width="100" label="货转状态" 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 === 6">已货转</span>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
+<!--      <el-table-column label="费用状态" align="center" prop="fBillstatus" width="120">-->
+<!--        <template slot-scope="scope">-->
+<!--          <span v-if="scope.row.fBillstatus == '1'">保存</span>-->
+<!--          <span v-else-if="scope.row.fBillstatus == '2'">暂存</span>-->
+<!--          <span v-else-if="scope.row.fBillstatus == '3'">审批驳回</span>-->
+<!--          <span v-else-if="scope.row.fBillstatus == '4'">提交审核</span>-->
+<!--          <span v-else-if="scope.row.fBillstatus == '5'">审核中</span>-->
+<!--          <span v-else-if="scope.row.fBillstatus == '6'">审核完成</span>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
       <el-table-column
         label="操作"
         align="center"
@@ -1913,98 +1913,98 @@
             label: "createBy",
             name: "制单人",
             checked: 0,
-            width: null,
+            width: 100,
           },
           {
             surface: "2",
             label: "fCorpid",
             name: "货权方",
             checked: 0,
-            width: null,
+            width: 100,
           },
           {
             surface: "3",
             label: "fTocorpid",
             name: "转货权方",
             checked: 0,
-            width: null,
+            width: 100,
           },
           {
             surface: "4",
             label: "fProductName",
             name: "品名",
             checked: 0,
-            width: null,
+            width: 100,
           },
           {
             surface: "5",
             label: "fMarks",
             name: "品牌",
             checked: 0,
-            width: null,
+            width: 100,
           },
           {
             surface: "6",
             label: "fBillno",
             name: "业务编号",
             checked: 0,
-            width: null,
+            width: 100,
           },
           {
             surface: "7",
             label: "fBsdate",
             name: "货转日期",
             checked: 0,
-            width: null,
+            width: 100,
           },
           {
             surface: "8",
             label: "fTrademodeid",
             name: "贸易方式",
             checked: 0,
-            width: null,
+            width: 100,
           },
           {
             surface: "9",
             label: "fWarehouseid",
             name: "仓库",
             checked: 0,
-            width: null,
+            width: 100,
           },
           {
             surface: "10",
             label: "fQty",
             name: "件数",
             checked: 0,
-            width: null,
+            width: 100,
           },
           {
             surface: "11",
             label: "fGrossweight",
             name: "毛重(kg)",
             checked: 0,
-            width: null,
+            width: 100,
           },
           {
             surface: "12",
             label: "fNetweight",
             name: "净重(kg)",
             checked: 0,
-            width: null,
+            width: 100,
           },
           {
             surface: "13",
             label: "fItemsStatus",
             name: "货转状态",
             checked: 0,
-            width: null,
+            width: 100,
           },
           {
             surface: "14",
             label: "fBillstatus",
             name: "费用状态",
             checked: 0,
-            width: null,
+            width: 100,
           },
         ],
         getRowList: [
@@ -2013,98 +2013,98 @@
             label: "createBy",
             name: "制单人",
             checked: 0,
-            width: null,
+            width: 100,
           },
           {
             surface: "2",
             label: "fCorpid",
             name: "货权方",
             checked: 0,
-            width: null,
+            width: 100,
           },
           {
             surface: "3",
             label: "fTocorpid",
             name: "转货权方",
             checked: 0,
-            width: null,
+            width: 100,
           },
           {
             surface: "4",
             label: "fProductName",
             name: "品名",
             checked: 0,
-            width: null,
+            width: 100,
           },
           {
             surface: "5",
             label: "fMarks",
             name: "品牌",
             checked: 0,
-            width: null,
+            width: 100,
           },
           {
             surface: "6",
             label: "fBillno",
             name: "业务编号",
             checked: 0,
-            width: null,
+            width: 100,
           },
           {
             surface: "7",
             label: "fBsdate",
             name: "货转日期",
             checked: 0,
-            width: null,
+            width: 100,
           },
           {
             surface: "8",
             label: "fTrademodeid",
             name: "贸易方式",
             checked: 0,
-            width: null,
+            width: 100,
           },
           {
             surface: "9",
             label: "fWarehouseid",
             name: "仓库",
             checked: 0,
-            width: null,
+            width: 100,
           },
           {
             surface: "10",
             label: "fQty",
             name: "件数",
             checked: 0,
-            width: null,
+            width: 100,
           },
           {
             surface: "11",
             label: "fGrossweight",
             name: "毛重(kg)",
             checked: 0,
-            width: null,
+            width: 100,
           },
           {
             surface: "12",
             label: "fNetweight",
             name: "净重(kg)",
             checked: 0,
-            width: null,
+            width: 100,
           },
           {
             surface: "13",
             label: "fItemsStatus",
             name: "货转状态",
             checked: 0,
-            width: null,
+            width: 100,
           },
           {
             surface: "14",
             label: "fBillstatus",
             name: "费用状态",
             checked: 0,
-            width: null,
+            width: 100,
           },
         ],
         allCheck: false,

src/views/warehouseBusiness/inStock/index.vue

@@ -334,32 +334,29 @@
     <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
+          v-for="(item, index) in getRowList"
+          :key="index"
+          :label="item.name"
+          :width="item.width"
+          :prop="item.label"
+          align="center"
+          :fixed="item.fixed"
+          :show-overflow-tooltip="true"
+          sortable
+        />
+
 
 <!--      <el-table-column  label="制单人" align="center" prop="createBy" fixed/>-->
 <!--      <el-table-column-->
 <!--        label="仓管员"-->
 <!--        width="100"-->
 <!--        align="center"-->
-<!--        :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">-->
@@ -3129,126 +3126,144 @@ export default {
           label: "createBy",
           name: "制单人",
           checked: 0,
-          width: null,
+          fixed:true,
+          width: 100,
         },
         {
           surface: "2",
           label: "fItemsStatus",
           name: "入库状态",
           checked: 0,
-          width: null,
+          fixed:true,
+          width: 100,
         },
         {
           surface: "3",
           label: "fCorpid",
           name: "货权方",
           checked: 0,
-          width: null,
+          fixed:true,
+          width: 100,
         },
         {
           surface: "4",
           label: "fMblno",
           name: "提单号",
           checked: 0,
-          width: null,
+          fixed:true,
+          width: 100,
         },
         {
           surface: "5",
           label: "fProductName",
           name: "品名",
           checked: 0,
-          width: null,
+          fixed:true,
+          width: 100,
         },
         {
           surface: "6",
           label: "fMarks",
           name: "品牌",
           checked: 0,
-          width: null,
+          fixed:true,
+          width: 100,
         },
         {
           surface: "7",
           label: "fBsdate",
           name: "入库日期",
           checked: 0,
-          width: null,
+          fixed:true,
+          width: 100,
         },
         {
           surface: "8",
           label: "fWarehouseid",
           name: "仓库",
           checked: 0,
-          width: null,
+          fixed:false,
+          width: 100,
         },
         {
           surface: "9",
           label: "fPlanqty",
           name: "计划件数",
           checked: 0,
-          width: null,
+          fixed:false,
+          width: 100,
         },
         {
           surface: "10",
           label: "fQty",
           name: "入库件数",
           checked: 0,
-          width: null,
+          fixed:false,
+          width: 100,
         },
         {
           surface: "11",
           label: "fGrossweight",
           name: "入库毛重",
           checked: 0,
-          width: null,
+          fixed:false,
+          width: 100,
         },
         {
           surface: "12",
           label: "fNetweight",
           name: "入库净重",
           checked: 0,
-          width: null,
+          fixed:false,
+          width: 100,
         },
         {
           surface: "13",
           label: "fTruckno",
           name: "车号",
           checked: 0,
-          width: null,
+          fixed:false,
+          width: 100,
         },
         {
           surface: "14",
           label: "fDriverName",
           name: "司机名称",
           checked: 0,
-          width: null,
+          fixed:false,
+          width: 100,
         },
         {
           surface: "15",
           label: "fDriverTel",
           name: "司机电话",
           checked: 0,
-          width: null,
+          fixed:false,
+          width: 100,
         },
         {
           surface: "16",
           label: "fDriverIdCar",
           name: "司机身份证",
           checked: 0,
-          width: null,
+          fixed:false,
+          width: 100,
         },
         {
           surface: "17",
           label: "fBusinessType",
           name: "业务类别",
           checked: 0,
-          width: null,
+          fixed:false,
+          width: 100,
         },
         {
           surface: "18",
           label: "fBillstatus",
           name: "费用状态",
           checked: 0,
-          width: null,
+          fixed:false,
+          width: 100,
         },
       ],
       getRowList: [
@@ -3257,127 +3272,144 @@ export default {
           label: "createBy",
           name: "制单人",
           checked: 0,
-          fixed:'fixed',
-          width: null,
+          fixed:true,
+          width: 100,
         },
         {
           surface: "2",
           label: "fItemsStatus",
           name: "入库状态",
           checked: 0,
-          width: null,
+          fixed:true,
+          width: 100,
         },
         {
           surface: "3",
           label: "fCorpid",
           name: "货权方",
           checked: 0,
-          width: null,
+          fixed:true,
+          width: 100,
         },
         {
           surface: "4",
           label: "fMblno",
           name: "提单号",
           checked: 0,
-          width: null,
+          fixed:true,
+          width: 100,
         },
         {
           surface: "5",
           label: "fProductName",
           name: "品名",
           checked: 0,
-          width: null,
+          fixed:true,
+          width: 100,
         },
         {
           surface: "6",
           label: "fMarks",
           name: "品牌",
           checked: 0,
-          width: null,
+          fixed:true,
+          width: 100,
         },
         {
           surface: "7",
           label: "fBsdate",
           name: "入库日期",
           checked: 0,
-          width: null,
+          fixed:true,
+          width: 100,
         },
         {
           surface: "8",
           label: "fWarehouseid",
           name: "仓库",
+          fixed:false,
           checked: 0,
-          width: null,
+          width: 100,
         },
         {
           surface: "9",
           label: "fPlanqty",
           name: "计划件数",
+          fixed:false,
           checked: 0,
-          width: null,
+          width: 100,
         },
         {
           surface: "10",
           label: "fQty",
           name: "入库件数",
+          fixed:false,
           checked: 0,
-          width: null,
+          width: 100,
         },
         {
           surface: "11",
           label: "fGrossweight",
           name: "入库毛重(KG)",
           checked: 0,
-          width: null,
+          fixed:false,
+          width: 100,
         },
         {
           surface: "12",
           label: "fNetweight",
           name: "入库净重(KG)",
           checked: 0,
-          width: null,
+          fixed:false,
+          width: 100,
         },
         {
           surface: "13",
           label: "fTruckno",
           name: "车号",
           checked: 0,
-          width: null,
+          fixed:false,
+          width: 100,
         },
         {
           surface: "14",
           label: "fDriverName",
           name: "司机名称",
           checked: 0,
-          width: null,
+          fixed:false,
+          width: 100,
         },
         {
           surface: "15",
           label: "fDriverTel",
           name: "司机电话",
           checked: 0,
-          width: null,
+          fixed:false,
+          width: 100,
         },
         {
           surface: "16",
           label: "fDriverIdCar",
           name: "司机身份证",
           checked: 0,
-          width: null,
+          fixed:false,
+          width: 100,
         },
         {
           surface: "17",
           label: "fBusinessType",
           name: "业务类别",
           checked: 0,
-          width: null,
+          fixed:false,
+          width: 100,
         },
         {
           surface: "18",
           label: "fBillstatus",
           name: "费用状态",
           checked: 0,
-          width: null,
+          fixed:false,
+          width: 100,
         },
       ],
       allCheck: false,
@@ -3716,23 +3748,6 @@ 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
     },
@@ -3771,11 +3786,13 @@ export default {
               name: item.name,
               checked: item.checked,
               width: item.width,
+              fixed: item.fixed
             });
             return res;
           }, []);
         }
       });
+      console.log(this.getRowList)
     },
     //保存列设置
     save() {

src/views/warehouseBusiness/outStock/index.vue

@@ -326,55 +326,54 @@
     >
       <el-table-column type="selection" width="60" fixed align="center" />
       <el-table-column type="index" label="行号" fixed align="center" />
-      <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-->
-<!--        v-for="(item, index) in getRowList"-->
-<!--        :key="index"-->
-<!--        :label="item.name"-->
-<!--        :width="item.width"-->
-<!--        :prop="item.label"-->
-<!--        align="center"-->
-<!--        :fixed="item.fixed"-->
-<!--      />-->
-
-      <el-table-column width="220" label="货权方" fixed sortable align="center" prop="fCorpid"/>
-      <el-table-column label="提单号" sortable width="216" align="center" prop="fMblno" fixed show-overflow-tooltip/>
-      <el-table-column label="品名" :show-overflow-tooltip="true" fixed align="ceter" prop="fProductName" />
-      <el-table-column label="品牌" align="center" fixed prop="fMarks" />
-      <el-table-column label="出库日期" align="center" fixed sortable prop="createTime" style="width: 60%" width="100" show-overflow-tooltip>
-        <template slot-scope="scope">
-        <span>{{ parseTime(scope.row.fBsdate, "{y}-{m}-{d}") }}</span>
-      </template>
-      </el-table-column>
-      <el-table-column label="仓库" sortable fixed 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" prop="fGrossweight" width="100"/>
-      <el-table-column label="出库净重(kg)" align="center" prop="fNetweight" width="100"/>
-      <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" show-overflow-tooltip/>
-      <el-table-column label="司机身份证" align="center" prop="fDriverIdCar" width="180" show-overflow-tooltip/>
-      <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
+        v-for="(item, index) in getRowList"
+        :key="index"
+        :label="item.name"
+        :width="item.width"
+        :prop="item.label"
+        align="center"
+        :fixed="item.fixed"
+      />
+<!--      <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 width="220" label="货权方" fixed sortable align="center" prop="fCorpid"/>-->
+<!--      <el-table-column label="提单号" sortable width="216" align="center" prop="fMblno" fixed show-overflow-tooltip/>-->
+<!--      <el-table-column label="品名" :show-overflow-tooltip="true" fixed align="ceter" prop="fProductName" />-->
+<!--      <el-table-column label="品牌" align="center" fixed prop="fMarks" />-->
+<!--      <el-table-column label="出库日期" align="center" fixed sortable prop="createTime" style="width: 60%" width="100" show-overflow-tooltip>-->
+<!--        <template slot-scope="scope">-->
+<!--        <span>{{ parseTime(scope.row.fBsdate, "{y}-{m}-{d}") }}</span>-->
+<!--      </template>-->
+<!--      </el-table-column>-->
+<!--      <el-table-column label="仓库" sortable fixed 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" prop="fGrossweight" width="100"/>-->
+<!--      <el-table-column label="出库净重(kg)" align="center" prop="fNetweight" width="100"/>-->
+<!--      <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" show-overflow-tooltip/>-->
+<!--      <el-table-column label="司机身份证" align="center" prop="fDriverIdCar" width="180" show-overflow-tooltip/>-->
+<!--      <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"
@@ -3005,127 +3004,134 @@ export default {
           label: "createBy",
           name: "制单人",
           checked: 0,
-          width: null,
+          width: 100,
         },
         {
           surface: "2",
+          label: "fStorekeeper",
+          name: "仓管员",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "3",
           label: "fItemsStatus",
           name: "出库状态",
           checked: 0,
-          width: null,
+          width: 100,
         },
         {
-          surface: "3",
+          surface: "4",
           label: "fCorpid",
           name: "货权方",
           checked: 0,
-          width: null,
+          width: 100,
         },
         {
-          surface: "4",
+          surface: "5",
           label: "fMblno",
           name: "提单号",
           checked: 0,
-          width: null,
+          width: 100,
         },
         {
-          surface: "5",
+          surface: "6",
           label: "fProductName",
           name: "品名",
           checked: 0,
-          width: null,
+          width: 100,
         },
         {
-          surface: "6",
+          surface: "7",
           label: "fMarks",
           name: "品牌",
           checked: 0,
-          width: null,
+          width: 100,
         },
         {
-          surface: "7",
+          surface: "8",
           label: "fBsdate",
           name: "出库日期",
           checked: 0,
-          width: null,
+          width: 100,
         },
         {
-          surface: "8",
+          surface: "9",
           label: "fWarehouseid",
           name: "仓库",
           checked: 0,
-          width: null,
+          width: 100,
         },
         {
-          surface: "9",
+          surface: "10",
           label: "fPlanqty",
           name: "计划件数",
           checked: 0,
-          width: null,
+          width: 100,
         },
         {
-          surface: "10",
+          surface: "11",
           label: "fQty",
           name: "出库件数",
           checked: 0,
-          width: null,
+          width: 100,
         },
         {
-          surface: "11",
+          surface: "12",
           label: "fGrossweight",
           name: "出库毛重",
           checked: 0,
-          width: null,
+          width: 100,
         },
         {
-          surface: "12",
+          surface: "13",
           label: "fNetweight",
           name: "出库净重",
           checked: 0,
-          width: null,
+          width: 100,
         },
         {
-          surface: "13",
+          surface: "14",
           label: "fTruckno",
           name: "车号",
           checked: 0,
-          width: null,
+          width: 100,
         },
         {
-          surface: "14",
+          surface: "15",
           label: "fDriverName",
           name: "司机名称",
           checked: 0,
-          width: null,
+          width: 100,
         },
         {
-          surface: "15",
+          surface: "16",
           label: "fDriverTel",
           name: "司机电话",
           checked: 0,
-          width: null,
+          width: 100,
         },
         {
-          surface: "16",
+          surface: "17",
           label: "fDriverIdCar",
           name: "司机身份证",
           checked: 0,
-          width: null,
+          width: 100,
+        },
+        {
+          surface: "18",
+          label: "fBusinessType",
+          name: "业务类别",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "19",
+          label: "fBillstatus",
+          name: "费用状态",
+          checked: 0,
+          width: 100,
         },
-        // {
-        //   surface: "17",
-        //   label: "fBusinessType",
-        //   name: "业务类别",
-        //   checked: 0,
-        //   width: null,
-        // },
-        // {
-        //   surface: "18",
-        //   label: "fBillstatus",
-        //   name: "费用状态",
-        //   checked: 0,
-        //   width: null,
-        // },
       ],
       getRowList: [
         {
@@ -3133,129 +3139,134 @@ export default {
           label: "createBy",
           name: "制单人",
           checked: 0,
-          fixed:'fixed',
-          width: null,
+          width: 100,
         },
         {
           surface: "2",
+          label: "fStorekeeper",
+          name: "仓管员",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "3",
           label: "fItemsStatus",
           name: "出库状态",
           checked: 0,
-          width: null,
+          width: 100,
         },
         {
-          surface: "3",
+          surface: "4",
           label: "fCorpid",
           name: "货权方",
           checked: 0,
-          fixed:'fixed',
-          width: null,
+          width: 100,
         },
         {
-          surface: "4",
+          surface: "5",
           label: "fMblno",
           name: "提单号",
           checked: 0,
-          width: null,
+          width: 100,
         },
         {
-          surface: "5",
+          surface: "6",
           label: "fProductName",
           name: "品名",
           checked: 0,
-          width: null,
+          width: 100,
         },
         {
-          surface: "6",
+          surface: "7",
           label: "fMarks",
           name: "品牌",
           checked: 0,
-          width: null,
+          width: 100,
         },
         {
-          surface: "7",
+          surface: "8",
           label: "fBsdate",
           name: "出库日期",
           checked: 0,
-          width: null,
+          width: 100,
         },
         {
-          surface: "8",
+          surface: "9",
           label: "fWarehouseid",
           name: "仓库",
           checked: 0,
-          width: null,
+          width: 100,
         },
         {
-          surface: "9",
+          surface: "10",
           label: "fPlanqty",
           name: "计划件数",
           checked: 0,
-          width: null,
+          width: 100,
         },
         {
-          surface: "10",
+          surface: "11",
           label: "fQty",
           name: "出库件数",
           checked: 0,
-          width: null,
+          width: 100,
         },
         {
-          surface: "11",
+          surface: "12",
           label: "fGrossweight",
           name: "出库毛重",
           checked: 0,
-          width: null,
+          width: 100,
         },
         {
-          surface: "12",
+          surface: "13",
           label: "fNetweight",
           name: "出库净重",
           checked: 0,
-          width: null,
+          width: 100,
         },
         {
-          surface: "13",
+          surface: "14",
           label: "fTruckno",
           name: "车号",
           checked: 0,
-          width: null,
+          width: 100,
         },
         {
-          surface: "14",
+          surface: "15",
           label: "fDriverName",
           name: "司机名称",
           checked: 0,
-          width: null,
+          width: 100,
         },
         {
-          surface: "15",
+          surface: "16",
           label: "fDriverTel",
           name: "司机电话",
           checked: 0,
-          width: null,
+          width: 100,
         },
         {
-          surface: "16",
+          surface: "17",
           label: "fDriverIdCar",
           name: "司机身份证",
           checked: 0,
-          width: null,
+          width: 100,
+        },
+        {
+          surface: "18",
+          label: "fBusinessType",
+          name: "业务类别",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "19",
+          label: "fBillstatus",
+          name: "费用状态",
+          checked: 0,
+          width: 100,
         },
-        // {
-        //   surface: "17",
-        //   label: "fBusinessType",
-        //   name: "业务类别",
-        //   checked: 0,
-        //   width: null,
-        // },
-        // {
-        //   surface: "18",
-        //   label: "fBillstatus",
-        //   name: "费用状态",
-        //   checked: 0,
-        //   width: null,
-        // },
       ],
       allCheck: false,
       showSetting:false,
@@ -3990,7 +4001,7 @@ export default {
           pageSize:10,
           fTaskType:Number(fTaskType),
           fFleet:this.form.fFleet,
-
+          fBilltype:'SJCK'
         }
         this.key_s = kye
       }else {

src/views/warehouseBusiness/stockTransfer/index.vue

@@ -327,50 +327,50 @@
     >
       <el-table-column type="selection" width="60" fixed align="center" />
       <el-table-column type="index" label="行号" fixed align="center" />
-<!--            <el-table-column-->
-<!--              v-for="(item, index) in getRowList"-->
-<!--              :key="index"-->
-<!--              :label="item.name"-->
-<!--              :width="item.width"-->
-<!--              :prop="item.label"-->
-<!--              align="center"-->
-<!--            />-->
-      <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" fixed sortable label="调拨状态" 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 width="220" label="货权方" fixed sortable align="center" prop="fCorpid"/>
-      <el-table-column label="提单号" sortable fixed width="216" align="center" prop="fMblno" show-overflow-tooltip/>
-      <el-table-column label="品名" fixed :show-overflow-tooltip="true" align="ceter" prop="fProductName" />
-      <el-table-column label="品牌" fixed align="center" prop="fMarks" />
-      <el-table-column label="调拨日期" align="center" fixed sortable prop="createTime" width="100">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.fBsdate, "{y}-{m}-{d}") }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="调入仓库" sortable fixed align="center" prop="fWarehouseid" width="100"/>
-      <el-table-column label="调出仓库" sortable fixed align="center" prop="fInwarehouseid" width="100"/>
-      <el-table-column label="计划调拨件数" align="center" prop="fPlanqty" width="100"/>
-      <el-table-column label="调拨件数" align="center" prop="fQty" />
-      <el-table-column label="调拨毛重(kg)" align="center" prop="fGrossweight" width="100"/>
-      <el-table-column label="调拨净重(kg)" align="center" prop="fNetweight" width="100"/>
-      <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
+              v-for="(item, index) in getRowList"
+              :key="index"
+              :label="item.name"
+              :width="item.width"
+              :prop="item.label"
+              align="center"
+            />
+<!--      <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" fixed sortable label="调拨状态" 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 width="220" label="货权方" fixed sortable align="center" prop="fCorpid"/>-->
+<!--      <el-table-column label="提单号" sortable fixed width="216" align="center" prop="fMblno" show-overflow-tooltip/>-->
+<!--      <el-table-column label="品名" fixed :show-overflow-tooltip="true" align="ceter" prop="fProductName" />-->
+<!--      <el-table-column label="品牌" fixed align="center" prop="fMarks" />-->
+<!--      <el-table-column label="调拨日期" align="center" fixed sortable prop="createTime" width="100">-->
+<!--        <template slot-scope="scope">-->
+<!--          <span>{{ parseTime(scope.row.fBsdate, "{y}-{m}-{d}") }}</span>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
+<!--      <el-table-column label="调入仓库" sortable fixed align="center" prop="fWarehouseid" width="100"/>-->
+<!--      <el-table-column label="调出仓库" sortable fixed align="center" prop="fInwarehouseid" width="100"/>-->
+<!--      <el-table-column label="计划调拨件数" align="center" prop="fPlanqty" width="100"/>-->
+<!--      <el-table-column label="调拨件数" align="center" prop="fQty" />-->
+<!--      <el-table-column label="调拨毛重(kg)" align="center" prop="fGrossweight" width="100"/>-->
+<!--      <el-table-column label="调拨净重(kg)" align="center" prop="fNetweight" width="100"/>-->
+<!--      <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
@@ -2883,105 +2883,112 @@ export default {
           label: "createBy",
           name: "制单人",
           checked: 0,
-          width: null,
+          width: 100,
+        },
+        {
+          surface: "2",
+          label: "fStorekeeper",
+          name: "仓管员",
+          checked: 0,
+          width: 100,
         },
         {
           surface: "2",
           label: "fItemsStatus",
           name: "调拨状态",
           checked: 0,
-          width: null,
+          width: 100,
         },
         {
           surface: "3",
           label: "fCorpid",
           name: "货权方",
           checked: 0,
-          width: null,
+          width: 100,
         },
         {
           surface: "4",
           label: "fMblno",
           name: "提单号",
           checked: 0,
-          width: null,
+          width: 100,
         },
         {
           surface: "5",
           label: "fProductName",
           name: "品名",
           checked: 0,
-          width: null,
+          width: 100,
         },
         {
           surface: "6",
           label: "fMarks",
           name: "品牌",
           checked: 0,
-          width: null,
+          width: 100,
         },
         {
           surface: "7",
           label: "createTime",
           name: "调拨日期",
           checked: 0,
-          width: null,
+          width: 100,
         },
         {
           surface: "8",
           label: "fWarehouseid",
           name: "调入仓库",
           checked: 0,
-          width: null,
+          width: 100,
         },
         {
           surface: "9",
           label: "fInwarehouseid",
           name: "调出仓库",
           checked: 0,
-          width: null,
+          width: 100,
         },
         {
           surface: "10",
           label: "fPlanqty",
           name: "计划调拨件数",
           checked: 0,
-          width: null,
+          width: 100,
         },
         {
           surface: "11",
           label: "fQty",
           name: "调拨件数",
           checked: 0,
-          width: null,
+          width: 100,
         },
         {
           surface: "12",
           label: "fGrossweight",
           name: "调拨毛重(KG)",
           checked: 0,
-          width: null,
+          width: 100,
         },
         {
           surface: "13",
           label: "fNetweight",
           name: "调拨净重(kg)",
           checked: 0,
-          width: null,
+          width: 100,
         },
         {
           surface: "14",
           label: "fBusinessType",
           name: "业务类别",
           checked: 0,
-          width: null,
+          width: 100,
         },
         {
           surface: "15",
           label: "fBillstatus",
           name: "费用状态",
           checked: 0,
-          width: null,
+          width: 100,
         },
       ],
       getRowList: [
@@ -2990,105 +2997,112 @@ export default {
           label: "createBy",
           name: "制单人",
           checked: 0,
-          width: null,
+          width: 100,
+        },
+        {
+          surface: "2",
+          label: "fStorekeeper",
+          name: "仓管员",
+          checked: 0,
+          width: 100,
         },
         {
           surface: "2",
           label: "fItemsStatus",
           name: "调拨状态",
           checked: 0,
-          width: null,
+          width: 100,
         },
         {
           surface: "3",
           label: "fCorpid",
           name: "货权方",
           checked: 0,
-          width: null,
+          width: 100,
         },
         {
           surface: "4",
           label: "fMblno",
           name: "提单号",
           checked: 0,
-          width: null,
+          width: 100,
         },
         {
           surface: "5",
           label: "fProductName",
           name: "品名",
           checked: 0,
-          width: null,
+          width: 100,
         },
         {
           surface: "6",
           label: "fMarks",
           name: "品牌",
           checked: 0,
-          width: null,
+          width: 100,
         },
         {
           surface: "7",
           label: "createTime",
           name: "调拨日期",
           checked: 0,
-          width: null,
+          width: 100,
         },
         {
           surface: "8",
           label: "fWarehouseid",
           name: "调入仓库",
           checked: 0,
-          width: null,
+          width: 100,
         },
         {
           surface: "9",
           label: "fInwarehouseid",
           name: "调出仓库",
           checked: 0,
-          width: null,
+          width: 100,
         },
         {
           surface: "10",
           label: "fPlanqty",
           name: "计划调拨件数",
           checked: 0,
-          width: null,
+          width: 100,
         },
         {
           surface: "11",
           label: "fQty",
           name: "调拨件数",
           checked: 0,
-          width: null,
+          width: 100,
         },
         {
           surface: "12",
           label: "fGrossweight",
           name: "调拨毛重(KG)",
           checked: 0,
-          width: null,
+          width: 100,
         },
         {
           surface: "13",
           label: "fNetweight",
           name: "调拨净重(kg)",
           checked: 0,
-          width: null,
+          width: 100,
         },
         {
           surface: "14",
           label: "fBusinessType",
           name: "业务类别",
           checked: 0,
-          width: null,
+          width: 100,
         },
         {
           surface: "15",
           label: "fBillstatus",
           name: "费用状态",
           checked: 0,
-          width: null,
+          width: 100,
         },
       ],
       allCheck: false,
@@ -3961,7 +3975,8 @@ export default {
           pageNum:1,
           pageSize:10,
           fTaskType:Number(fTaskType),
-          fFleet:this.form.fFleet
+          fFleet:this.form.fFleet,
+          fBilltype:'CKDB'
         }
         this.ueryTO(daTa)
       }else {