安灯管理

hyingbo

2 天以前 0fe10b533514a73915abd534493bffb6c5df016a

安灯管理

 src/views/system/AndonOrderList.vue

@@ -8,19 +8,19 @@

          <a-col :xl="6" :lg="7" :md="8" :sm="24">
            <a-form-item label="设备编号">
              <a-input placeholder="请输入设备编号" v-model="queryParam.equipmentId"></a-input>
              <j-input placeholder="请输入设备编号" v-model="queryParam.equipmentId"></j-input>
            </a-form-item>
          </a-col>
          <a-col :xl="6" :lg="7" :md="8" :sm="24">
            <a-form-item label="安灯类型">
              <j-dict-select-tag placeholder="请选择安灯类型" dictCode="andon_type" v-model="queryParam.andonType"
                                 allow-clear/>
                                 allow-clear />
            </a-form-item>
          </a-col>
          <a-col :xl="6" :lg="7" :md="8" :sm="24">
            <a-form-item label="安灯状态">
              <j-dict-select-tag placeholder="请选择安灯状态" dictCode="order_status" v-model="queryParam.orderStatus"
                                 allow-clear/>
                                 allow-clear />
            </a-form-item>
          </a-col>
          <a-col :xl="6" :lg="7" :md="8" :sm="24">
@@ -33,43 +33,37 @@
        </a-row>
      </a-form>
    </div>

    <!-- table区域-begin -->
    <div>
<!--      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">-->
<!--        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项-->
<!--        <a style="margin-left: 24px" @click="onClearSelected">清空</a>-->
<!--      </div>-->
      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
      </div>

      <a-table
        ref="table"
        size="middle"
        bordered
        rowKey="id"
        :columns="columns"
        :dataSource="dataSource"
        :pagination="ipagination"
        :loading="loading"
        class="j-table-force-nowrap"
        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
        @change="handleTableChange">
    <a-table
      ref="table"
      size="middle"
      bordered
      rowKey="id"
      :columns="columns"
      :dataSource="dataSource"
      :pagination="ipagination"
      :loading="loading"
      class="j-table-force-nowrap"
      :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
      @change="handleTableChange">

      <template slot='imageFiles' slot-scope='text, record, index'>
        <span v-if="!text" style="font-size: 12px;font-style: italic;"> </span>
        <img v-else :src="getImgView(text)" :preview="record.imageFiles" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/>
      </template>
        <span slot="action" slot-scope="text, record">
<!--          <a @click="handleEdit(record)">编辑</a>-->

<!--          <a-divider type="vertical" />-->
<!--          <a-dropdown>-->
<!--            <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>-->
<!--            <a-menu slot="overlay">-->
<!--              <a-menu-item>-->
<!--                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">-->
<!--                  <a>删除</a>-->
<!--                </a-popconfirm>-->
<!--            </a-menu>-->
<!--          </a-dropdown>-->
          <a-popconfirm title="确定响应吗?" @confirm="() =>responseData(record.id)">
            <a v-if="record.orderStatus === '1'" >响应</a>
          </a-popconfirm>
          <a v-if="record.orderStatus === '2'" @click.stop="handleSolve(record)">处理</a>
        </span>

      </a-table>
    </a-table>
    </div>
    <!-- table区域-end -->

@@ -79,117 +73,151 @@
</template>

<script>
  import '@assets/less/TableExpand.less'
  import AndonOrderModal from './modules/AndonOrderModal.vue'
  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import '@assets/less/TableExpand.less'
import AndonOrderModal from './modules/AndonOrderModal.vue'
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import { deleteAction, getAction, postAction } from '@api/manage'

  export default {
    name: "AndonOrderList",
    mixins:[JeecgListMixin],
    components: {
      AndonOrderModal
    },
    data () {
      return {
        description: '安灯管理页面',
        // 表头
        columns: [
           {
            title: '设备编号',
            align:"center",
            dataIndex: 'equipmentId'
           },
           {
            title: '安灯类型',
            align:"center",
            dataIndex: 'andonType_dictText'
           },
           {
            title: '安灯人',
            align:"center",
            dataIndex: 'operator_dictText'
           },
           {
            title: '安灯时间',
            align:"center",
            dataIndex: 'operateTime'
           },
       {
            title: '呼叫原因',
            align:"center",
            dataIndex: 'callReason'
           },
       {
            title: '安灯状态',
            align:"center",
            dataIndex: 'orderStatus_dictText'
           },
           {
            title: '响应人',
            align:"center",
            dataIndex: 'responder_dictText'
           },
           {
            title: '响应时间',
            align:"center",
            dataIndex: 'responseTime'
           },
           {
            title: '处理人',
            align:"center",
            dataIndex: 'processor'
           },
           {
            title: '处理完成时间',
            align:"center",
            dataIndex: 'processTime'
           },
           {
            title: '问题描述',
            align:"center",
            dataIndex: 'problemDescreption'
           },
           {
            title: '处理结果描述',
            align:"center",
            dataIndex: 'resolutionDescreption'
           },
           {
            title: '处理结果图片',
            align:"center",
            dataIndex: 'imageFiles'
           },
           // {
       //      title: '所属厂房',
       //      align:"center",
       //      dataIndex: 'plantName'
       //     },
          {
            title: '操作',
            dataIndex: 'action',
            align:"center",
            scopedSlots: { customRender: 'action' },
export default {
  name: 'AndonOrderList',
  mixins: [JeecgListMixin],
  components: {
    AndonOrderModal
  },
  data() {
    return {
      description: '安灯管理页面',
      // 表头
      columns: [
        {
          title: '#',
          dataIndex: '',
          key: 'rowIndex',
          width: 60,
          align: 'center',
          customRender: function(t, r, index) {
            return parseInt(index) + 1
          }
        ],
        url: {
          list: "/mdc/andonOrder/list",
          delete: "/mdc/andonOrder/delete",
          deleteBatch: "/mdc/andonOrder/deleteBatch",
          exportXlsUrl: "mdc/andonOrder/exportXls",
          importExcelUrl: "mdc/andonOrder/importExcel",
       },
        },
        {
          title: '设备编号',
          align: 'center',
          dataIndex: 'equipmentId'
        },
        {
          title: '安灯类型',
          align: 'center',
          dataIndex: 'andonType_dictText'
        },
        {
          title: '安灯人',
          align: 'center',
          dataIndex: 'operator_dictText'
        },
        {
          title: '安灯时间',
          align: 'center',
          dataIndex: 'operateTime'
        },
        {
          title: '问题描述',
          align: 'center',
          dataIndex: 'callReason'
        },
        {
          title: '安灯状态',
          align: 'center',
          dataIndex: 'orderStatus_dictText'
        },
        {
          title: '响应人',
          align: 'center',
          dataIndex: 'responder_dictText'
        },
        {
          title: '响应时间',
          align: 'center',
          dataIndex: 'responseTime'
        },
        {
          title: '处理人',
          align: 'center',
          dataIndex: 'processor_dictText'
        },
        {
          title: '处理完成时间',
          align: 'center',
          dataIndex: 'processTime'
        },
        {
          title: '处理结果描述',
          align: 'center',
          dataIndex: 'resolutionDescreption'
        },
        {
          title: '处理结果图片',
          align: 'center',
          dataIndex: 'imageFiles',
          scopedSlots: { customRender: 'imageFiles' }
        },
        // {
        //      title: '所属厂房',
        //      align:"center",
        //      dataIndex: 'plantName'
        //     },
        {
          title: '操作',
          dataIndex: 'action',
          align: 'center',
          width: 150,
          scopedSlots: { customRender: 'action' }
        }
      ],
      url: {
        list: '/mdc/andonOrder/list',
        responseData: '/mdc/andonOrder/responseData',
        delete: '/mdc/andonOrder/delete',
        deleteBatch: '/mdc/andonOrder/deleteBatch',
        exportXlsUrl: 'mdc/andonOrder/exportXls',
        importExcelUrl: 'mdc/andonOrder/importExcel'
      }
    }
  },
  computed: {
    importExcelUrl: function(){
      return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
    importExcelUrl: function() {
      return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`
    }
  },
    methods: {

  methods: {
    responseData(id){
      if(!this.url.responseData){
        this.$message.error("请设置url.responseData属性!")
        return
      }
      var that = this;
      getAction(that.url.responseData, {id: id}).then((res) => {
        if (res.success) {
          that.$notification.success({
            message:'消息',
            description:res.message
          });
          that.loadData();
        } else {
          that.$notification.warning({
            message:'消息',
            description:res.message
          });
        }
      });
    },
    handleSolve(record) {
      this.$refs.modalForm.dealWith(record);
      this.$refs.modalForm.title = '处理'
      this.$refs.modalForm.disabledEdit = true
    }
  }
}
</script>
<style scoped>
  @import '~@assets/less/common.less';
@import '~@assets/less/common.less';
</style>

 src/views/system/modules/AndonOrderModal.vue

@@ -11,60 +11,19 @@

    <a-spin :spinning="confirmLoading">
      <a-form-model ref="form" :model="model" :rules="validatorRules">

        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="equipmentId" label="设备编号">
          <a-input placeholder="请输入设备编号" v-model="model.equipmentId" />
        </a-form-model-item>
        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="andonType" label="安灯类型">
          <a-input placeholder="请输入安灯类型" v-model="model.andonType" />
        </a-form-model-item>
        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="operator" label="安灯人">
          <a-input placeholder="请输入安灯人" v-model="model.operator" />
        </a-form-model-item>
        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="operateTime" label="安灯时间">
          <a-input placeholder="请输入安灯时间" v-model="model.operateTime" />
        </a-form-model-item>
        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="responder" label="响应人">
          <a-input placeholder="请输入响应人" v-model="model.responder" />
        </a-form-model-item>
        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="responseTime" label="响应时间">
          <a-input placeholder="请输入响应时间" v-model="model.responseTime" />
        </a-form-model-item>
        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="processor" label="处理人">
          <a-input placeholder="请输入处理人" v-model="model.processor" />
        </a-form-model-item>
        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="processTime" label="处理完成时间">
          <a-input placeholder="请输入处理完成时间" v-model="model.processTime" />
        </a-form-model-item>
        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="orderStatus" label="安灯状态;待响应、待处理、已完成">
          <a-input placeholder="请输入安灯状态;待响应、待处理、已完成" v-model="model.orderStatus" />
        </a-form-model-item>
        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="problemDescreption" label="问题描述">
          <a-input placeholder="请输入问题描述" v-model="model.problemDescreption" />
        </a-form-model-item>
        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="resolutionDescreption" label="处理结果描述">
          <a-input placeholder="请输入处理结果描述" v-model="model.resolutionDescreption" />
        </a-form-model-item>
        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="imageFiles" label="处理结果图片">
          <a-input placeholder="请输入处理结果图片" v-model="model.imageFiles" />
          <j-image-upload text="处理结果图片" bizPath="andon_handle_page" v-model="model.imageFiles"></j-image-upload>
        </a-form-model-item>
        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="delFlag" label="删除标记">
          <a-input-number v-model="model.delFlag"/>
        </a-form-model-item>
        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="callReason" label="呼叫原因">
          <a-input placeholder="请输入呼叫原因" v-model="model.callReason" />
        </a-form-model-item>
        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="plantName" label="所属厂房">
          <a-input placeholder="请输入所属厂房" v-model="model.plantName" />
        </a-form-model-item>

      </a-form-model>
    </a-spin>
  </j-modal>
</template>

<script>
  import { httpAction } from '@api/manage'
import { httpAction, postAction } from '@api/manage'

  export default {
    name: "AndonOrderModal",
@@ -84,10 +43,12 @@

        confirmLoading: false,
        validatorRules:{
          resolutionDescreption: [
            { required: true, message: '请输入处理结果描述' }
          ],
        },
        url: {
          add: "/mdc/andonOrder/add",
          edit: "/mdc/andonOrder/edit",
          dealWith: "/mdc/andonOrder/dealWith",
        },
      }
    },
@@ -102,6 +63,10 @@
        this.model = Object.assign({}, record);
        this.visible = true;
      },
      dealWith (record) {
        this.model = Object.assign({}, record);
        this.visible = true;
      },
      close () {
        this.$emit('close');
        this.visible = false;
@@ -113,25 +78,17 @@
         this.$refs.form.validate(valid => {
          if (valid) {
            that.confirmLoading = true;
            let httpurl = '';
            let method = '';
            if(!this.model.id){
              httpurl+=this.url.add;
              method = 'post';
            }else{
              httpurl+=this.url.edit;
               method = 'put';
            }
            httpAction(httpurl,this.model,method).then((res)=>{

            postAction(this.url.dealWith,this.model).then((res)=>{
              if(res.success){
                that.$message.success(res.message);
                that.$emit('ok');
                that.close();
              }else{
                that.$message.warning(res.message);
              }
            }).finally(() => {
              that.confirmLoading = false;
              that.close();
            })
          }else{
             return false;