Merge branch 'dev1.0' of http://42.193.1.25:9521/r/sccg_ui into dev1.0

zhanghua

2023-02-23 5a685b76c6a54d72bbfe082d85454513e81dcf48

Merge branch 'dev1.0' of http://42.193.1.25:9521/r/sccg_ui into dev1.0

 src/api/operate/writ.js

@@ -17,4 +17,4 @@
    deleteWrit: (id) => {
        return http.delete('/sccg/writ/delete/' + id);
    },
};
};

 src/views/operate/disposal/casepool/dispatch/updateUser/uploadResult/components/arrive/index.vue

@@ -153,7 +153,7 @@

.upImg {
    display: flex;

    overflow: auto;
    .tip {
        position: absolute;
        bottom: 0;
@@ -208,4 +208,4 @@
// ::v-deep .el-form-item__label {
//     color: #4b9bb7;
// }
</style>
</style>

 src/views/operate/fivepack/threepack/components/content.vue

@@ -61,6 +61,7 @@
        :data="tableData"
        style="width: 100%"
        :row-class-name="tableRowClassName"
        @selection-change="tableChange"
      >
        <el-table-column type="selection" min-width="5"> </el-table-column>
        <el-table-column prop="storeNumber" label="店铺编号" min-width="10">
@@ -340,6 +341,10 @@
      }
    };
    return {
      tempList: [],
      myIdx: 0,
      all: false,
      unsame: false,
      storeCode: null,
      storeStatus: null,
      options: [
@@ -404,6 +409,11 @@
  },

  methods: {
    // 监听表格选中状态
    tableChange(list) {
      this.tempList = list;
      this.all = list.length === this.tableData.length;
    },
    // 批量删除
    mulDelete(idArr) {
      this.$axios({

 src/views/operate/message/myIndex/index.vue

@@ -380,7 +380,7 @@
            line-height: 100px;
            justify-content: space-between;
            align-items: center;

          flex-wrap: wrap;
            .search {
                display: flex;
                justify-content: space-between;

 src/views/operate/message/myIndex/update/index.vue

@@ -327,7 +327,7 @@
              );
          }
          }
          if(mystatus==0){ 
          if(mystatus==0){
            const { body, head, messageType, channelCode } = this.role;
          const params = {
            body,
@@ -367,7 +367,7 @@
              );
          }
          }
        

        } else {
          this.$message.error({ type: "warning", message: "请检查必填项" });
        }
@@ -388,7 +388,7 @@
        url: "sccg/admin/info?name=" + name,
      }).then((res) => {
        this.role.targetFrom = res.data.userId;
        this.sendUser = res.data.username;
        this.sendUser = res.data.user.username;
      });
    },


 src/views/operate/sms/smsIndex/index.vue

@@ -70,7 +70,7 @@
          </el-table-column>
        </el-table>
        <!-- 新建消息 -->
        <el-dialog title="新建消息" :destroy-on-close="true" :key="dialogType" :visible.sync="isShowDialog" width="80%"
        <el-dialog title="新建消息" :destroy-on-close="true" :key="dialogTypeOne" :visible.sync="isShowDialog" width="80%"
          :before-close="handleConfirmClose">
          <MyCreate @closeMyDialog="closeDialog" :type="dialogType"></MyCreate>
        </el-dialog>
@@ -258,7 +258,8 @@
          columnName: "短信",
        },
      ],
      dialogType: "",
      dialogType: "1",
      dialogTypeOne:'2'
    };
  },
  created() {

 src/views/operate/writManager/writ/index.vue

@@ -187,6 +187,7 @@
    },
    handleDelete(row) {
      this.$confirm("确认删除？").then((_) => {
        console.log(row)
        this.deleteWrit(row.baseCaseId).then((res) => {
          this.$message({
            type: "success",