Merge remote-tracking branch 'origin/master'

王震

2023-12-13 67da82f0b0c24df5f19bbfcfec63801d9ae902d8

 src/views/common/rawMaterial-part.vue

@@ -112,6 +112,14 @@
              searchInfoType: 'text'
            },
            {
              minWidth: '120',
              prop: 'projectName',
              label: '项目名称',
              isTrue: true,
              isSearch: true,
              searchInfoType: 'text'
           },
            {
              minWidth: '100',
              prop: 'name',
              label: '原材料名称',
@@ -178,6 +186,7 @@
    mounted() {

    },
    // props:['currentRow'],
    methods: {
      getData() {
        if (this.$refs.rawPartTable !== undefined) {
@@ -196,6 +205,7 @@
          )
        }
        this.innerVisible = false
        this.$parent.costPlannedAmountChange(this.currentRow)
      },
      handleCurrentChange(row) {
        this.currentRow = row