Merge remote-tracking branch 'origin/dev_2nd_LCYH' into dev_2nd_LCYH

2023-03-24 15:20:03 +08:00
parent 11201aa1a6 0d4544f85c
commit 97bfbbcf39
7 changed files with 497 additions and 874 deletions
@@ -578,6 +578,7 @@ module.exports = {
  modifyNode: 'Modify Node',
  deleteNode: 'Delete Node',
  ImplementationDate: 'New Type Execution Date',
+  ImplementationDateOne: 'New Type Execution Date',
  vehicleInProductionDate: 'New Vehicle Execution Date',
  deleteNodes: 'If there are child nodes under this node, they will be deleted synchronously. Are you sure to delete this data?',
  leastTwo: 'Please Select at Least two pieces of data',
@@ -1707,6 +1708,6 @@ module.exports = {
  vehicleshavenotcompletedonlineupgrade:'The reason why some vehicles have not completed online upgrade',
  cause:'cause',
  implementationrecords:'Fault handling measures and emergency response implementation records',
-
+  onlyDataWithListStatusDraftCanBeDeleted:'Only data with a list status of Draft can be deleted',

 }
@@ -585,6 +585,7 @@ module.exports = {
  modifyNode: '修改节点',
  deleteNode: '删除节点',
  ImplementationDate: '新车型实施日期',
+  ImplementationDateOne:'新车型实施日期',
  vehicleInProductionDate: '在产车实施日期',
  deleteNodes: '该节点下若有子节点将同步删除，确认删除该条数据？',
  leastTwo: '请选择至少两条数据',
@@ -1807,4 +1808,5 @@ module.exports = {
  vehicleshavenotcompletedonlineupgrade:'部分车辆未完在线升级的原因',
  cause:'原因',
  implementationrecords:'故障处置措施和应急响应实施记录',
+  onlyDataWithListStatusDraftCanBeDeleted:'只能删除清单状态为草稿的数据',
 }
@@ -295,22 +295,22 @@
          &nbsp;{{$t('confirmationOfDesignConformity')}}
        </div>
        <a-row :gutter="24">
-          <a-col :span="12">
-            <div class="box-title-text">
-              <div class="title-text">
-                <span class="title-text-text"
-                      :title="$t('Sponsor')">{{$t('Sponsor')}}</span>
-              </div>
-              <a-form-model-item class="itemModel" prop="designInitiator">
-                <j-dict-select-tag class="box-input" v-model="formInline.designInitiator"
-                                   :disabled="disabled"
-                                   @input="handleInput('designInitiator')"
-                                   :placeholder="$t('PleaseSelect')+$t('Sponsor')"
-                                   :type="'select'"
-                                   :triggerChange="false" :dictCode="'fa1_qi3_ren2'"/>
-              </a-form-model-item>
-            </div>
-          </a-col>
+<!--          <a-col :span="12">-->
+<!--            <div class="box-title-text">-->
+<!--              <div class="title-text">-->
+<!--                <span class="title-text-text"-->
+<!--                      :title="$t('Sponsor')">{{$t('Sponsor')}}</span>-->
+<!--              </div>-->
+<!--              <a-form-model-item class="itemModel" prop="designInitiator">-->
+<!--                <j-dict-select-tag class="box-input" v-model="formInline.designInitiator"-->
+<!--                                   :disabled="disabled"-->
+<!--                                   @input="handleInput('designInitiator')"-->
+<!--                                   :placeholder="$t('PleaseSelect')+$t('Sponsor')"-->
+<!--                                   :type="'select'"-->
+<!--                                   :triggerChange="false" :dictCode="'fa1_qi3_ren2'"/>-->
+<!--              </a-form-model-item>-->
+<!--            </div>-->
+<!--          </a-col>-->
          <a-col :span="12">
            <div class="box-title-text">
              <div class="title-text">
@@ -327,8 +327,6 @@
              </a-form-model-item>
            </div>
          </a-col>
-        </a-row>
-        <a-row :gutter="24">
          <a-col :span="12">
            <div class="box-title-text">
              <div class="title-text">
@@ -356,6 +354,8 @@
              </a-form-model-item>
            </div>
          </a-col>
+        </a-row>
+        <a-row :gutter="24">
          <a-col :span="12">
            <div class="box-title-text">
              <div class="title-text">
@@ -389,125 +389,125 @@
            </div>
          </a-col>
        </a-row>
-        <div class="header-text">
-          &nbsp;{{$t('PrehomoConfirmation')}}
-        </div>
-        <a-row :gutter="24">
-          <a-col :span="12">
-            <div class="box-title-text">
-              <div class="title-text">
-                <span class="title-text-text"
-                      :title="$t('Sponsor')">{{$t('Sponsor')}}</span>
-              </div>
-              <a-form-model-item class="itemModel" prop="prehomoInitiator">
-                <j-dict-select-tag class="box-input" v-model="formInline.prehomoInitiator"
-                                   :disabled="disabled"
-                                   @input="handleInput('prehomoInitiator')"
-                                   :placeholder="$t('PleaseSelect')+$t('Sponsor')"
-                                   :type="'select'"
-                                   :triggerChange="false" :dictCode="'fa1_qi3_ren2'"/>
-              </a-form-model-item>
-            </div>
-          </a-col>
-          <a-col :span="12">
-            <div class="box-title-text">
-              <div class="title-text">
-                <span class="title-text-text"
-                      :title="$t('personLiable')">{{$t('personLiable')}}</span>
-              </div>
-              <a-form-model-item class="itemModel" prop="prehomoDuty">
-                <j-dict-select-tag class="box-input" v-model="formInline.prehomoDuty"
-                                   :disabled="disabled"
-                                   @input="handleInput('prehomoDuty')"
-                                   :placeholder="$t('PleaseSelect')+$t('personLiable')"
-                                   :type="'select'"
-                                   :triggerChange="false" :dictCode="'ze2_ren4_ren2'"/>
-              </a-form-model-item>
-            </div>
-          </a-col>
-        </a-row>
-        <a-row :gutter="24">
-          <a-col :span="12">
-            <div class="box-title-text">
-              <div class="title-text">
-                <span class="title-text-text"
-                      :title="$t('typeOfDeliverables')">{{$t('typeOfDeliverables')}}</span>
-              </div>
-              <a-form-model-item class="itemModel" prop="prehomoDeliverableType">
-                <a-tree-select
-                  tree-node-filter-prop="title"
-                  v-model="formInline.prehomoDeliverableType"
-                  :maxTagCount="1"
-                  :getPopupContainer="triggerNode=> triggerNode.parentNode"
-                  class="box-input"
-                  style="width: 100%"
-                  :tree-data="DeliverableTreeList"
-                  tree-checkable
-                  :placeholder="$t('PleaseSelect')+$t('typeOfDeliverables')"
-                />
-                <!--                <j-dict-select-tag class="box-input" v-model="formInline.prehomoDeliverableType"-->
-                <!--                                   :disabled="disabled"-->
-                <!--                                   @input="handleInput('prehomoDeliverableType')"-->
-                <!--                                   :placeholder="$t('PleaseSelect')+$t('typeOfDeliverables')"-->
-                <!--                                   :type="'select'"-->
-                <!--                                   :triggerChange="false" :dictCode="'deliverable_template'"/>-->
-              </a-form-model-item>
-            </div>
-          </a-col>
-          <a-col :span="12">
-            <div class="box-title-text">
-              <div class="title-text">
-                <span class="title-text-text"
-                      :title="$t('deliverableTemplate')">{{$t('deliverableTemplate')}}</span>
-              </div>
-              <a-form-model-item class="itemModel" prop="prehomoDeliverableTemplate">
-                <a-button type="primary" class="button-text"
-                          @click="clickButtonToUpload('prehomoDeliverableTemplate')">
-                  {{ (formInline.prehomoDeliverableTemplate === 'null' || formInline.prehomoDeliverableTemplate === ''
-                  ||
-                  formInline.prehomoDeliverableTemplate == null) ? $t('clickUpload') : $t('viewUploadedFiles')
-                  }}
-                </a-button>
-              </a-form-model-item>
-            </div>
-          </a-col>
-        </a-row>
-        <a-row :gutter="24">
-          <a-col :span="24">
-            <div class="box-title-text">
-              <div class="title-text">
-                <span class="title-text-text"
-                      :title="$t('descriptionDeliverables')">{{$t('descriptionDeliverables')}}</span>
-              </div>
-              <a-form-model-item class="itemModel-text" :prop="'prehomoRemark'">
-                <a-textarea
-                  style="width: 100%"
-                  :placeholder="$t('PleaseEnter')+$t('descriptionDeliverables')"
-                  v-model="formInline.prehomoRemark" :rows="4"/>
-              </a-form-model-item>
-            </div>
-          </a-col>
-        </a-row>
+<!--        <div class="header-text">-->
+<!--          &nbsp;{{$t('PrehomoConfirmation')}}-->
+<!--        </div>-->
+<!--        <a-row :gutter="24">-->
+<!--          <a-col :span="12">-->
+<!--            <div class="box-title-text">-->
+<!--              <div class="title-text">-->
+<!--                <span class="title-text-text"-->
+<!--                      :title="$t('Sponsor')">{{$t('Sponsor')}}</span>-->
+<!--              </div>-->
+<!--              <a-form-model-item class="itemModel" prop="prehomoInitiator">-->
+<!--                <j-dict-select-tag class="box-input" v-model="formInline.prehomoInitiator"-->
+<!--                                   :disabled="disabled"-->
+<!--                                   @input="handleInput('prehomoInitiator')"-->
+<!--                                   :placeholder="$t('PleaseSelect')+$t('Sponsor')"-->
+<!--                                   :type="'select'"-->
+<!--                                   :triggerChange="false" :dictCode="'fa1_qi3_ren2'"/>-->
+<!--              </a-form-model-item>-->
+<!--            </div>-->
+<!--          </a-col>-->
+<!--          <a-col :span="12">-->
+<!--            <div class="box-title-text">-->
+<!--              <div class="title-text">-->
+<!--                <span class="title-text-text"-->
+<!--                      :title="$t('personLiable')">{{$t('personLiable')}}</span>-->
+<!--              </div>-->
+<!--              <a-form-model-item class="itemModel" prop="prehomoDuty">-->
+<!--                <j-dict-select-tag class="box-input" v-model="formInline.prehomoDuty"-->
+<!--                                   :disabled="disabled"-->
+<!--                                   @input="handleInput('prehomoDuty')"-->
+<!--                                   :placeholder="$t('PleaseSelect')+$t('personLiable')"-->
+<!--                                   :type="'select'"-->
+<!--                                   :triggerChange="false" :dictCode="'ze2_ren4_ren2'"/>-->
+<!--              </a-form-model-item>-->
+<!--            </div>-->
+<!--          </a-col>-->
+<!--        </a-row>-->
+<!--        <a-row :gutter="24">-->
+<!--          <a-col :span="12">-->
+<!--            <div class="box-title-text">-->
+<!--              <div class="title-text">-->
+<!--                <span class="title-text-text"-->
+<!--                      :title="$t('typeOfDeliverables')">{{$t('typeOfDeliverables')}}</span>-->
+<!--              </div>-->
+<!--              <a-form-model-item class="itemModel" prop="prehomoDeliverableType">-->
+<!--                <a-tree-select-->
+<!--                  tree-node-filter-prop="title"-->
+<!--                  v-model="formInline.prehomoDeliverableType"-->
+<!--                  :maxTagCount="1"-->
+<!--                  :getPopupContainer="triggerNode=> triggerNode.parentNode"-->
+<!--                  class="box-input"-->
+<!--                  style="width: 100%"-->
+<!--                  :tree-data="DeliverableTreeList"-->
+<!--                  tree-checkable-->
+<!--                  :placeholder="$t('PleaseSelect')+$t('typeOfDeliverables')"-->
+<!--                />-->
+<!--                &lt;!&ndash;                <j-dict-select-tag class="box-input" v-model="formInline.prehomoDeliverableType"&ndash;&gt;-->
+<!--                &lt;!&ndash;                                   :disabled="disabled"&ndash;&gt;-->
+<!--                &lt;!&ndash;                                   @input="handleInput('prehomoDeliverableType')"&ndash;&gt;-->
+<!--                &lt;!&ndash;                                   :placeholder="$t('PleaseSelect')+$t('typeOfDeliverables')"&ndash;&gt;-->
+<!--                &lt;!&ndash;                                   :type="'select'"&ndash;&gt;-->
+<!--                &lt;!&ndash;                                   :triggerChange="false" :dictCode="'deliverable_template'"/>&ndash;&gt;-->
+<!--              </a-form-model-item>-->
+<!--            </div>-->
+<!--          </a-col>-->
+<!--          <a-col :span="12">-->
+<!--            <div class="box-title-text">-->
+<!--              <div class="title-text">-->
+<!--                <span class="title-text-text"-->
+<!--                      :title="$t('deliverableTemplate')">{{$t('deliverableTemplate')}}</span>-->
+<!--              </div>-->
+<!--              <a-form-model-item class="itemModel" prop="prehomoDeliverableTemplate">-->
+<!--                <a-button type="primary" class="button-text"-->
+<!--                          @click="clickButtonToUpload('prehomoDeliverableTemplate')">-->
+<!--                  {{ (formInline.prehomoDeliverableTemplate === 'null' || formInline.prehomoDeliverableTemplate === ''-->
+<!--                  ||-->
+<!--                  formInline.prehomoDeliverableTemplate == null) ? $t('clickUpload') : $t('viewUploadedFiles')-->
+<!--                  }}-->
+<!--                </a-button>-->
+<!--              </a-form-model-item>-->
+<!--            </div>-->
+<!--          </a-col>-->
+<!--        </a-row>-->
+<!--        <a-row :gutter="24">-->
+<!--          <a-col :span="24">-->
+<!--            <div class="box-title-text">-->
+<!--              <div class="title-text">-->
+<!--                <span class="title-text-text"-->
+<!--                      :title="$t('descriptionDeliverables')">{{$t('descriptionDeliverables')}}</span>-->
+<!--              </div>-->
+<!--              <a-form-model-item class="itemModel-text" :prop="'prehomoRemark'">-->
+<!--                <a-textarea-->
+<!--                  style="width: 100%"-->
+<!--                  :placeholder="$t('PleaseEnter')+$t('descriptionDeliverables')"-->
+<!--                  v-model="formInline.prehomoRemark" :rows="4"/>-->
+<!--              </a-form-model-item>-->
+<!--            </div>-->
+<!--          </a-col>-->
+<!--        </a-row>-->
        <div class="header-text">
          &nbsp;{{$t('verificationAndConformityconfirmation')}}
        </div>
        <a-row :gutter="24">
-          <a-col :span="12">
-            <div class="box-title-text">
-              <div class="title-text">
-                <span class="title-text-text"
-                      :title="$t('Sponsor')">{{$t('Sponsor')}}</span>
-              </div>
-              <a-form-model-item class="itemModel" prop="verifyInitiator">
-                <j-dict-select-tag class="box-input" v-model="formInline.verifyInitiator"
-                                   :disabled="disabled"
-                                   @input="handleInput('verifyInitiator')"
-                                   :placeholder="$t('PleaseSelect')+$t('Sponsor')"
-                                   :type="'select'"
-                                   :triggerChange="false" :dictCode="'fa1_qi3_ren2'"/>
-              </a-form-model-item>
-            </div>
-          </a-col>
+<!--          <a-col :span="12">-->
+<!--            <div class="box-title-text">-->
+<!--              <div class="title-text">-->
+<!--                <span class="title-text-text"-->
+<!--                      :title="$t('Sponsor')">{{$t('Sponsor')}}</span>-->
+<!--              </div>-->
+<!--              <a-form-model-item class="itemModel" prop="verifyInitiator">-->
+<!--                <j-dict-select-tag class="box-input" v-model="formInline.verifyInitiator"-->
+<!--                                   :disabled="disabled"-->
+<!--                                   @input="handleInput('verifyInitiator')"-->
+<!--                                   :placeholder="$t('PleaseSelect')+$t('Sponsor')"-->
+<!--                                   :type="'select'"-->
+<!--                                   :triggerChange="false" :dictCode="'fa1_qi3_ren2'"/>-->
+<!--              </a-form-model-item>-->
+<!--            </div>-->
+<!--          </a-col>-->
          <a-col :span="12">
            <div class="box-title-text">
              <div class="title-text">
@@ -524,8 +524,6 @@
              </a-form-model-item>
            </div>
          </a-col>
-        </a-row>
-        <a-row :gutter="24">
          <a-col :span="12">
            <div class="box-title-text">
              <div class="title-text">
@@ -553,6 +551,9 @@
              </a-form-model-item>
            </div>
          </a-col>
+        </a-row>
+        <a-row :gutter="24">
+
          <a-col :span="12">
            <div class="box-title-text">
              <div class="title-text">
@@ -55,7 +55,7 @@
        :loading="loading"
        :pagination="false"
        :scroll="{x: '100%'}"
-        rowKey="id"
+        :rowKey="(record)=>JSON.stringify(record)"
        :data-source="dataSource"
        @change="tableOnChange"
        :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
@@ -69,13 +69,13 @@
           <a class="text-operation" @click="edit(record)"
              v-has="'dummyInventoryBase:deleteBatch'"
              :disabled="record.state == 1?true:false">{{$t('edit')}}</a>
-<!--          v-if="record.createBy == userData.username || administrators"-->
+          <!--          v-if="record.createBy == userData.username || administrators"-->
           <a class="text-operation"
              v-has="'dummyInventoryBase:issue'"
              @click="withdraw(record)">
             {{record.state == 2 ? $t('release') : $t('withdraw')}}
           </a>
-<!--          v-if="record.createBy == userData.username || administrators"-->
+          <!--          v-if="record.createBy == userData.username || administrators"-->
           <a class="text-operation" :disabled="record.state == 1?true:false"
              v-has="'dummyInventoryBase:deleteBatch'"
              @click="maintenanceList(record)">{{$t('maintenanceList')}}</a>
@@ -84,7 +84,7 @@
              :disabled="record.state == 2?true:false" @click="subscribe(record)">
               {{!record.readFlag || record.readFlag == 0 ? $t('subscribe') :$t('CancelSubscribe')}}
           </a>
-<!--          v-if="record.createBy == userData.username || administrators"-->
+          <!--          v-if="record.createBy == userData.username || administrators"-->
           <a class="text-operation" :disabled="record.state == 1?true:false"
              v-has="'dummyInventoryBase:deleteBatch'"
              @click="deleteLib(record)">{{$t('deleteLib')}}</a>
@@ -248,7 +248,7 @@
          }
        ],
        queryParam: {},
-        administrators:false,
+        administrators: false,
        orderBy: '1',
        orderByField: ''
      }
@@ -282,7 +282,12 @@
      setCreatorClick() {
        if (this.selectedRowKeys.length > 0) {
          let selectedRowKeys = JSON.parse(JSON.stringify(this.selectedRowKeys))
-          this.$refs.setCreatorRef.getPush(selectedRowKeys.join(','))
+          let idList = []
+          for (let i = 0; i < selectedRowKeys.length; i++) {
+            selectedRowKeys[i] = JSON.parse(selectedRowKeys[i])
+            idList.push(selectedRowKeys[i].id)
+          }
+          this.$refs.setCreatorRef.getPush(idList.join(','))
        } else {
          this.$message.warning(this.$t('PleaseSelectData'))
        }
@@ -300,21 +305,37 @@
      handleDel() {
        if (this.selectedRowKeys.length > 0) {
          let _this = this
-          this.$confirm({
-            content: _this.$t('ConfirmBatchDeletion'),
-            onOk() {
-              let idList = JSON.parse(JSON.stringify(_this.selectedRowKeys))
-              getAction(_this.url.deleteBatch, { ids: idList.join(',') }).then((res) => {
-                if (res.success) {
-                  _this.$message.success(_this.$t('OperationSuccessful'))
-                  _this.selectedRowKeys = []
-                  _this.getList()
-                } else {
-                  _this.$message.warning(res.message)
-                }
-              })
+          let idList = []
+          let selectedRowKeys = JSON.parse(JSON.stringify(this.selectedRowKeys))
+          let isTrue
+          for (let i = 0; i < selectedRowKeys.length; i++) {
+            selectedRowKeys[i] = JSON.parse(selectedRowKeys[i])
+            if (selectedRowKeys[i].state == 1) {
+              isTrue = false
+              break
+            } else {
+              isTrue = true
+              idList.push(selectedRowKeys[i].id)
            }
-          })
+          }
+          if (isTrue) {
+            this.$confirm({
+              content: _this.$t('ConfirmBatchDeletion'),
+              onOk() {
+                getAction(_this.url.deleteBatch, { ids: idList.join(',') }).then((res) => {
+                  if (res.success) {
+                    _this.$message.success(_this.$t('OperationSuccessful'))
+                    _this.selectedRowKeys = []
+                    _this.getList()
+                  } else {
+                    _this.$message.warning(res.message)
+                  }
+                })
+              }
+            })
+          } else {
+            this.$message.warning(this.$t('onlyDataWithListStatusDraftCanBeDeleted'))
+          }
        } else {
          this.$message.warning(this.$t('selectLeastOne'))
        }
@@ -280,6 +280,7 @@
          let _this = this
          let selectedRowKeys = JSON.parse(JSON.stringify(this.selectedRowKeys))
          let isTrue
+          let idList = []
          for (let i = 0; i < selectedRowKeys.length; i++) {
            selectedRowKeys[i] = JSON.parse(selectedRowKeys[i])
            if (selectedRowKeys[i].state == 1) {
@@ -287,13 +288,13 @@
              break
            } else {
              isTrue = true
+              idList.push(selectedRowKeys[i].id)
            }
          }
          if (isTrue){
            this.$confirm({
              content: _this.$t('ConfirmBatchDeletion'),
              onOk() {
-                let idList = JSON.parse(JSON.stringify(_this.selectedRowKeys))
                deleteAction(_this.url.deleteBatch, { ids: idList.join(',') }).then((res) => {
                  if (res.success) {
                    _this.$message.success(_this.$t('OperationSuccessful'))
@@ -306,7 +307,7 @@
              }
            })
          }else{
-             this.$message.warning(this.$t(''))
+             this.$message.warning(this.$t('onlyDataWithListStatusDraftCanBeDeleted'))
          }
        } else {
          this.$message.warning(this.$t('selectLeastOne'))
@@ -103,6 +103,7 @@
            <!--                        v-if="isTrue"-->
            <div v-if="isTrue" class="operator-text" v-has="'dummyInventoryInfo:importData'">
              <ImportFile :url="url" :authDummyInventoryBaseId="$route.query.id" :isTrue="true"
+                          @getList="getPersonnelList"
                          :accept="'.zip'"/>
            </div>
            <!--            模板下载-->
@@ -498,6 +499,9 @@
        }
        this.getList()
      },
+      getPersonnelList(){
+         this.getList()
+      },
      getList() {
        let query = {
          ...this.queryParam,