Merge branch 'dev' into songshankun/adjust-style

songshankun

2023-10-19 d7557c1681b2da87df6509b3faf5dc4cefac1da2

Merge branch 'dev' into songshankun/adjust-style

 src/views/operate/allot/index.vue

@@ -11,12 +11,22 @@
    </div>
    <div class="list-view">
      <div class="table">
        <TableCommonView
          ref="tableListRef"
          :table-list="tableList"
          @selTableCol="selTableCol"
          @tableRowClick="tableRowClick"
        ></TableCommonView>
        <TableCommonView ref="tableListRef" :table-list="tableList" @selTableCol="selTableCol">
          <template slot="tableButton">
            <el-table-column label="操作" width="100">
              <template slot-scope="scope">
                <el-button @click="tableRowClick(scope.row, '查看')" type="text" size="small">查看</el-button>
                <el-button
                  v-if="scope.row.status !== 4"
                  @click="tableRowClick(scope.row, '编辑')"
                  type="text"
                  size="small"
                  >编辑</el-button
                >
              </template>
            </el-table-column>
          </template>
        </TableCommonView>
      </div>
      <div class="btn-pager">
        <PagerView class="page" :pager-options="pagerOptions" v-on="pagerEvents" />
@@ -236,11 +246,11 @@
      this.pagerOptions.currPage = 1
      this.getData()
    },
    // 行点击
    tableRowClick(row) {
    // 查看 编辑
    tableRowClick(row, val) {
      console.log(row)
      this.editConfig.visible = true
      this.editConfig.title = "编辑"
      this.editConfig.title = val
      this.editConfig.infomation = { ...row }
    },
    // 新建

 src/views/overview/AddOverviewDialog.vue

@@ -410,10 +410,15 @@
        this.showEdit = false
        this.showFooter = true
        this.isValidateClick = false
      } else if (this.editConfig.title === "查看" && this.editConfig.infomation.status !== 4) {
      } else if (this.editConfig.title === "编辑") {
        this.showButton = true
        this.showEdit = false
        this.isDelClick = true
        this.showFooter = true
      } else if (this.editConfig.title === "查看" && this.editConfig.infomation.status !== 4) {
        this.showButton = true
        this.showEdit = true
        this.isDelClick = true
        this.showFooter = false
        if (this.editConfig.infomation.status === "完成") {
          this.isValidateClick = false

 src/views/overview/OverviewListView.vue

@@ -11,12 +11,22 @@
    </div>
    <div class="list-view">
      <div class="table">
        <TableCommonView
          ref="tableListRef"
          :table-list="tableList"
          @selTableCol="selTableCol"
          @tableRowClick="tableRowClick"
        ></TableCommonView>
        <TableCommonView ref="tableListRef" :table-list="tableList" @selTableCol="selTableCol">
          <template slot="tableButton">
            <el-table-column label="操作" width="100">
              <template slot-scope="scope">
                <el-button @click="tableRowClick(scope.row, '查看')" type="text" size="small">查看</el-button>
                <el-button
                  v-if="scope.row.status !== 4"
                  @click="tableRowClick(scope.row, '编辑')"
                  type="text"
                  size="small"
                  >编辑</el-button
                >
              </template>
            </el-table-column>
          </template>
        </TableCommonView>
      </div>
      <div class="btn-pager">
        <PagerView class="page" :pager-options="pagerOptions" v-on="pagerEvents" />
@@ -28,6 +38,7 @@
      :work-type="workType"
      :edit-common-config="editConfig"
      :add-name="this.$route.params.name"
      :display-edit="displayEdit"
    />
  </div>
</template>
@@ -61,7 +72,8 @@
      },
      workType: this.$route.params.workType,
      keyword: "",
      params: {}
      params: {},
      displayEdit: false
    }
  },
  created() {
@@ -222,11 +234,11 @@
      this.pagerOptions.currPage = 1
      this.getData()
    },
    // 行点击
    tableRowClick(row) {
    // 查看 编辑
    tableRowClick(row, val) {
      console.log(row)
      this.editConfig.visible = true
      this.editConfig.title = "编辑"
      this.editConfig.title = val
      this.editConfig.operationTypeId = this.$route.params.id
      this.editConfig.infomation = { ...row }
    },

 src/views/warehouseManage/bussinessType/AddBussinessType.vue

@@ -294,6 +294,9 @@
        this.showButton = false
        this.showEdit = false
        this.showFooter = true
      } else if (this.editConfig.title === "编辑") {
        this.showEdit = false
        this.showFooter = true
      } else {
        this.showEdit = true
        this.showFooter = false

 src/views/warehouseManage/bussinessType/index.vue

@@ -11,12 +11,16 @@
    </div>
    <div class="list-view">
      <div class="table">
        <TableCommonView
          ref="tableListRef"
          :table-list="tableList"
          :show-checkcol="false"
          @tableRowClick="tableRowClick"
        ></TableCommonView>
        <TableCommonView ref="tableListRef" :table-list="tableList" :show-checkcol="false">
          <template slot="tableButton">
            <el-table-column label="操作" width="100">
              <template slot-scope="scope">
                <el-button @click="tableRowClick(scope.row, '查看')" type="text" size="small">查看</el-button>
                <el-button @click="tableRowClick(scope.row, '编辑')" type="text" size="small">编辑</el-button>
              </template>
            </el-table-column>
          </template>
        </TableCommonView>
      </div>
      <div class="btn-pager">
        <PagerView class="page" :pager-options="pagerOptions" v-on="pagerEvents" />
@@ -122,8 +126,8 @@
      this.getData()
    },
    // 行点击
    tableRowClick(row) {
      this.editConfig.title = "编辑"
    tableRowClick(row, val) {
      this.editConfig.title = val
      let obj = JSON.parse(JSON.stringify(row))
      for (let i in obj) {
        if (i == "name" || i == "prefix") {

 src/views/warehouseManage/position/AddDialog.vue

@@ -53,7 +53,7 @@
                    v-model="editConfig.infomation.parentId"
                    placeholder="请选择"
                    size="mini"
                    :disabled="editCommonConfig.title=='编辑'"
                    :disabled="editCommonConfig.title!='新建'"
                    style="width: 90%"
                  >
                    <el-option v-for="item in positionList" :key="item.id" :label="item.name" :value="item.id">
@@ -68,7 +68,7 @@
                  <el-select
                    v-model="editConfig.infomation.type"
                    filterable
                    :disabled="editCommonConfig.title=='编辑'"
                    :disabled="editCommonConfig.title!='新建'"
                    placeholder="请选择"
                    style="width: 90%"
                    no-data-text="暂无数据"
@@ -245,7 +245,7 @@
    productClick() {},
    // 设置删除/打印/编辑是否显示
    setBottonView() {
      if (this.editConfig.title === "新建") {
      if (this.editConfig.title === "新建"||this.editConfig.title === "编辑") {
        this.showEdit = false
        this.showFooter = true
      } else if (this.editConfig.infomation.status === "完成") {

 src/views/warehouseManage/position/index.vue

@@ -15,8 +15,26 @@
          ref="tableListRef"
          :table-list="tableList"
          :show-checkcol="false"
          @tableRowClick="tableRowClick"
        ></TableCommonView>
        >
        <template slot="tableButton">
            <el-table-column label="操作" width="120" fixed="right">
              <template slot-scope="scope">
                <el-button
                  @click="tableRowClick(scope.row,'edit')"
                  type="text"
                  size="small"
                  >编辑</el-button
                >
                <el-button
                  type="text"
                  size="small"
                  @click="tableRowClick(scope.row,'look')"
                  >查看</el-button
                >
              </template>
            </el-table-column>
          </template>
      </TableCommonView>
      </div>
      <div class="btn-pager">
        <PagerView class="page" :pager-options="pagerOptions" v-on="pagerEvents" />
@@ -138,9 +156,8 @@
      this.getData()
    },
    // 行点击
    tableRowClick(row) {
      console.log(row)
      this.editConfig.title = "编辑"
    tableRowClick(row,val) {
      this.editConfig.title =  val=='look'?'查看':"编辑"
      this.editConfig.infomation = { ...row }
      this.editConfig.infomation.parentId = this.editConfig.infomation.parentId?Number(this.editConfig.infomation.parentId):null
      this.editConfig.visible = true

 src/views/warehouseManage/warehouse/AddDialog.vue

@@ -176,7 +176,7 @@
    productClick() {},
    // 设置删除/打印/编辑是否显示
    setBottonView() {
      if (this.editConfig.title === "新建") {
      if (this.editConfig.title === "新建"||this.editConfig.title === "编辑") {
        this.showEdit = false
        this.showFooter = true
      } else if (this.editConfig.infomation.status === "完成") {

 src/views/warehouseManage/warehouse/index.vue

@@ -15,8 +15,26 @@
          ref="tableListRef"
          :table-list="tableList"
          :show-checkcol="false"
          @tableRowClick="tableRowClick"
        ></TableCommonView>
        >
        <template slot="tableButton">
            <el-table-column label="操作" width="120" fixed="right">
              <template slot-scope="scope">
                <el-button
                  @click="tableRowClick(scope.row,'edit')"
                  type="text"
                  size="small"
                  >编辑</el-button
                >
                <el-button
                  type="text"
                  size="small"
                  @click="tableRowClick(scope.row,'look')"
                  >查看</el-button
                >
              </template>
            </el-table-column>
          </template>
      </TableCommonView>
      </div>
      <div class="btn-pager">
        <PagerView class="page" :pager-options="pagerOptions" v-on="pagerEvents" />
@@ -125,8 +143,8 @@
      this.getData()
    },
    // 行点击
    tableRowClick(row) {
      this.editConfig.title = "编辑"
    tableRowClick(row,val) {
      this.editConfig.title = val=='look'?'查看':"编辑"
      this.editConfig.infomation = { ...row }
      this.editConfig.visible = true
    },