按照git合并武汉代码

src/components/FittingsModal/index.vue

@@ -104,6 +104,15 @@ export default {
       this.getAircraftsByCode()
     },
     select(row) {
+      // debugger
+      // if (row.healthStatus == '故障') {
+      //   this.$message({
+      //     type: 'error',
+      //     message: '请选择非故障飞机!'
+      //   })
+      //   //this.fittingsVisible = false
+      //   return false
+      // }
       this.$emit('select', row)
       this.fittingsVisible = false
     }

src/components/MissionDetail/index.vue

@@ -9,10 +9,10 @@
       <el-descriptions-item label="任务类型">{{ detail.taskType }}</el-descriptions-item>
       <el-descriptions-item label="任务飞机数量">{{ detail.taskAircraftNum }}</el-descriptions-item>
       <el-descriptions-item label="任务地点">{{ detail.taskSite }}</el-descriptions-item>
-      <el-descriptions-item label="任务描述">{{ detail.taskDescribe }}</el-descriptions-item>
       <el-descriptions-item label="带队领导">{{ detail.teamLeader }}</el-descriptions-item>
       <el-descriptions-item label="转场形式">{{ detail.transferModality }}</el-descriptions-item>
       <el-descriptions-item label="飞行次数">{{ detail.flyingSession }}</el-descriptions-item>
+      <el-descriptions-item label="任务描述">{{ detail.taskDescribe }}</el-descriptions-item>
     </el-descriptions>
   </div>
 </template>

src/components/aviationMaterialsModal/index.js

@@ -25,7 +25,7 @@ export const dialogColumns = (_this) => [
   },
   {
     prop: 'avmatCatalogCode',
-    label: '航材编号'
+    label: '航材编码'
   },
   {
     prop: 'specification',

src/views/basicData/dataAircraftCataloging/index.js

@@ -48,7 +48,7 @@ export const columns = (_this) => [
     prop: 'status',
     label: '状态',
     render: (h, params) => {
-      if (params.row.status == 1) {
+      if (params.row.status == 0) {
         return h('span', { class: 'success-state' }, '服役')
       } else {
         return h('span', { class: 'warning-state' }, '退役')

src/views/basicData/dataAircraftCataloging/index.vue

@@ -27,8 +27,8 @@
         <LTable ref="table" @selection-change="selection" :defaultFetch="false" :fetch="fetch" :columns="columns" :dataSource="tableData" :options="options" :pagination="tableRequset"></LTable>
       </div>
       <el-dialog :title="dialogTitle" :visible.sync="dialogVisible" width="600px" :before-close="handleClose">
-        <el-form ref="form" :model="form" label-width="80px">
-          <el-form-item label="飞机编号">
+        <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+          <el-form-item label="飞机编号" prop="aircaftCatalogCode">
             <el-input v-model="form.aircaftCatalogCode"></el-input>
           </el-form-item>
           <el-form-item label="机械师">
@@ -52,7 +52,7 @@
           <el-form-item label="生产厂家">
             <el-input v-model="form.manufacturer"></el-input>
           </el-form-item>
-          <el-form-item label="生厂编号">
+          <el-form-item label="生产编号">
             <el-input v-model="form.factoryNumber"></el-input>
           </el-form-item>
           <el-form-item label="状态">
@@ -125,6 +125,15 @@ export default {
         factoryNumber: '',
         status: ''
       },
+      rules: {
+        aircaftCatalogCode: [
+          {
+            required: true,
+            message: '请输入飞机编号',
+            trigger: 'blur'
+          }
+        ]
+      },
       debounceFn: debounce(this.fetch, 500)
     }
   },
@@ -265,16 +274,22 @@ export default {
     },
 
     submit() {
-      switch (this.dialogTitle) {
-        case '编辑':
-          this.updateAircaftCatalogAPI()
-          this.handleClose()
-          break
-        case '新增':
-          this.addAircaftCatalogAPI()
-          this.handleClose()
-          break
-      }
+      this.$refs.form.validate((valid) => {
+        if (valid) {
+          switch (this.dialogTitle) {
+            case '编辑':
+              this.updateAircaftCatalogAPI()
+              this.handleClose()
+              break
+            case '新增':
+              this.addAircaftCatalogAPI()
+              this.handleClose()
+              break
+          }
+        } else {
+          return false
+        }
+      })
     },
 
     selection(val) {

src/views/basicData/dataEnvironment/index.js

@@ -39,7 +39,11 @@ export const modalConfig = (_this) => ({
   itemStyle: { padding: '10px' },
   width: '600px', // 弹框宽度
   rules: {
-    factor: [{ validator: validatePass, trigger: 'blur' }]
+    env: [{ required: true, message: '请输入环境因子名称', trigger: 'blur' }],
+    factor: [
+      { required: true, message: '请输入环境因子值', trigger: 'blur' },
+      { validator: validatePass, trigger: 'blur' }
+    ]
   }
 })
 

src/views/basicData/dataEnvironment/src/regularitiesChoose.vue

@@ -2,7 +2,7 @@
   <div class="index">
     <el-dialog :title="dialogTitle" :visible.sync="regularitiesChooseVisible" width="600px" :before-close="closeModal">
       <el-form ref="form" :model="activeRow" :rules="rules" label-width="80px">
-        <el-form-item label="航材名称">
+        <el-form-item label="航材名称" prop="avmatCatalogName">
           <el-input v-model="activeRow.avmatCatalogName" disabled>
             <el-button type="primary" @click="openFittingsModal" slot="append" :disabled="dialogType !== 'add'">选择</el-button>
           </el-input>
@@ -75,6 +75,7 @@ export default {
         factor: this.$route.params.value
       },
       rules: {
+        avmatCatalogName: [{ required: true, message: '请选择航材名称', trigger: 'blur' }],
         factor: [{ validator: validatePass, trigger: 'blur' }]
       },
       dialogTitle: '新增',

src/views/basicData/dataEnvironment/suitableSpareParts.vue

@@ -6,7 +6,7 @@
         <el-button type="warning" @click="handleDelete(tableCheckItems)" :disabled="tableCheckItems.length == 0">删除</el-button>
       </div>
       <div class="common-box-search">
-        <el-input placeholder="请输入环境因子名称" v-model="searchValue" class="input-with-select" @keyup.enter.native="fetchTableData">
+        <el-input placeholder="请输入航材名称/航材编号" v-model="searchValue" class="input-with-select" @keyup.enter.native="fetchTableData">
           <el-button slot="append" icon="el-icon-search" @click="fetchTableData"></el-button>
         </el-input>
       </div>
@@ -50,7 +50,7 @@ export default {
       const { pageIndex: pageNum, pageSize } = this.pagination
       const {
         data: { list, total }
-      } = await queryTEnvFactorDetails({ envFactorId: id, pageNum, pageSize })
+      } = await queryTEnvFactorDetails({ envFactorId: id, pageNum, pageSize, searchValue: this.searchValue })
       this.tableData = list
       this.pagination.total = total
     },

src/views/basicData/dataSailingMaterialClassification/index.vue

@@ -3,7 +3,7 @@
     <div class="common-box">
       <div class="common-box-button">
         <el-button type="success" @click="handleAdd">新增</el-button>
-        <el-button type="warning" @click="remove(removeArr)">删除</el-button>
+        <el-button type="warning" @click="handRemove(removeArr)">删除</el-button>
         <el-dropdown split-button type="primary" style="margin-left: 10px" trigger="click" @command="handleExport">
           更多
           <el-dropdown-menu slot="dropdown">
@@ -135,22 +135,28 @@ export default {
       this.activeRow = deepClone(row)
       this.dialogVisible = true
     },
-    handRemove(row) {
-      this.$confirm('是否确认删除该数据', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      })
-        .then(async () => {
-          const { code } = await removeAvmatCategories([row.avmatCategoriesId])
-          if (code == 200) {
-            this.$message({
-              type: 'success',
-              message: '删除成功!'
-            })
-          }
+    async handRemove(rows) {
+      const deleterows = Array.isArray(rows) ? rows : [rows]
+      if (deleterows.length === 0) {
+        this.$message.warning('请选择要删除的数据')
+        return
+      }
+      const ids = deleterows.map((row) => row.avmatCategoriesId)
+      try {
+        await this.$confirm('是否确认删除选中的数据', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
         })
-        .catch(() => {})
+        const { code } = await removeAvmatCategories(ids)
+        if (code == 200) {
+          this.$message({
+            type: 'success',
+            message: '删除成功!'
+          })
+          await this.fetchTableData()
+        }
+      } catch (error) {}
     },
     // 全选
     selectAll(data) {

src/views/basicData/dataSailingMaterialMaterialCoding/index.js

@@ -59,6 +59,12 @@ export const modalConfig = (_this) => ({
       colLayout: { span: 12 }
     }
   ],
+  rules: {
+    avmatCatalogName: [{ required: true, message: '请输入航材名称', trigger: 'blur' }],
+    avmatCatalogCode: [{ required: true, message: '请输入航材编码', trigger: 'blur' }],
+    unit: [{ required: true, message: '请输入计量单位', trigger: 'blur' }],
+    avmatCategoriesName: [{ required: true, message: '请选择所属分类', trigger: 'blur' }]
+  },
   labelWidth: '80px',
   itemStyle: { padding: '10px' },
   width: '680px' // 弹框宽度
@@ -102,7 +108,7 @@ export const columns = (_this) => [
     prop: 'isRepairable',
     label: '是否可修',
     render: (h, params) => {
-      if (params.row.status == 1) {
+      if (params.row.isRepairable == 1) {
         return h('span', { class: 'success-state' }, '是')
       } else {
         return h('span', { class: 'warning-state' }, '否')
@@ -136,9 +142,9 @@ export const columns = (_this) => [
     label: '是否进口',
     render: (h, params) => {
       if (params.row.isImported == 1) {
-        return h('span', { class: 'theme-state' }, '进口')
+        return h('span', { class: 'success-state' }, '是')
       } else {
-        return h('span', { class: 'success-state' }, '国产')
+        return h('span', { class: 'warning-state' }, '否')
       }
     }
   },

src/views/basicData/dataSailingMaterialMaterialCodingAviation/index.js

@@ -58,6 +58,12 @@ export const modalConfig = (_this) => ({
       colLayout: { span: 12 }
     }
   ],
+  rules: {
+    avmatCatalogName: [{ required: true, message: '请输入航材名称', trigger: 'blur' }],
+    avmatCatalogCode: [{ required: true, message: '请输入航材编码', trigger: 'blur' }],
+    unit: [{ required: true, message: '请输入计量单位', trigger: 'blur' }],
+    avmatCategoriesName: [{ required: true, message: '请选择所属分类', trigger: 'blur' }]
+  },
   labelWidth: '80px',
   itemStyle: { padding: '10px' },
   width: '680px' // 弹框宽度
@@ -72,7 +78,8 @@ export const modalConfig = (_this) => ({
 export const columns = (_this) => [
   {
     prop: 'avmatCatalogName',
-    label: '航材名称'
+    label: '航材名称',
+    align: 'left'
   },
   {
     prop: 'avmatCatalogCode',
@@ -103,9 +110,9 @@ export const columns = (_this) => [
     label: '是否可修',
     render: (h, params) => {
       if (params.row.isRepairable == 1) {
-        return h('span', { class: 'success-state' }, '可修')
+        return h('span', { class: 'success-state' }, '是')
       } else {
-        return h('span', { class: 'warning-state' }, '不可修')
+        return h('span', { class: 'warning-state' }, '否')
       }
     }
   },
@@ -136,9 +143,9 @@ export const columns = (_this) => [
     label: '是否进口',
     render: (h, params) => {
       if (params.row.isImported == 1) {
-        return h('span', { class: 'success-state' }, '进口')
+        return h('span', { class: 'success-state' }, '是')
       } else {
-        return h('span', { class: 'warning-state' }, '国产')
+        return h('span', { class: 'warning-state' }, '否')
       }
     }
   },

src/views/basicData/dataSailingMaterialMaterialCodingAviation/index.vue

@@ -64,6 +64,7 @@ export default {
     return {
       nodeKey: 'avmatCategoriesId',
       currentNodeValue: '',
+      currentNode: null,
       menuTreeData: [],
       treeObj: {
         title: '所属分类',
@@ -112,6 +113,7 @@ export default {
     treeNodeClick(node) {
       this.searchValue = ''
       this.currentNodeValue = node[this.nodeKey]
+      this.currentNode = node
       this.fetchTableData()
     },
 
@@ -189,7 +191,9 @@ export default {
           isRepairable: 1,
           isCompleteSet: 1,
           isOrdered: 1,
-          isImported: 1
+          isImported: 1,
+
+          ...(this.currentNode ? { avmatCategoriesName: this.currentNode.avmatCategoriesName } : {})
         },
         title: '新增'
       }

src/views/basicData/dataType/index.vue

@@ -91,6 +91,7 @@ export default {
         aircaftTypeName: [{ required: true, message: '请输入机种名称', trigger: 'blur' }],
         aircaftTypeCode: [{ required: true, message: '请输入机种编号', trigger: 'blur' }],
         number: [
+          { required: true, message: '请输入显示序号', trigger: 'blur' },
           {
             validator: validInt,
             trigger: 'change'

src/views/carrierStandard/carrierComputationalModel/index.vue

@@ -53,15 +53,15 @@
     </div>
 
     <el-dialog v-if="dialogVisible" :title="dialogTile" :visible.sync="dialogVisible" width="1000px" :before-close="handleClose">
-      <el-form ref="form" :model="activeRow" label-width="100px">
+      <el-form ref="form" :model="activeRow" :rules="rules" label-width="100px">
         <el-row>
           <el-col :span="24">
-            <el-form-item label="公式名称">
+            <el-form-item label="公式名称" prop="formulaName">
               <el-input v-model="activeRow.formulaName"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="24">
-            <el-form-item label="公式"><MathJax ref="MathJax" :formula="activeRow.formulaUse" /> </el-form-item>
+          <el-col :span="24" prop="formulaUse">
+            <el-form-item label="公式" prop="formulaUse"><MathJax ref="MathJax" :formula="activeRow.formulaUse" /> </el-form-item>
           </el-col>
           <el-col :span="24">
             <el-form-item label="参数">
@@ -154,6 +154,22 @@ export default {
       },
       columns: columns(this),
       options,
+      rules: {
+        formulaName: [
+          {
+            required: true,
+            message: '请输入公式名称',
+            trigger: 'blur'
+          }
+        ],
+        formulaUse: [
+          {
+            required: true,
+            message: '请编辑公式',
+            trigger: 'blur'
+          }
+        ]
+      },
       calculationModelId: null,
       foucsRow: null
     }
@@ -166,6 +182,7 @@ export default {
       addFormula(item, this)
     },
     async handleClick() {
+      await this.$refs.form.validate()
       if (this.dialogTile == '编辑公式') {
         let postData = {
           formulaName: this.activeRow.formulaName,
@@ -194,6 +211,7 @@ export default {
           this.activeRow.formulaUse = ''
         }
       }
+
       this.calculationModelId = null
     },
     async getTableData(searchValue) {

src/views/carrierStandard/carrierListShipping/components/primaryData/index.vue

@@ -15,7 +15,7 @@
         </div>
         <div class="view-AerospaceCompileLineList-right-btn-right">
           <el-input placeholder="请输入内容" v-model="searchValue" class="input-with-select">
-            <el-button slot="append" icon="el-icon-search"></el-button>
+            <el-button slot="append" @click="fetchTableData()" icon="el-icon-search"></el-button>
           </el-input>
         </div>
       </div>

src/views/carrierStandard/carrierSailingMaterialConsumeRecord/warehousingRecord.js

@@ -53,7 +53,7 @@ export const columns = (_this) => [
         round: false,
         plain: false,
         onClick: (row, index, scope) => {
-          _this.handRemove(row)
+          _this.handleDelete(row)
         }
       },
       {

src/views/carrierStandard/carrierSailingMaterialConsumeRecord/warehousingRecord.vue

@@ -112,23 +112,28 @@ export default {
       this.pagination.total = totalCount
     },
 
-    handleDelete(params) {
-      this.$confirm('是否确认删除该数据', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      })
-        .then(async () => {
-          const { success } = await removeWarehousingRecord(params.map((e) => e.warehousingRecordId))
-          if (success) {
-            this.$message({
-              type: 'success',
-              message: '操作成功!'
-            })
-          }
-          this.fetchTableData()
+    async handleDelete(rows) {
+      const deleterows = Array.isArray(rows) ? rows : [rows]
+      if (deleterows.length === 0) {
+        this.$message.warning('请选择要删除的数据')
+        return
+      }
+      const ids = deleterows.map((row) => row.warehousingRecordId)
+      try {
+        await this.$confirm('是否确认删除选中的数据', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
         })
-        .catch(() => {})
+        const { code } = await removeWarehousingRecord(ids)
+        if (code == 200) {
+          this.$message({
+            type: 'success',
+            message: '删除成功!'
+          })
+          await this.fetchTableData()
+        }
+      } catch (error) {}
     },
 
     // 单选

src/views/carrierStandard/carrierSailingMaterialConsumeRegularities/components/index.vue

@@ -1,8 +1,8 @@
 <template>
   <div class="index">
     <el-dialog :title="dialogTitle" :visible.sync="dialogVisible" width="600px" :before-close="closeDialog">
-      <el-form ref="form" :model="activeRow" label-width="80px">
-        <el-form-item label="航材名称">
+      <el-form ref="form" :model="activeRow" :rules="rules" label-width="80px">
+        <el-form-item label="航材名称" prop="avmatCatalogName">
           <el-input v-model="activeRow.avmatCatalogName" disabled>
             <el-button type="primary" @click="openFittingsModal" slot="append">选择</el-button>
           </el-input>
@@ -13,10 +13,10 @@
         <el-form-item label="所属分类">
           <el-input v-model="activeRow.avmatCategoriesCodeName" disabled></el-input>
         </el-form-item>
-        <el-form-item label="MTBF">
+        <el-form-item label="MTBF" prop="mtbf">
           <el-input v-model="activeRow.mtbf"></el-input>
         </el-form-item>
-        <el-form-item label="寿命单位">
+        <el-form-item label="寿命单位" prop="LifeUnit">
           <el-select v-model="activeRow.LifeUnit" placeholder="">
             <el-option v-for="item in monadOptions" :key="item.dictValue" :label="item.dictLabel" :value="item.dictValue"> </el-option>
           </el-select>
@@ -78,7 +78,12 @@ export default {
         pageSize: 20,
         searchValue: ''
       },
-      avmatCategoriesId: ''
+      avmatCategoriesId: '',
+      rules: {
+        avmatCatalogName: [{ required: true, message: '航材名称不能为空', trigger: 'blur' }],
+        mtbf: [{ required: true, message: 'MTBF不能为空', trigger: 'blur' }],
+        LifeUnit: [{ required: true, message: '寿命单位不能为空', trigger: 'blur' }]
+      }
     }
   },
 
@@ -132,7 +137,13 @@ export default {
     },
 
     handleRegularities() {
-      this.$emit('handleRegularities', { type: this.dialogType, params: deepClone(this.activeRow) })
+      this.$refs['form'].validate(async (valid) => {
+        if (valid) {
+          this.$emit('handleRegularities', { type: this.dialogType, params: deepClone(this.activeRow) })
+        } else {
+          return false
+        }
+      })
     },
 
     openFittingsModal() {

src/views/carrierStandard/carrierUseRegistration/components/look/index.vue

@@ -26,6 +26,7 @@
           <el-table-column prop="purchasePrice" label="单价（元）" align="center"> </el-table-column>
           <el-table-column prop="applyForNum" label="申请总数量" align="center"> </el-table-column>
           <el-table-column prop="stockRemovalNum" label="出库总数量" align="center"> </el-table-column>
+          <el-table-column prop="usedNum" label="已使用总数量" align="center"> </el-table-column>
         </el-table>
         <el-pagination
           background

src/views/task/carrierFlightMission/components/aircraft/index.vue

@@ -86,6 +86,11 @@ export default {
   mounted() {
     this.getAircraftList()
   },
+  watch: {
+    $route() {
+      this.getAircraftList()
+    }
+  },
   methods: {
     fittingsModalSelect(row) {
       this.tableData[this.activeIndex].aircaftModelName = row.aircaftModelName