Merge branch 'dev_third_stage'

# Conflicts:
#	jero-web/src/common/lang/en-us.js
#	jero-web/src/common/lang/zh-cn.js

jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue

@@ -64,6 +64,26 @@
                                v-model="formInline.dre"></a-input>
                     </div>
                   </a-col>
+                  <a-col :md="6" :sm="8">
+                    <div class="box-title-text">
+                      <div class="title-text" :title="$t('status')">
+                        <span>{{$t('status')}}</span>
+                      </div>
+                      <a-select :placeholder="$t('PleaseSelect')+$t('status')"
+                                class="box-input"
+                                allowClear
+                                :getPopupContainer="triggerNode=> triggerNode.parentNode"
+                                v-model="formInline.state">
+                        <a-select-option v-for="(item, key) in statusList"
+                                         :key="key"
+                                         :value="item.value">
+                     <span style="display: inline-block;width: 100%" :title=" item.name ">
+                           {{ item.name}}
+                     </span>
+                        </a-select-option>
+                      </a-select>
+                    </div>
+                  </a-col>
                   <span style="float: right;overflow: hidden;margin-right: 11px"
                         class="table-page-search-submitButtons">
                <a-col :md="6" :sm="24">
@@ -75,7 +95,7 @@
               </a-form>
             </div>
           </div>
-          <div class="table-operator">
+          <div class="table-operator" v-if="!this.$route.query.it">
             <!--      // 认证工程师 homo-->
             <!--      // 工程接口人 sdt-->
             <!--      // 填写人 dre-->
@@ -115,6 +135,10 @@
                   <a-icon type="delete"/>
                   {{$t('BatchDelete')}}
                 </div>
+                <div @click="bringInTheProjectInterfaceClick" class="operator-text-title">
+                  <a-icon type="profile"/>
+                  {{$t('bringInTheProjectInterface')}}
+                </div>
               </template>
               <div class="operator-text" style="position: relative">
                 <span style="position: absolute;left: -13px;top: -4px">...</span>{{ $t('more') }}
@@ -133,7 +157,7 @@
             <!--            保存-->
             <div @click="handlePreservation(1)" class="operator-text" v-if='currentPersonRole == "dre"'>
               <a-icon type="check-circle"/>
-              {{$t('preservation')}}
+              {{$t('tempSave')}}
             </div>
             <!--      提交-->
             <div @click="handleSubmit" class="operator-text" v-if='currentPersonRole == "dre"'>
@@ -154,6 +178,7 @@
             </div>
             <!--       角色切换   -->
             <div class="operator-text"
+                 v-if="!this.$route.query.it"
                  @click="roleSwitchingClick">
               <a-icon type="select"/>
               {{ $t('roleSwitching') }}
@@ -178,29 +203,31 @@
     </a-modal>
     <!--  冻结配置--->
     <a-modal v-model="areaVisibleFreeze" :title="$t('FreezeConfiguration')" width='600px' :footer="null">
-      <a-form-model
-        class='tag-module'
-        ref='ruleForm'
-        :model='Dateline'
-        :rules='rules'
-        :label-col='labelCol'
-        :wrapper-col='wrapperCol'
-      >
-        <a-row :gutter='24'>
-          <a-col :span='24'>
-            <a-form-model-item ref='region' :label="$t('FreezeConfiguration')" prop='region'>
-              <a-select :placeholder="$t('PleaseSelect')+$t('FreezeConfiguration')" v-model="Dateline.paramsConfig"
-                        allowClear mode="multiple">
-                <a-select-option v-for="(item, key) in FreezeList" :key="key" :value="item.value">
+      <a-spin :spinning="confirmLoading">
+        <a-form-model
+          class='tag-module'
+          ref='ruleForm'
+          :model='Dateline'
+          :rules='rules'
+          :label-col='labelCol'
+          :wrapper-col='wrapperCol'
+        >
+          <a-row :gutter='24'>
+            <a-col :span='24'>
+              <a-form-model-item ref='region' :label="$t('FreezeConfiguration')" prop='region'>
+                <a-select :placeholder="$t('PleaseSelect')+$t('FreezeConfiguration')" v-model="Dateline.paramsConfig"
+                          allowClear mode="multiple">
+                  <a-select-option v-for="(item, key) in FreezeList" :key="key" :value="item.value">
                     <span style="display: inline-block;width: 100%" :title=" item.label ">
                       {{ item.label }}
                     </span>
-                </a-select-option>
-              </a-select>
-            </a-form-model-item>
-          </a-col>
-        </a-row>
-      </a-form-model>
+                  </a-select-option>
+                </a-select>
+              </a-form-model-item>
+            </a-col>
+          </a-row>
+        </a-form-model>
+      </a-spin>
       <div style='padding-left: 60px;color: red'>
         {{$t('Attentionfreeze')}}
       </div>
@@ -384,6 +411,44 @@
       SynchronousSubmissionLibrary
     },
     data() {
+      this.statusList = [
+        {
+          value: '1',
+          name: this.$t('CollectionInitiated')
+        },
+        {
+          value: '2',
+          name: this.$t('handledInterface')
+        },
+        {
+          value: '3',
+          name: this.$t('ReturnedPerson')
+        },
+        {
+          value: '4',
+          name: this.$t('completed')
+        },
+        {
+          value: '5',
+          name: this.$t('Filledreturn')
+        },
+        {
+          value: '6',
+          name: this.$t('Submitted')
+        },
+        {
+          value: '7',
+          name: this.$t('ReturnedEngineer')
+        },
+        {
+          value: '8',
+          name: this.$t('SynchronizedLibrary')
+        },
+        {
+          value: '9',
+          name: this.$t('alteration')
+        }
+      ]
       return {
         // 认证工程师 homo
         // 工程接口人 sdt
@@ -461,6 +526,7 @@
         templatetitleId: '',
         rowId: '',
         version: 0,
+        confirmLoading: false,
         itemId: '',
         selectedRowKeysValue: [], // table列表所选得数据
         token: Vue.ls.get(ACCESS_TOKEN),
@@ -524,6 +590,22 @@
       handleCancelRoleSwitching() {
         this.visibleRoleSwitching = false
       },
+      bringInTheProjectInterfaceClick() {
+        let query = {
+          paramsManifestId: this.paramsManifest.id,
+          projectId: this.$route.query.projectId
+        }
+        this.textLoading = true
+        getAction('/params/collectManifest/bringSdtInto', query).then((res) => {
+          if (res.success) {
+            this.$message.success(this.$t('OperationSuccessful'))
+            this.$refs.CollectionTabel.getTableList()
+          } else {
+            this.$message.warning(this.$t('operationFailed'))
+          }
+          this.textLoading = false
+        })
+      },
       handleOkRoleSwitching() {
         this.$refs.ruleFormRoleSwitching.validate(valid => {
           if (valid) {
@@ -851,7 +933,22 @@
         this.areaVisibleFreeze = true
         this.Dateline = {}
         //  获取冻结配置数据
-        this.getFreeze()
+        this.confirmLoading = true
+        this.getFreeze(() => {
+          this.getLockedConfigIdList()
+        })
+      },
+      getLockedConfigIdList() {
+        getAction('/params/collectManifest/getLockedConfigIdList',
+          { paramsManifestId: this.paramsManifest.id }).then((res) => {
+          if (res.success) {
+            this.Dateline.paramsConfig = res.result
+            this.Dateline = { ...this.Dateline }
+          } else {
+            this.Dateline.paramsConfig = []
+          }
+          this.confirmLoading = false
+        })
       },
       // 冻结配置提交
       handleSubmitFreeze() {
@@ -894,7 +991,7 @@
       cancleImportsFreeze() {
         this.areaVisibleFreeze = false
       },
-      getFreeze() {
+      getFreeze(callback) {
         let _this = this
         let param = { paramsManifestId: this.paramsManifest.id, configFlag: 1 }
         axios({
@@ -916,11 +1013,15 @@
           .then((res) => {
             if (res.data.success) {
               this.FreezeList = res.data.result
+              callback && callback()
             } else {
               _this.$message.warning(res.data.message)
+              _this.confirmLoading = false
             }
+
           })
           .catch((error) => {
+            _this.confirmLoading = false
           })
       },
       // 下发收集的权限
@@ -1053,7 +1154,11 @@
           if (num && num == 1) {
             this.textLoading = true
           }
-          postAction('/params/collectManifest/save', configDataList).then((res) => {
+          let query = {
+            ...configDataList,
+            paramsManifestId: this.paramsManifest.id
+          }
+          postAction('/params/collectManifest/save', query).then((res) => {
             if (res.success) {
               if (num && num == 1) {
                 _this.$message.success(_this.$t('OperationSuccessful'))
@@ -1071,6 +1176,10 @@
               }
             }
           })
+        } else {
+          if (num && num == 1) {
+            this.$message.warning(this.$t('theCurrentListSaved'))
+          }
         }
       },
       // 提交数据
@@ -1319,7 +1428,7 @@
                   if (res.data.success) {
                     _this.$message.success(_this.$t('OperationSuccessful'))
                     _this.selectedRowKeys = []
-                    _this.$refs.CollectionTabel.getData()
+                    // _this.$refs.CollectionTabel.getData()
                     _this.$refs.CollectionTabel.getTableList()
                     _this.textLoading = false
                   } else {
@@ -1345,7 +1454,19 @@
     }
   }
 </script>
+<style>
+  .popconfirm {
+    z-index: 999;
+  }
 
+  .popconfirm .ant-popover-buttons {
+    display: none !important;
+  }
+
+  .popconfirm .anticon-exclamation-circle {
+    display: none !important;
+  }
+</style>
 <style lang="less" scoped>
   @import '~@assets/less/common.less';
 

jero-web/src/views/projectManagement/components/TaskParameterCollection.vue

@@ -78,6 +78,7 @@
         show-size-changer
         :page-size.sync="pageSize"
         :total="total"
+        :current="pageNo"
         @change="pageOnChange"
         @showSizeChange="SizeChange"
       />

jero-web/src/views/projectManagement/components/certificationDirectory.vue

@@ -44,6 +44,7 @@
             show-size-changer
             :page-size.sync="pageSize"
             :total="total"
+            :current="pageNo"
             @change="onChange"
             @showSizeChange="SizeChange"
           />

jero-web/src/views/projectManagement/components/listAddModel.vue

@@ -70,6 +70,7 @@
           show-size-changer
           :page-size.sync="pageSize"
           :total="total"
+          :current="pageNo"
           @change="onChange"
           @showSizeChange="SizeChange"
         />

jero-web/src/views/projectManagement/components/nonConformance.vue

@@ -73,6 +73,7 @@
         show-size-changer
         :page-size.sync="pageSize"
         :total="total"
+        :current="pageNo"
         @change="pageOnChange"
         @showSizeChange="SizeChange"
       />

jero-web/src/views/projectManagement/components/transferList.vue

@@ -47,6 +47,7 @@
           show-size-changer
           :page-size.sync="pageSize"
           :total="total"
+          :current="pageNo"
           @change="onChange"
           @showSizeChange="SizeChange"
         />