修改报废分页，查询，

2 years ago · ad641147fa
7 changed files with 85 additions and 37 deletions
--- a/src/components/jeecg/HDelivery.vue
+++ b/src/components/jeecg/HDelivery.vue
@ -91,7 +91,7 @@
      return {
        showText: {
          ids:[],
-          vals:''
+          vals:[]
        },
        title: '',
        avalid: true
@ -100,7 +100,7 @@
    computed: {
      uniqGroupId() {
        if (this.groupId) {
-          console.log(this.groupId)
+          // console.log(this.groupId)
          let { groupId, code, field, orgFields, destFields } = this
          return `${groupId}_${code}_${field}_${orgFields}_${destFields}`
        }
@ -234,7 +234,7 @@
          this.$emit('callback', rows[0].id)
          this.$emit('mounted', rows)
          this.$emit('callType', rows[0])
-          console.log(1)
+          // console.log(1)
        } else {
          //v-model时 需要传一个参数field 表示当前这个字段 从而根据这个字段的顺序找到原始值
          // this.$emit("input",row[orgFieldsArr[destFieldsArr.indexOf(this.field)]])
--- a/src/components/jeecg/modal/ProcessDelivery.vue
+++ b/src/components/jeecg/modal/ProcessDelivery.vue
@ -69,9 +69,6 @@
          :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange, type:'radio'}"
          :customRow="clickThenSelect"
          @change="handleTableChange">
-        <span slot="describes" slot-scope="text, record">
-          <j-ellipsis :value="text" :length="20"/>
-        </span>
          <template slot="htmlSlot" slot-scope="text">
            <div v-html="text"></div>
          </template>
@ -92,6 +89,10 @@
              下载
            </a-button>
          </template>
+          <!-- 字符串超长截取省略号显示-->
+          <span slot="component" slot-scope="text">
+          <j-ellipsis :value="text"/>
+        </span>

          <!--        <template slot="fileOn" slot-scope="text">-->
          <!--          <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>-->
@ -169,8 +170,8 @@
          {
            title: '流程提示',
            align: 'center',
-            scopedSlots: { customRender: 'describes' },
-            dataIndex: 'describes'
+            dataIndex: 'describes',
+            scopedSlots: { customRender: 'component' }
          },
          {
            title: '流程发起公司',
@ -267,6 +268,47 @@
      }
    },
    methods: {
+
+      handleTableChange(pagination, filters, sorter) {
+        // console.log("执行了",pagination,filters,sorter)
+        //分页、排序、筛选变化时触发
+        //TODO 筛选
+        if (Object.keys(sorter).length > 0) {
+          this.isorter.column = sorter.field;
+          this.isorter.order = "ascend" == sorter.order ? "asc" : "desc"
+        }
+        this.ipagination = pagination;
+        this.loadData();
+      },
+
+      loadData(arg) {
+        // console.log("执行了`````",arg);
+        if(!this.url.list){
+          this.$message.error("请设置url.list属性!")
+          return
+        }
+        //加载数据 若传入参数1则加载第一页的内容
+        if (arg === 1) {
+          this.ipagination.current = 1;
+        }
+        var params = this.getQueryParams();//查询条件
+        this.loading = true;
+        console.log("params>>>>>>",params)
+        getAction(this.url.list, params).then((res) => {
+          if (res.success) {
+            this.dataSource = res.result.records||res.result;
+            if(res.result.total)
+            {
+              this.ipagination.total = res.result.total;
+            }
+          }
+          if(res.code===510){
+            this.$message.warning(res.message)
+          }
+          this.loading = false;
+        })
+      },
+
      onClearSelected() {
        this.selectedRowKeys = []
        this.selectionRows = []
@ -277,9 +319,9 @@
        this.selectedRowKeys = selectedRowKeys
        this.selectionRows = selectionRows
      },
-      loadData(arg) {
-        if(!this.url.list){
-          this.$message.error("请设置url.list属性!")
+      loadPlan(arg) {
+        if (!this.url.list) {
+          this.$message.error('请设置url.list属性!')
          return
        }
        //加载数据 若传入参数1则加载第一页的内容
@ -410,7 +452,7 @@
        Object.keys(this.queryParam).forEach(key => {
          this.queryParam[key] = ''
        })
-        //this.loadData(1);
+        this.loadData(1);
      },
      /* onClearSelected(){
         this.table.selectedRowKeys = []
--- a/src/views/activiti/applyHome.vue
+++ b/src/views/activiti/applyHome.vue
@ -4,7 +4,7 @@
    <a-input-search style="margin-bottom: 10px;margin-right:10px;width: 200px" v-model="searchProcessKey"
                    placeholder="输入流程名称" @search="onSearchProcess" />
    <a-button @click="onSearchProcess(searchProcessKey)" type="primary">查询</a-button>
-    <a-button @click="onSearchProcess('')">重置</a-button>
+    <a-button @click="onSearchProcess('')" style="margin-left: 1%">重置</a-button>
    <a-button @click="handleToApplyList" type="primary" style="float: right;">前往我的申请列表</a-button>
      <a-empty description="无流程可供选择" v-if="activeKeyAll.length==0" />
      <div v-else >
--- a/src/views/activiti/form/ProcessSmaterialsScrap.vue
+++ b/src/views/activiti/form/ProcessSmaterialsScrap.vue
@ -28,7 +28,6 @@
    components: { ProcessSmaterialsScrapForm, historicPictrue, historicDetail },
    data() {
      return {
-        isNew: ''
      }
    },
    props: {
--- a/src/views/activiti/form/ProcessSmaterialsScrapForm.vue
+++ b/src/views/activiti/form/ProcessSmaterialsScrapForm.vue
@ -38,7 +38,7 @@
          </a-col>
          <a-col :span="8">
            <a-form-item label="关联出库流程" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <h-delivery   v-decorator="['processOutflowId']" code="demo" field="name" orgFields="name"  @mounted="getPlanList" @callType="getcallType"  destFields="name"/>
+              <h-delivery   v-decorator="['processOutflowId']" code="demo" field="name" orgFields="name"  @mounted="getPlanList" @callType="getcallType"     destFields="name"/>
            </a-form-item>
          </a-col>
          <a-col :span="8">
@ -106,6 +106,7 @@
  import JDictSelectTag from '@/components/dict/JDictSelectTag'
  import JSearchSelectTag from '@/components/dict/JSearchSelectTag'
  import JSelectCompany from '../../../components/jeecgbiz/JSelectCompany'
+  import moment from 'moment'

  export default {
    name: 'ProcessSmaterialsScrapForm',
@ -349,7 +350,7 @@
      this.showFlowData()
      let company = sessionStorage.getItem('PARENT_ID')
      let userInfo = sessionStorage.getItem('USER_INFORMATION')
-      console.log(userInfo)
+      // console.log(userInfo)
      // userInfo.company=company;
      this.popupCallback(company, userInfo)
      if (!this.isNew){
@ -371,23 +372,28 @@
              }
            })
          }
-          if(!!shut && record.row.scrapNumber > shut.pleaseSendNumber){
-            record.row.scrapNumber = shut.pleaseSendNumber;
-          }else if(!!shut && record.row.scrapNumber < shut.pleaseSendNumber){
+          if(!!shut && record.row.scrapNumber > shut.scrapNumber){
+            record.row.scrapNumber = shut.scrapNumber;
+          }else if(!!shut && record.row.scrapNumber < shut.scrapNumber){
+
          }else{
-            return ;
+
+            return;
          }

-          let values = [
-            {
-              rowKey: record.row.id,
-              values: {
-                'scrapNumber': record.row.scrapNumber,
-                'materialAmount': record.row.scrapNumber * record.row.materialPrice,
+          if(!!record.row.scrapNumber){
+            let values = [
+              {
+                rowKey: record.row.id,
+                values: {
+                  'scrapNumber': record.row.scrapNumber,
+                  'materialAmount': record.row.scrapNumber * record.row.materialPrice,
+                },
              },
-            },
-          ]
-          this.$refs.processSmaterialsScrapList.setValues(values);
+            ]
+            this.$refs.processSmaterialsScrapList.setValues(values);
+          }
+
        }


@ -402,7 +408,7 @@
      /*回显数据*/
      init() {
        this.btndisabled = true
-                var r = this.processData;
+        var r = this.processData;
        this.getAssignees(r);
        if (!r.tableId){
          return
@ -424,7 +430,7 @@
        })
      },
      getPlanList(val){
-        console.log(val,"传值")
+        // console.log("getPlanList",val)
        let ids=[]
        if (!!val){
          for (let i = 0; i < val.length; i++) {
@ -565,6 +571,7 @@

      },
      getcallType(type){
+        // console.log("type",type)
        this.data.materialType = type.materialType;
     //   this.data.processOutflowId=type.id
        let fieldval =pick(this.data,'materialType')
@ -622,7 +629,7 @@
      },
      popupCallback(company, row) {
        let res = JSON.parse(row)
-        console.log('获取我的数据', res.id)
+        // console.log('获取我的数据', res.id)
        let param = {}

        param.createBy = res.username
@ -630,7 +637,7 @@
        param.sysOrgCode = res.departIds
        param.createTime = getCurrentTime()
        this.data = param
-        console.log("23412341234",this.data)
+        // console.log("23412341234",this.data)
        let fieldval = pick(this.data, 'createBy', 'company', 'sysOrgCode', 'createTime')
        this.$nextTick(() => {
          this.form.setFieldsValue(fieldval)
--- a/src/views/processmaterials/ProcessMaterialsDeliveryListList.vue
+++ b/src/views/processmaterials/ProcessMaterialsDeliveryListList.vue
@ -93,7 +93,7 @@
      mainId:{
        immediate: true,
        handler(val) {
-          console.log("val>>>>>>>>>>>>>>>>>>>>>>>>>>>",val)
+          // console.log("val>>>>>>>>>>>>>>>>>>>>>>>>>>>",val)
          if(!this.mainId){
            this.clearList()
          }else{
@ -149,7 +149,7 @@
          {
            title:'请发数',
            align:"center",
-            dataIndex: 'pleaseSendNumber'
+            dataIndex: 'scrapNumber'
          },
          {
            title:'实发数',
--- a/src/views/suppliesstronger/ProcessSuppliesStrongerLists.vue
+++ b/src/views/suppliesstronger/ProcessSuppliesStrongerLists.vue
@ -318,8 +318,8 @@
              // console.log(t,r,ind);
              if(r.arrivalNotice === '1'){
                return  "是";
-              }else if(r.arrivalNotice === undefined){
-                return "是";
+              }else if(r.arrivalNotice === '0'){
+                return "否";
              }
            }
          },