台账修改提交

package.json

@@ -69,4 +69,4 @@
     "vue-template-compiler": "^2.7.10",
     "webpack": "^5.74.0"
   }
-}
+}

src/views/ledgerAssets/boat/components/boat-list.vue

@@ -19,6 +19,7 @@
           type="primary"
           icon="el-icon-download"
           class="ele-btn-icon"
+          @click="btnExport"
         >
           导出
         </el-button>
@@ -35,9 +36,8 @@
 
 <script>
   import BoatSearch from './boat-search.vue';
-  import {
-    getBoatList
-  } from '@/api/ledgerAssets';
+  import { getBoatList } from '@/api/ledgerAssets';
+  // import { downloadAction } from '@/api/flowable/manage';
 
   export default {
     components: { BoatSearch },
@@ -154,7 +154,17 @@
             id
           }
         })
-      }
+      },
+
+      // 导出
+      btnExport() {
+        // downloadAction(
+        //   '/flowable/processDefinition/xml',
+        //   'get',
+        //   { processDefinitionId: row.id },
+        //   '舟皿台账'
+        // );
+      },
     },
     watch: {
       // 监听类别id变化

src/views/ledgerAssets/material/components/material-list.vue

@@ -25,7 +25,7 @@
       </template>
       <!-- 编码列 -->
       <template v-slot:code="{ row }">
-        <el-link @click="details(row)">
+        <el-link type="primary" :underline="false" @click="details(row)">
           {{ row.code }}
         </el-link>
       </template>

src/views/ledgerAssets/mould/components/baseInfo.vue

@@ -79,8 +79,7 @@
         <!-- {{info.warehouseDetail.createTime}} -->
       </el-descriptions-item>
       <el-descriptions-item :span="2">
-        <template slot="label"> 出库单号 </template>
-        <!-- <template slot="label">  {{queryInfo.source==2?'入库单号':'出库单号'}}  </template> -->
+        <template slot="label">  {{sourceType==1?'入库单号':'出库单号'}}  </template>
         <!-- <el-link style="color: #70B603" @click="jumpDetails">{{info.warehouseDetail.bizNum}}</el-link> -->
       </el-descriptions-item>
       <el-descriptions-item>
@@ -182,6 +181,7 @@ export default {
       },
       // 设备图片
       imageUrl: "",
+      sourceType:null
     }
   },
   created () {
@@ -191,10 +191,11 @@ export default {
      async getDetilInfo(){
        const res = await getAssetInfo(this.rowId)
        if (res){
-          this.info = res.data
-          this.$set(this.info, 'extraInfo', JSON.parse(res.data.category.extendField))
-          this.$set(this.info, 'category', res.data.category)
-          this.$set(this.info, 'extInfoSelf', res.data.extInfoSelf?res.data.extInfoSelf:[])
+          this.info = res
+          this.$set(this.info, 'extraInfo', JSON.parse(res.category.extendField))
+          this.$set(this.info, 'category', res.category)
+          this.$set(this.info, 'extInfoSelf', res.extInfoSelf?res.extInfoSelf:[])
+          this.sourceType = res.positionList[0].type
           // // 设备图片
           // if (res.data.imageUrl) {
           //   imageView(res.data.imageUrl).then((res) => {
@@ -216,7 +217,7 @@ export default {
        if(!this.info.warehouseDetail){
          return
        }
-        this.$refs.detailsDialogRef.init(this.info.warehouseDetail,this.queryInfo.source)
+        this.$refs.detailsDialogRef.init(this.info.warehouseDetail,this.sourceType)
      },
 
      openfile(row) {

src/views/ledgerAssets/mould/components/mould-list.vue

@@ -1,6 +1,9 @@
 <template>
   <div>
-    <mould-search @search="reload">
+    <mould-search 
+      @search="reload"
+      :isConsumer="isConsumer"
+    >
     </mould-search>
     <!-- 数据表格 -->
     <ele-pro-table
@@ -14,7 +17,7 @@
     >
       <!-- 表头工具栏 -->
       <template v-slot:toolbar>
-          <el-checkbox v-model="checked">显示已消耗</el-checkbox>
+          <el-checkbox v-model="isConsumer">显示已消耗</el-checkbox>
           <el-button
            size="small"
            type="primary"
@@ -27,7 +30,7 @@
 
       <!-- 编码列 -->
       <template v-slot:code="{ row }">
-        <el-link @click="details(row)">
+        <el-link type="primary" :underline="false" @click="details(row)">
           {{ row.code }}
         </el-link>
       </template>
@@ -69,9 +72,10 @@
   import {
     getAssetList
   } from '@/api/ledgerAssets';
-
+  import dictMixins from '@/mixins/dictMixins';
   export default {
     components: { MouldSearch },
+    mixins: [dictMixins],
     props: {
       // 类别id
       categoryId: [Number, String],
@@ -148,7 +152,10 @@
             prop: 'totalSum',
             label: '生命周期',
             showOverflowTooltip: true,
-            minWidth: 110
+            minWidth: 110,
+            formatter: (_row, _column, cellValue) => {
+              return this.getDictValue('生命周期',  _row.position[0].type)
+            }
           },
           {
             columnKey: 'action',
@@ -161,9 +168,12 @@
             fixed: 'right'
           }
         ],
-        checked:false
+        isConsumer:false
       };
     },
+    created () {
+      this.requestDict('生命周期');
+    },
     methods: {
       /* 表格数据源 */
       datasource({ page, limit, where, order }) {

src/views/ledgerAssets/mould/components/mould-search.vue

@@ -67,6 +67,9 @@
     listOrganizations
   } from '@/api/system/organization';
   export default {
+    props: {
+      isConsumer: Boolean,
+    },
     data() {
       // 默认表单数据
       const defaultWhere = {
@@ -83,6 +86,12 @@
         treeData:[]
       };
     },
+    watch:{
+       isConsumer() {
+         this.where.isConsumer = this.isConsumer
+         this.search()
+       }
+    },
     computed: {
       // 是否开启响应式布局
       styleResponsive() {
@@ -95,12 +104,11 @@
     methods: {
       /* 搜索 */
       search() {
-        console.log(this.where);
         this.$emit('search', this.where);
       },
       /*  重置 */
       reset() {
-        this.where = { ...this.defaultWhere };
+        this.where = { ...this.defaultWhere  , isConsumer:this.isConsumer };
         this.search();
       },
 

src/views/ledgerAssets/sparepart/components/baseInfo.vue

@@ -146,9 +146,9 @@ export default {
      async getDetilInfo(){
        const res = await getAssetInfo(this.rowId)
        if (res){
-          this.info = res.data
-          this.$set(this.info, 'category', res.data.category)
-          this.$set(this.info, 'extInfoSelf', res.data.extInfoSelf?res.data.extInfoSelf:[]) 
+          this.info = res
+          this.$set(this.info, 'category', res.category)
+          this.$set(this.info, 'extInfoSelf', res.extInfoSelf?res.extInfoSelf:[]) 
           // 设备图片
           // if (res.data.imageUrl) {
           //   imageView(res.data.imageUrl).then((res) => {

src/views/ledgerAssets/sparepart/components/sparepart-list.vue

@@ -1,6 +1,9 @@
 <template>
   <div>
-    <sparepart-search @search="reload">
+    <sparepart-search 
+      @search="reload"
+      :isConsumer="isConsumer"
+    >
     </sparepart-search>
     <!-- 数据表格 -->
     <ele-pro-table
@@ -14,7 +17,7 @@
     >
       <!-- 表头工具栏 -->
       <template v-slot:toolbar>
-          <el-checkbox v-model="checked">显示已消耗</el-checkbox>
+          <el-checkbox v-model="isConsumer">显示已消耗</el-checkbox>
           <el-button
            size="small"
            type="primary"
@@ -27,7 +30,7 @@
 
       <!-- 编码列 -->
       <template v-slot:code="{ row }">
-        <el-link @click="details(row)">
+        <el-link type="primary" :underline="false" @click="details(row)">
           {{ row.code }}
         </el-link>
       </template>
@@ -69,9 +72,10 @@
   import {
     getAssetList
   } from '@/api/ledgerAssets';
-
+  import dictMixins from '@/mixins/dictMixins';
   export default {
     components: { SparepartSearch },
+    mixins: [dictMixins],
     props: {
       // 类别id
       categoryId: [Number, String],
@@ -148,7 +152,10 @@
             prop: 'totalSum',
             label: '生命周期',
             showOverflowTooltip: true,
-            minWidth: 110
+            minWidth: 110,
+            formatter: (_row, _column, cellValue) => {
+              return this.getDictValue('生命周期',  _row.position[0].type)
+            }
           },
           {
             columnKey: 'action',
@@ -161,9 +168,12 @@
             fixed: 'right'
           }
         ],
-        checked:false
+        isConsumer:false
       };
     },
+    created () {
+      this.requestDict('生命周期');
+    },
     methods: {
       /* 表格数据源 */
       datasource({ page, limit, where, order }) {

src/views/ledgerAssets/sparepart/components/sparepart-search.vue

@@ -36,7 +36,7 @@
           <el-input clearable v-model="where.fixCode" placeholder="请输入" />
         </el-form-item>
         <el-form-item label="生命周期:" label-width="75px">
-          <DictSelection dictName="生命周期" clearable v-model="where.source">
+          <DictSelection dictName="生命周期" clearable v-model="where.positionType">
           </DictSelection>
         </el-form-item>
       </el-col>
@@ -71,6 +71,9 @@
     listOrganizations
   } from '@/api/system/organization';
   export default {
+    props: {
+      isConsumer: Boolean,
+    },
     data() {
       // 默认表单数据
       const defaultWhere = {
@@ -79,7 +82,8 @@
         fixCode:'',
         texture:'',
         module:'',
-        ownershipGroupId:''
+        ownershipGroupId:'',
+        positionType:''
       };
       return {
         // 表单数据
@@ -93,18 +97,23 @@
         return this.$store.state.theme.styleResponsive;
       }
     },
+    watch:{
+       isConsumer() {
+         this.where.isConsumer = this.isConsumer
+         this.search()
+       }
+    },
     created(){
        this.query()
     },
     methods: {
       /* 搜索 */
       search() {
-        console.log(this.where);
         this.$emit('search', this.where);
       },
       /*  重置 */
       reset() {
-        this.where = { ...this.defaultWhere };
+        this.where = { ...this.defaultWhere , isConsumer:this.isConsumer };
         this.search();
       },
 

src/views/ledgerAssets/turnoverCar/components/baseInfo.vue

@@ -38,9 +38,7 @@
       </el-descriptions-item>
      <el-descriptions-item>
         <template slot="label"> 生命周期</template>
-       <!-- <div v-if="queryInfo.source==1" style="color: #70B603">在用</div>
-        <div v-if="queryInfo.source==2" style="color: #F59A23">在库</div>
-        <div v-if="queryInfo.source==3" style="color: #AAAAAA">消耗</div> -->
+        {{getDictValue('生命周期',  sourceType)}}
       </el-descriptions-item>
     </el-descriptions>
 
@@ -65,7 +63,7 @@
         {{info.supplierMobile}}
       </el-descriptions-item>
       <el-descriptions-item :span="2">
-        <template slot="label"> {{queryInfo.source==2?'入库单号':'出库单号'}} </template>
+        <template slot="label"> {{sourceType==1?'入库单号':'出库单号'}} </template>
         <!-- <el-link style="color: #70B603" @click="jumpDetails">{{info.warehouseDetail.bizNum}}</el-link> -->
       </el-descriptions-item>
       <el-descriptions-item>
@@ -132,7 +130,9 @@
   import {
     getDetails
   } from '@/api/classifyManage/itemInformation';
+  import dictMixins from '@/mixins/dictMixins';
 export default {
+  mixins: [dictMixins],
   props: {
     rowId:{
       type:String ,
@@ -148,19 +148,19 @@ export default {
       },
       // 设备图片
       imageUrl: "",
-      queryInfo:{}
-
+      sourceType:null
     }
   },
   created () {
-     // let id = this.queryInfo.id
      this.getDetilInfo()
+     this.requestDict('生命周期');
   },
   methods:{
      async getDetilInfo(){
        const res = await getAssetInfo(this.rowId)
        if (res){
           this.info = res
+          this.sourceType = res.positionList[0].type
           this.$set(this.info, 'category', res.category)
           this.$set(this.info, 'extInfoSelf', res.extInfoSelf?res.extInfoSelf:[])
           // this.$set(this.info, 'warehouseDetail', res.data.warehouseDetail)
@@ -176,7 +176,7 @@ export default {
        if(!this.info.warehouseDetail){
          return
        }
-        this.$refs.detailsDialogRef.init(this.info.warehouseDetail,this.queryInfo.source)
+        this.$refs.detailsDialogRef.init(this.info.warehouseDetail,this.sourceType)
      }
 
 

src/views/ledgerAssets/turnoverCar/components/turnovercar-list.vue

@@ -1,6 +1,10 @@
 <template>
   <div>
-    <turnovercar-search @search="reload">
+    <turnovercar-search
+       ref="searchRef"
+       @search="reload"
+       :isConsumer="isConsumer"
+    >
     </turnovercar-search>
     <!-- 数据表格 -->
     <ele-pro-table
@@ -14,12 +18,13 @@
     >
       <!-- 表头工具栏 -->
       <template v-slot:toolbar>
-          <el-checkbox v-model="checked">显示已消耗</el-checkbox>
+          <el-checkbox v-model="isConsumer">显示已消耗</el-checkbox>
           <el-button
            size="small"
            type="primary"
            icon="el-icon-download"
            class="ele-btn-icon"
+           @click="btnExport"
          >
            导出
          </el-button>
@@ -27,7 +32,7 @@
 
       <!-- 编码列 -->
       <template v-slot:code="{ row }">
-        <el-link @click="details(row)">
+        <el-link type="primary" :underline="false" @click="details(row)">
           {{ row.code }}
         </el-link>
       </template>
@@ -66,10 +71,9 @@
 
 <script>
   import TurnovercarSearch from './turnovercar-search.vue';
-  import {
-    getAssetList
-  } from '@/api/ledgerAssets';
+  import {   getAssetList   } from '@/api/ledgerAssets';
   import dictMixins from '@/mixins/dictMixins';
+  // import { downloadAction } from '@/api/flowable/manage';
 
   export default {
     components: { TurnovercarSearch },
@@ -166,7 +170,7 @@
             fixed: 'right'
           }
         ],
-        checked:false
+        isConsumer:false
       };
     },
     created () {
@@ -189,6 +193,7 @@
         this.$refs.table.reload({ pageNum: 1, where: where });
       },
 
+
       // 跳转到详情页
       details ({ id }) {
         this.$router.push({
@@ -206,7 +211,13 @@
             id
           }
         })
-      }
+      },
+
+      // 导出
+      btnExport() {
+        const obj = this.$refs.searchRef.getForm()
+        
+      },
 
     },
     watch: {

src/views/ledgerAssets/turnoverCar/components/turnovercar-search.vue

@@ -36,7 +36,7 @@
           <el-input clearable v-model="where.fixCode" placeholder="请输入" />
         </el-form-item>
         <el-form-item label="生命周期:">
-          <DictSelection dictName="生命周期" clearable v-model="where.source">
+          <DictSelection dictName="生命周期" clearable v-model="where.positionType">
           </DictSelection>
         </el-form-item>
       </el-col>
@@ -71,13 +71,17 @@
     listOrganizations
   } from '@/api/system/organization';
   export default {
+    props: {
+      isConsumer: Boolean,
+    },
     data() {
       // 默认表单数据
       const defaultWhere = {
         name: '',
         code: '',
         fixCode:'',
-        ownershipGroupId:''
+        ownershipGroupId:'',
+        positionType:''
       };
       return {
         // 表单数据
@@ -91,21 +95,27 @@
         return this.$store.state.theme.styleResponsive;
       }
     },
+    watch:{
+       isConsumer() {
+         this.where.isConsumer = this.isConsumer
+         this.search()
+       }
+    },
     created(){
        this.query()
     },
     methods: {
       /* 搜索 */
       search() {
-        console.log(this.where);
         this.$emit('search', this.where);
       },
       /*  重置 */
       reset() {
-        this.where = { ...this.defaultWhere };
+        this.where = { ...this.defaultWhere , isConsumer:this.isConsumer};
         this.search();
       },
 
+
       query() {
         listOrganizations()
           .then((list) => {
@@ -118,6 +128,10 @@
           .catch((e) => {
           });
       },
+      
+      getForm(){
+         return this.where
+      }
 
 
     }