版本管理

ffe23bbc · zhuzhequan · afaf5631 · ffe23bbc · ffe23bbc · ffe23bbc
Commit ffe23bbc authored Aug 28, 2024 by zhuzhequan
Show whitespace changes
Inline Side-by-side

Showing with 101 additions and 48 deletions

src/common/api/production/assistantManage.js
+3 -3

src/main.js
+3 -1

src/views/production/AssistantManage.vue
+94 -43

src/views/taskManage/index.vue
+1 -1

No files found.
--- a/src/common/api/production/assistantManage.js
+++ b/src/common/api/production/assistantManage.js
 import axios from '../axios'
 export function erpProductionAssistantManage(data) {
-  return axios.post('/erpProductionAssistantManage/uploadToLocal', data, {
+  return axios.post('/erpAppManage/uploadToLocal', data, {
    headers: {
      'Content-Type': 'multipart/form-data'
    }
@@ -9,9 +9,9 @@ export function erpProductionAssistantManage(data) {
 }
 export function erpProductionAssistantManageListPage(data) {
-  return axios.post('/erpProductionAssistantManage/list_page', data)
+  return axios.post('/erpAppManage/list_page', data)
 }
 export function deleteErpProductionAssistantManage(data) {
-  return axios.get('/erpProductionAssistantManage/delete?ids=' + data)
+  return axios.get('/erpAppManage/delete?ids=' + data)
 }
--- a/src/main.js
+++ b/src/main.js
@@ -4,7 +4,9 @@ import router from './router'
 import store from './store'
 import './plugins/myui'
 import element from '@/common/components/element-ui.js'
-import vxeTable from '@/common/components/vxeTable.js'
+import vxeTable from 'vxe-table'
+import 'xe-utils'
+import 'vxe-table/lib/index.css'
 import './common/style/index.scss'
 import './assets/css/common.css'
 import Directives from './utils/directives'

--- a/src/views/production/AssistantManage.vue
+++ b/src/views/production/AssistantManage.vue
@@ -41,7 +41,7 @@
      </el-pagination>
    </div>
    <el-dialog
-      title="新增"
+      :title="editForm.id?'编辑':'新增'"
      :visible.sync='dialogVisible'
      :close-on-click-modal='false'
      :before-close='beforeClose'
@@ -64,28 +64,37 @@
        <el-form-item prop="version" label="版本号">
          <el-input class="item_width" v-model="editForm.version" placeholder="请输入版本号"></el-input>
        </el-form-item>
-        <el-form-item prop="forcedUpdate" label="是否强制更新">
+        <div class="el-row" style="width: 100%;">
+          <el-form-item class="el-col-11" prop="forcedUpdate" label="是否强制更新">
            <el-radio-group class="item_width" v-model="editForm.forcedUpdate">
              <el-radio :label="0">否</el-radio>
              <el-radio :label="1">是</el-radio>
            </el-radio-group>
          </el-form-item>
+          <el-form-item class="el-col-11" prop="fullUpdate" label="是否全量更新">
+            <el-radio-group class="item_width" v-model="editForm.fullUpdate">
+              <el-radio :label="0">否</el-radio>
+              <el-radio :label="1">是</el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </div>
        <!-- 上传多个app文件 -->
-        <el-form-item label="上传文件">
+        <el-form-item required class="el-col-24" label="上传文件">
          <!-- accept=".apk,.ipa" -->
          <el-upload
            action
            :http-request="handleCustom"
+            :limit="1"
+            :multiple="false"
            :on-change="handleChange"
            :on-remove="handleRemove"
            :file-list="fileList"
            list-type="text"
          >
-          <div class="upload-file">
+            <el-button type="primary">
-            <el-button class="el-upload">
+              上传文件
-                <i class="el-icon-plus"></i>
            </el-button>
-          </div>
          </el-upload>
        </el-form-item>
      </el-form>
@@ -107,12 +116,16 @@
 </template>
 <script>
 import tableView from '@/common/components/base/tableView.vue'
-import { erpProductionAssistantManage, erpProductionAssistantManageListPage, deleteErpProductionAssistantManage } from '../../common/api/production/assistantManage'
+import {
+  erpProductionAssistantManage,
+  erpProductionAssistantManageListPage,
+  deleteErpProductionAssistantManage
+} from '../../common/api/production/assistantManage'
 export default {
  name: 'saasMenu',
  components: {
-    tableView,
+    tableView
  },
  data() {
    return {
@@ -124,13 +137,19 @@ export default {
        title: '',
        content: '',
        forcedUpdate: 0,
+        fullUpdate: 1
        // businessType: 'production_assistant'
      },
      fileList: [],
      rules: {
        // 自定义版本号的校验规则
        version: [
-          { required: true, message: '请输入版本号', trigger: 'blur' },
+          {
+            required: true,
+            message: '请输入版本号',
+            trigger: 'blur'
+          },
          {
            validator: (rule, value, callback) => {
              if (!/^\d+\.\d+\.\d+$/.test(value)) {
@@ -139,19 +158,34 @@ export default {
                callback()
              }
            },
-            trigger: 'blur',
+            trigger: 'blur'
-          },
+          }
        ],
        title: [
-          { required: true, message: '请输入更新标题', trigger: 'blur' },
+          {
+            required: true,
+            message: '请输入更新标题',
+            trigger: 'blur'
+          }
        ],
-        content: [
+        thirdWarehouseType: [
-          { required: true, message: '请输入更新内容', trigger: 'blur' },
+          {
+            required: true,
+            message: '请选择更新类型',
+            trigger: 'change'
+          }
        ],
+        content: [
+          {
+            required: true,
+            message: '请输入更新内容',
+            trigger: 'blur'
+          }
+        ]
      },
      total: 1,
      currentPage: 1,
-      pageSize: 10,
+      pageSize: 10
    }
  },
  computed: {
@@ -160,7 +194,7 @@ export default {
        {
          label: '更新标题',
          key: 'title',
-          width: '',
+          width: ''
        },
        {
          label: '版本号',
@@ -170,7 +204,7 @@ export default {
        {
          label: '更新内容',
          key: 'content',
-          width: '',
+          width: ''
        },
        {
          label: ' 是否强制更新',
@@ -191,23 +225,22 @@ export default {
        {
          label: '操作',
          key: '',
-          width: '80',
+          width: '120',
          // align: 'left',
          render: item => (
            <div>
-              <el-button
+               <span title="删除" class="icon-view ">
-                size='mini'
+                <i
-                type='text'
+                  style="color:#F56C6C"
-                class="edit"
+                  class="el-icon-delete"
                  onClick={() => this.remove(item)}
-              >
+                ></i>
-                删除
+              </span>
-              </el-button>
            </div>
-          ),
+          )
-        },
+        }
      ]
-    },
+    }
  },
  created() {
    this.getProductionAssistantList()
@@ -216,9 +249,13 @@ export default {
    async getProductionAssistantList() {
      this.loading = true
      try {
-        const { data: erpProductionAssistantManageRes, code } = await erpProductionAssistantManageListPage({
+        const {
+          data: erpProductionAssistantManageRes,
+          code
+        } = await erpProductionAssistantManageListPage({
          currentPage: this.currentPage,
-          pageSize: this.pageSize,
+          businessType: 'production_assistant',
+          pageSize: this.pageSize
        })
        if (code === 200) {
          console.log('erpProductionAssistantManageRes:>>', erpProductionAssistantManageRes)
@@ -236,7 +273,7 @@ export default {
      if (deleteProductionRes.code === 200) {
        this.$message({
          type: 'success',
-          message: '删除成功!',
+          message: '删除成功!'
        })
        setTimeout(() => {
          this.getProductionAssistantList()
@@ -282,20 +319,23 @@ export default {
          if (this.fileList?.length === 0) {
            return this.$message({
              type: 'warning',
-              message: '请上传文件!',
+              message: '请上传文件!'
            })
          }
-          const productionAssistantParams = this.formFile(this.fileList, { ...this.editForm, businessType: 'production_assistant' })
+          const productionAssistantParams = this.formFile(this.fileList, {
+            ...this.editForm,
+            businessType: 'production_assistant'
+          })
          try {
            const res = await erpProductionAssistantManage(productionAssistantParams)
            console.log('提交表单:>>> ', res, '\nproductionAssistantParams:>>', productionAssistantParams)
            if (res.code === 200) {
              this.$message({
                type: 'success',
-                message: '保存成功!',
+                message: '保存成功!'
              })
              this.resetForm()
-              this.getProductionAssistantList()
+              await this.getProductionAssistantList()
              this.dialogVisible = false
            }
          } catch (error) {
@@ -312,16 +352,16 @@ export default {
      this.$confirm('是否删除该数据', '提示', {
        confirmButtonText: '确定',
        cancelButtonText: '取消',
-            type: 'warning',
+        type: 'warning'
      }).then(() => {
        this.deleteProductionAssistant(id)
      })
    },
    handleCustom(file) {
-      this.$message({
+      // this.$message({
-        type: 'success',
+      //   type: 'success',
-        message: '上传成功!',
+      //   message: '上传成功!'
-      })
+      // })
    },
    handleChange(file, fileList) {
      this.fileList = fileList
@@ -334,6 +374,11 @@ export default {
      }
      return isLt2M
    },
+    update(row) {
+      this.editForm = row
+      this.dialogVisible = true
+      console.log(row)
+    },
    handleRemove(file, fileList) {
      this.fileList = fileList
    },
@@ -344,8 +389,8 @@ export default {
    onCurrentChange(currentPage) {
      this.currentPage = currentPage
      this.getProductionAssistantList()
-    },
+    }
-  },
+  }
 }
 </script>
 <style lang='scss' scoped>
@@ -355,13 +400,16 @@ export default {
  flex-direction: column;
  padding: 10px 20px 0;
  overflow: hidden;
  .item_width {
    width: 220px;
  }
  .title_width {
    display: flex;
  }
 }
 .table-wrap {
  background: #fff;
  flex: 1;
@@ -371,11 +419,13 @@ export default {
 .system-menu:deep() .el-form-item__content {
  flex: 1;
 }
 .radioGroup {
  .el-radio {
    margin-right: 15px !important;
  }
 }
 .edit {
  color: #fff; /* 字体颜色 */
  background-color: #409EFF; /* 背景颜色 */
@@ -395,6 +445,7 @@ export default {
    background-color: #fff;
    border: 1px dashed #d9d9d9;
  }
  :deep() .el-button {
    font-size: 28px;
    color: #8c939d;

--- a/src/views/taskManage/index.vue
+++ b/src/views/taskManage/index.vue
@@ -861,7 +861,7 @@ export default {
  },
  data() {
    const userInfo = localStorage.getItem('user')
-    var validatePass2 = (rule, value, callback) => {
+    const validatePass2 = (rule, value, callback) => {
      const start = new Date(value)
      if (!value) {
        callback(new Error('请选择预计完成时间'))