“linengliang”
2023-09-18 2e3a185dce148c14051f96892841614b28e72d86
保养锁料修改
已修改14个文件
112 ■■■■■ 文件已修改
src/views/eam/PredictiveWorkOrderList.vue 18 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/eam/PredictiveWorkPlanList.vue 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/eam/SpecialtyMaintenanceOrderList.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/eam/common/MaintenanceStandardSafetyRequirement.vue 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/eam/common/MaintenanceStandardWorkInstruction.vue 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/eam/modules/dailyMaintenanceOrder/ActualMaterialEditTable.vue 31 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/eam/modules/dailyMaintenanceOrder/JSelectSparePartModal.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/eam/modules/equipmentNew/edit/EquipmentSparePartsForm.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/eam/modules/predictiveWorkOrder/ActualMaterialEditTable.vue 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/eam/modules/predictiveWorkPlan/PredictiveParameters.vue 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/eam/modules/predictiveWorkPlan/PredictiveSpareParts.vue 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/eam/modules/predictiveWorkPlan/PredictiveWarn.vue 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/eam/modules/specialtyMaintenanceOrder/ActualMaterialEditTable.vue 27 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/eam/modules/specialtyMaintenanceOrder/JSelectSparePartModal.vue 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/eam/PredictiveWorkOrderList.vue
@@ -19,7 +19,7 @@
                allow-clear
                placeholder="请选择工单状态"
                :triggerChange="true"
                dictCode="repair_order_status"
                dictCode="maintenance_order_status"
                v-model="queryParam.status"
              />
            </a-form-item>
@@ -132,6 +132,7 @@
          <a-popconfirm
            title="确定下发工单吗?"
            @confirm="() => handleOrderIssue(record)"
            v-has="'predictiveWorkOrder:assign&callback&recover&cancle&issue'"
          >
            <a v-if="record.status == '1'">下发</a>
          </a-popconfirm>
@@ -142,6 +143,7 @@
          <a-popconfirm
            title="确定撤回工单吗?"
            @confirm="() => handleOrderReset(record)"
            v-has="'predictiveWorkOrder:assign&callback&recover&cancle&issue'"
          >
            <a v-if="record.status == '2'">撤回</a>
          </a-popconfirm>
@@ -152,6 +154,7 @@
          <a-popconfirm
            title="确定恢复工单吗?"
            @confirm="() => handleOrderRecover(record)"
            v-has="'predictiveWorkOrder:assign&callback&recover&cancle&issue'"
          >
            <a v-if="record.status == '7'">恢复</a>
          </a-popconfirm>
@@ -162,6 +165,7 @@
          <a-popconfirm
            title="确定作废工单吗?"
            @confirm="() => handleOrderCancel(record)"
            v-has="'predictiveWorkOrder:assign&callback&recover&cancle&issue'"
          >
            <a v-if="record.status == '2'">作废</a>
          </a-popconfirm>
@@ -172,20 +176,19 @@
          <a-popconfirm
            title="确定领取工单吗?"
            @confirm="() => handleOrderGet(record)"
            v-has="'predictiveWorkOrder:get&do'"
          >
            <a v-if="record.status == '2' && record.assignMode == '1'">领取</a>
          </a-popconfirm>
          <a
            v-if="record.status == '2' && record.assignMode == '2'  "
            @click="handleAssignOrder(record)"
            v-has="'predictiveWorkOrder:assign&callback&recover&cancle&issue'"
          >派工</a>
          <a
            v-if="record.status == '2'&& record.assignMode == '3'  && record.inspectionUserName != null  "
            v-if="record.status == '2'&& record.assignMode == '3'&&record.maintenanceUserName!=null"
            @click="handleAssignOrder(record)"
          >改派</a>
          <a
            v-if="record.status == '3'"
            @click="handleAssignOrder(record)"
            v-has="'predictiveWorkOrder:assign&callback&recover&cancle&issue'"
          >改派</a>
          <a-divider
            v-if="record.status == '2'"
@@ -198,6 +201,7 @@
          <a
            v-if="record.status === '3' || record.status === '4'  "
            @click="handleOrderExe(record)"
            v-has="'predictiveWorkOrder:get&do'"
          >执行</a>
          <a-divider
            v-if="record.status === '3' || record.status === '4' "
@@ -206,6 +210,7 @@
          <a
            v-if="record.status === '1'"
            @click="handleEdit(record)"
            v-has="'predictiveWorkOrder:edit&delete'"
          >编辑</a>
          <a-divider
            v-if="record.status === '1'"
@@ -221,6 +226,7 @@
                <a-popconfirm
                  title="确定删除吗?"
                  @confirm="() => handleDelete(record.id)"
                  v-has="'predictiveWorkOrder:edit&delete'"
                >
                  <a v-if="record.status === '1'">删除</a>
                </a-popconfirm>
src/views/eam/PredictiveWorkPlanList.vue
@@ -66,6 +66,7 @@
        @click='handleAdd'
        type='primary'
        icon='plus'
        v-has="'predictiveWorkPlan:add&edit&delete'"
      >新增
      </a-button>
      <a-button
@@ -118,21 +119,25 @@
          <a
            v-if="record.status == '2'"
            @click="handleRevise(record)"
            v-has="'predictiveWorkplan:update&take'"
          >升版</a>
          <a
            v-if="record.status == '1'"
            @click="handleTakeEffect(record)"
            v-has="'predictiveWorkplan:update&take'"
          >生效</a>
          <a-divider type="vertical"/>
          <a
            v-if="record.status == '1'"
            @click="handleEdit(record)"
            v-has="'predictiveWorkPlan:add&edit&delete'"
          >编辑</a>
          <a-divider type="vertical"/>
          <a-popconfirm
            v-if="record.status == '1'"
            title="确定删除吗?"
            @confirm="() => handleDelete(record.id)"
            v-has="'predictiveWorkPlan:add&edit&delete'"
          >
            <a>删除</a>
          </a-popconfirm>
src/views/eam/SpecialtyMaintenanceOrderList.vue
@@ -200,7 +200,7 @@
            v-has="'specialtyMaintenanceOrder:assign'"
          >派工</a>
          <a
            v-if="record.status == '2'&& record.assignMode == '3'  && record.inspectionUserName != null  "
            v-if="record.status == '2'&& record.assignMode == '3'  && record.maintenanceUserName != null  "
            @click="handleAssignOrder(record)"
            v-has="'specialtyMaintenanceOrder:assign'"
          >改派</a>
src/views/eam/common/MaintenanceStandardSafetyRequirement.vue
@@ -18,6 +18,7 @@
      type="primary"
      icon="plus"
      v-if="maintenanceStandardId !='' && isAdd "
      v-has="'predictiveWorkPlan:add&edit&delete'"
    >新增
    </a-button>
    <div>
@@ -42,6 +43,7 @@
            title="确定删除吗?"
            @confirm="() => handleDelete(record.id)"
            v-if="maintenanceStandardId !='' && isAdd "
            v-has="'predictiveWorkPlan:add&edit&delete'"
          >
            <a>删除</a>
          </a-popconfirm>
src/views/eam/common/MaintenanceStandardWorkInstruction.vue
@@ -18,6 +18,7 @@
      type="primary"
      icon="plus"
      v-if="maintenanceStandardId !='' && isAdd "
      v-has="'predictiveWorkPlan:add&edit&delete'"
    >新增</a-button>
    <div>
@@ -95,6 +96,7 @@
            title="确定删除吗?"
            @confirm="() => handleDelete(record.id)"
            v-if="maintenanceStandardId !='' && isAdd "
            v-has="'predictiveWorkPlan:add&edit&delete'"
          >
            <a>删除</a>
          </a-popconfirm>
src/views/eam/modules/dailyMaintenanceOrder/ActualMaterialEditTable.vue
@@ -11,6 +11,7 @@
      :dataSource="dataSource"
      :pagination="ipagination"
      @change="handleTableChange"
      :loading="loading"
    >
      <template
@@ -109,7 +110,7 @@
    <actual-material-select ref="actualMaterialSelect">
      <!-- @sendMaterialRecord="sendMaterialRecord" -->
    </actual-material-select>
    <j-select-spare-part-modal ref='JSelectSparePartModal'></j-select-spare-part-modal>
    <j-select-spare-part-modal ref='JSelectSparePartModal' @selection2Rows="getSelectRows"></j-select-spare-part-modal>
  </a-card>
</template>
<script>
@@ -265,7 +266,8 @@
        lock: "/eam/maintenanceOrderActualMaterial/lock",
        unLock: "/eam/maintenanceOrderActualMaterial/unLock"
      },
      changeIndex: 0
      changeIndex: 0,
      loading:false,
    }
  },
  watch: {
@@ -413,7 +415,7 @@
        this.$message.error('使用数量不能大于可用数量!');
        return false;
      }
      this.confirmLoading = true;
      this.loading = true;
      postAction(this.url.lock, record).then(res => {
        if (res.success) {
          this.$message.success("库存锁定成功!")
@@ -421,14 +423,14 @@
          this.$message.error(res.message)
        }
      }).finally(res => {
        that.confirmLoading = false
        that.loading = false
        that.loadData();
      })
    },
    handleUnLock(record) {
      let that = this;
      this.confirmLoading = true;
      this.loading = true;
      postAction(this.url.unLock, record).then(res => {
        if (res.success) {
          this.$message.success("库存解锁成功!")
@@ -436,7 +438,7 @@
          this.$message.error(res.message)
        }
      }).finally(res => {
        that.confirmLoading = false
        that.loading = false
        that.loadData();
      })
    },
@@ -472,11 +474,8 @@
          this.loading = false
        })
    },
  },
  mounted() {
    let newActualMaterials = [];
    this.$bus.$on('selection2Rows', (data) => {
    getSelectRows(data){
      let newActualMaterials = [];
      for (let i = 0; i < data.length; i++) {
        newActualMaterials.push({
          // id: this.getUuiD(16),
@@ -499,9 +498,7 @@
          isLock: 'no'
        })
      }
      debugger
      let that = this
      // newActualMaterials = this.dataSource
      postAction(this.url.addInit, newActualMaterials).then((res) => {
        if (res.success) {
          that.$message.success(res.message)
@@ -511,10 +508,14 @@
        }
      }).finally(res => {
        newActualMaterials = []
        that.loadData(1);
        that.loadData();
      })
    })
    }
  },
  mounted() {
  },
}
src/views/eam/modules/dailyMaintenanceOrder/JSelectSparePartModal.vue
@@ -262,7 +262,7 @@
        this.$message.warn("请选择备件");
        return false;
      }
      this.$bus.$emit('selection2Rows', this.selectionRows)
      this.$emit('selection2Rows', this.selectionRows)
      this.close()
    },
    onSelectChange(selectionRows) {
src/views/eam/modules/equipmentNew/edit/EquipmentSparePartsForm.vue
@@ -49,7 +49,7 @@
        >
          <template slot='toolbarPrefix'>
            <a-button type='primary' @click='equipmentSparesSelect' :disabled="formDisabled">选择备件
            <a-button type='primary' @click='equipmentSparesSelect' :disabled="formDisabled"  icon="plus">选择备件
            </a-button>
          </template>
        </j-vxe-table>
src/views/eam/modules/predictiveWorkOrder/ActualMaterialEditTable.vue
@@ -11,6 +11,7 @@
      :dataSource="dataSource"
      :pagination="ipagination"
      @change="handleTableChange"
      :loading="loading"
    >
      <template
@@ -264,7 +265,8 @@
        lock: "/eam/maintenanceOrderActualMaterial/lock",
        unLock: "/eam/maintenanceOrderActualMaterial/unLock"
      },
      changeIndex: 0
      changeIndex: 0,
      loading:false
    }
  },
  watch: {
@@ -388,7 +390,7 @@
        this.$message.error('使用数量不能大于可用数量!');
        return false;
      }
      this.confirmLoading = true;
      this.loading = true;
      postAction(this.url.lock, record).then(res => {
        if (res.success) {
          this.$message.success("库存锁定成功!")
@@ -396,14 +398,14 @@
          this.$message.error(res.message)
        }
      }).finally(res => {
        that.confirmLoading = false
        that.loading = false
        that.loadData();
      })
    },
    handleUnLock(record) {
      let that = this;
      this.confirmLoading = true;
      this.loading = true;
      postAction(this.url.unLock, record).then(res => {
        if (res.success) {
          this.$message.success("库存解锁成功!")
@@ -411,7 +413,7 @@
          this.$message.error(res.message)
        }
      }).finally(res => {
        that.confirmLoading = false
        that.loading = false
        that.loadData();
      })
    },
src/views/eam/modules/predictiveWorkPlan/PredictiveParameters.vue
@@ -18,6 +18,7 @@
      type="primary"
      icon="plus"
      v-if="planId != '' && isAdd "
      v-has="'predictiveWorkPlan:add&edit&delete'"
    >新增
    </a-button>
    <div>
@@ -41,6 +42,7 @@
            title="确定删除吗?"
            @confirm="() => handleDelete(record.id)"
            v-if="planId != '' && isDel"
            v-has="'predictiveWorkPlan:add&edit&delete'"
          >
            <a>删除</a>
          </a-popconfirm>
src/views/eam/modules/predictiveWorkPlan/PredictiveSpareParts.vue
@@ -18,6 +18,7 @@
      type="primary"
      icon="plus"
      v-if="planId != '' && isAdd "
      v-has="'predictiveWorkPlan:add&edit&delete'"
    >新增
    </a-button>
    <div>
@@ -42,6 +43,7 @@
            title="确定删除吗?"
            @confirm="() => handleDelete(record.id)"
            v-if="planId != '' && isAdd "
            v-has="'predictiveWorkPlan:add&edit&delete'"
          >
            <a>删除</a>
          </a-popconfirm>
src/views/eam/modules/predictiveWorkPlan/PredictiveWarn.vue
@@ -18,6 +18,7 @@
      type="primary"
      icon="plus"
      v-if="planId != '' && isAdd "
      v-has="'predictiveWorkPlan:add&edit&delete'"
    >新增
    </a-button>
    <div>
@@ -41,6 +42,7 @@
            title="确定删除吗?"
            @confirm="() => handleDelete(record.id)"
            v-if="planId != '' && isAdd "
            v-has="'predictiveWorkPlan:add&edit&delete'"
          >
            <a>删除</a>
          </a-popconfirm>
src/views/eam/modules/specialtyMaintenanceOrder/ActualMaterialEditTable.vue
@@ -11,6 +11,7 @@
      :dataSource="dataSource"
      :pagination="ipagination"
      @change="handleTableChange"
      :loading="loading"
    >
      <template
@@ -105,10 +106,10 @@
      </a-row>
      <!-- :disabled="false" -->
    </div>
    <actual-material-select ref="actualMaterialSelect">
    <actual-material-select ref="actualMaterialSelect" >
      <!-- @sendMaterialRecord="sendMaterialRecord" -->
    </actual-material-select>
    <j-select-spare-part-modal ref='JSelectSparePartModal'></j-select-spare-part-modal>
    <j-select-spare-part-modal ref='JSelectSparePartModal' @getSelectRows="getSelectRows"></j-select-spare-part-modal>
  </a-card>
</template>
<script>
@@ -264,7 +265,8 @@
        lock: "/eam/maintenanceOrderActualMaterial/lock",
        unLock: "/eam/maintenanceOrderActualMaterial/unLock"
      },
      changeIndex: 0
      changeIndex: 0,
      loading:false,
    }
  },
  watch: {
@@ -411,7 +413,7 @@
        this.$message.error('使用数量不能大于可用数量!');
        return false;
      }
      this.confirmLoading = true;
      this.loading = true;
      postAction(this.url.lock, record).then(res => {
        if (res.success) {
          this.$message.success("库存锁定成功!")
@@ -419,14 +421,14 @@
          this.$message.error(res.message)
        }
      }).finally(res => {
        that.confirmLoading = false
        that.loading = false
        that.loadData();
      })
    },
    handleUnLock(record) {
      let that = this;
      this.confirmLoading = true;
      this.loading = true;
      postAction(this.url.unLock, record).then(res => {
        if (res.success) {
          this.$message.success("库存解锁成功!")
@@ -434,7 +436,7 @@
          this.$message.error(res.message)
        }
      }).finally(res => {
        that.confirmLoading = false
        that.loading = false
        that.loadData();
      })
    },
@@ -470,10 +472,8 @@
          this.loading = false
        })
    },
  },
  mounted() {
    let newActualMaterials = [];
    this.$bus.$on('selectionRows', (data) => {
    getSelectRows(data){
      let newActualMaterials = [];
      for (let i = 0; i < data.length; i++) {
        newActualMaterials.push({
          // id: this.getUuiD(16),
@@ -509,7 +509,10 @@
        that.loadData();
      })
    })
    }
  },
  mounted() {
  },
}
src/views/eam/modules/specialtyMaintenanceOrder/JSelectSparePartModal.vue
@@ -262,7 +262,8 @@
        this.$message.warn("请选择备件");
         return false;
      }
      this.$bus.$emit('selectionRows', this.selectionRows)
      this.$emit('getSelectRows', this.selectionRows)
      this.close()
    },
    onSelectChange(selectionRows) {