Merge branch 'dev' of http://94.191.100.41/tfmom/tf-mom-web into dev

applications/architecture-dee/src/commonComponents/components/GeneralUserSelect/index.vue

@@ -19,7 +19,7 @@
       <el-option
         v-for="citem in UserData"
         :key="citem.id"
-        :label="citem.name"
+        :label="citem.name+'('+citem.userAccount+')'"
         :value="basicData.subTypeName==='ScrapNoticeDoc'?`${citem.name}(${citem.userAccount})`:citem.id"
       />
     </el-select>
@@ -27,7 +27,8 @@
 </template>
 
 <script>
-import { getUsersByAccount, getFuzzyMatchUser } from '@/api/user'
+import { getFuzzyMatchUser } from '@/api/user'
+import { post } from '@/utils/http'
 import config from './config'
 export default {
   name: 'GeneralUserSelect',
@@ -157,14 +158,63 @@ export default {
             })
         } else {
           // 针对非审计页面查人
-          const params = { userAccount: query, containInnerUser: this.item.containInnerUse || false }
+          // const params = { userAccount: query, containInnerUser: this.item.containInnerUse || false }
+          // if (this.item.secret) {
+          //   params.secretCode = this.$store.state.user.userInfo.secretCode
+          // }
+          const params = {
+            'pageFrom': 1,
+            'pageSize': 200,
+            'openProps': [],
+            'sortItem': [
+              {
+                'fieldName': 'modifyTime',
+                'sortOrder': 'desc'
+              }
+            ],
+            'searchItems': {
+              'operator': 'AND',
+              'children': [
+                {
+                  'items': [
+                    {
+                      'fieldName': 'userAccount',
+                      'operator': 'LIKE',
+                      'value': query
+                    },
+                    {
+                      'fieldName': 'name',
+                      'operator': 'LIKE',
+                      'value': query
+                    }
+                  ],
+                  'operator': 'OR'
+                },
+                {
+                  'items': [
+                    {
+                      'fieldName': 'enableFlag',
+                      'operator': 'EQ',
+                      'value': true
+                    }
+                  ],
+                  'operator': 'AND'
+                }
+              ]
+            }
+          }
           if (this.item.secret) {
-            params.secretCode = this.$store.state.user.userInfo.secretCode
+            // params.secretCode = this.$store.state.user.userInfo.secretCode
+            params.searchItems.items.push({
+              'fieldName': 'secretCode',
+              'operator': 'EQ',
+              'value': this.$store.state.user.userInfo.secretCode
+            },)
           }
           this.loading = true
-          getUsersByAccount(params)
+          post('/DxUserInfo/search', params)
             .then(res => {
-              this.UserData = res.items ? res.items : []
+              this.UserData = res.items && res.items.content ? res.items.content : []
             })
             .finally(() => {
               this.loading = false

applications/dee-mes/src/privateComponents/components/ExtPositionUserLink/index.vue

@@ -81,6 +81,23 @@ export default {
         if (this.item.secret) {
           params.secretCode = this.$store.state.user.userInfo.secretCode
         }
+        let subTypeName = ''
+        switch (this.item.title) {
+          case '计划员':
+            subTypeName = 'PositionPlanner'
+            break
+          case '工程师':
+            subTypeName = 'PositionEngineer'
+            break
+          case '站位长':
+            subTypeName = 'ExtPositionUserLink'
+            break
+          case '准备工':
+            subTypeName = 'PropareLink'
+            break
+          default:
+            break
+        }
         getUsersByAccount(params).then(res => {
           const arr = []
           this.bindValue.forEach(item => {
@@ -97,7 +114,7 @@ export default {
                 disabled: element.disabled,
                 target: element,
                 targetId: element.id,
-                subTypeName: this.basicData && this.basicData.propareLinks && this.basicData.propareLinks[0] && this.basicData.propareLinks[0].subTypeName || ''
+                subTypeName: this.basicData && this.basicData.propareLinks && this.basicData.propareLinks[0] && this.basicData.propareLinks[0].subTypeName || this.basicData.extPositionUserLinks && this.basicData.extPositionUserLinks[0] && this.basicData.extPositionUserLinks[0].subTypeName || subTypeName || ''
               }
             })
           } else {

applications/dee-mes/src/views/assemblyPlanManagement/stationPlanMaintenance/index.vue

@@ -36,7 +36,7 @@
                 :lay-config="layConfig"
                 @row-click="rowClick"
               /> -->
-              <stationPlanList @getMissData="getMissData" />
+              <stationPlanList :state-options="stateOptions" @getMissData="getMissData" />
             </div>
           </template>
           <template slot="paneR">

applications/dee-mes/src/views/assemblyPlanManagement/stationPlanMaintenance/stationPlanList.vue

@@ -83,12 +83,20 @@
               <dee-as-com
                 ref="detailComSI2"
                 :key="layConfig2.typeName"
+                :basic-data="{stateOptions}"
                 :lay-config="layConfig2"
                 table-height="calc(100vh - 200px)"
                 @row-click="rowClick"
               />
             </div>
           </dee-tab>
+          <span v-if="areaUpdatingLists[form.sorties]==='Y'" class="areaUpdateTip">
+            <i class="el-icon-warning" />
+            <span>温馨提示: </span>
+            <span class="tipInfo">
+              当前架次下区域正在更新中......
+            </span>
+          </span>
         </div>
       </template>
     </dee-fold-pane>
@@ -99,6 +107,14 @@
 import { post } from '@/utils/http'
 export default {
   name: 'StationPlanList',
+  props: {
+    stateOptions: {
+      type: Array,
+      default: () => {
+        return []
+      }
+    }
+  },
   data() {
     return {
       keyword: '',
@@ -169,7 +185,8 @@ export default {
       },
       activeTab: '0',
       activeNodeData: {},
-      currentNodekey: ''
+      currentNodekey: '',
+      areaUpdatingLists: {}
     }
   },
   watch: {
@@ -388,7 +405,9 @@ export default {
                 res.items.content.unshift(res.items.content.splice(index, 1)[0])
               }
             })
+            this.areaUpdatingLists = {}
             this.sortiesData = res.items.content.map((row) => {
+              this.areaUpdatingLists[row.id] = row.areaUpdating
               return {
                 value: row.id,
                 label: row.defName
@@ -771,8 +790,15 @@ export default {
   }
  }
  .right-container {
+  position: relative;
   //  width: 82%;
    margin-left: 20px;
+   .areaUpdateTip{
+    position: absolute;
+    top: 20px;
+    right: 40px;
+      color: #ff0000;
+   }
  }
 }
 </style>

applications/dee-mes/src/views/taskExecution/components/ProblemDeclare/index.vue

@@ -120,12 +120,11 @@
             />
           </el-form-item>
         </el-row>
-        <el-row>
+        <!-- <el-row>
           <el-form-item label="站位长/站位计划员/站位工程师" prop="receiver" label-width="250px">
-            <!-- <DxUserSelect /> -->
             <GeneralUserSelect v-model="form.receiver" :item="{multiple:true}" />
           </el-form-item>
-        </el-row>
+        </el-row> -->
       </el-form>
       <span slot="footer" class="dialog-footer">
         <el-button
@@ -327,10 +326,10 @@ export default {
           res.forEach(item => {
             result.push({ operator: 'ADD', target: item })
           })
-          var receiver = ''
-          this.form.receiver.forEach((item, i) => {
-            receiver += (item + (this.form.receiver.length - 1 > i ? ',' : ''))
-          })
+          // var receiver = ''
+          // this.form.receiver.forEach((item, i) => {
+          //   receiver += (item + (this.form.receiver.length - 1 > i ? ',' : ''))
+          // })
           const params = {
             operator: 'ADD',
             subTypeName: 'SpotProblem',
@@ -347,7 +346,7 @@ export default {
             airModel: this.form.airModel,
             sorties: this.form.sorties,
             standPosition: this.form.standPosition,
-            receiver: receiver,
+            // receiver: receiver,
             objFileLinks: result
 
           }

applications/dee-mes/src/views/taskExecution/index.vue

@@ -537,12 +537,14 @@
     <el-drawer
       v-if="drawerShowExperimentAdd"
       title="试验申请"
-      size="50%"
+      class="DeeDrawerCmp"
+      size="70%"
       append-to-body
       :before-close="onClose"
       :visible.sync="drawerShowExperimentAdd"
     >
       <dee-as-com
+        style="margin: 10px;"
         :lay-config="{
           typeName: 'ExperimentRecord',
           layKey: 'NotGeneral_Experiment_Create'