.env.development

@@ -1,5 +1,5 @@
NODE_ENV=development
VUE_APP_API_BASE_URL=http://127.0.0.1:9989/jeecg-boot
VUE_APP_API_BASE_URL=http://127.0.0.1:9989
VUE_APP_CAS_BASE_URL=http://cas.example.org:8443/cas
VUE_APP_ONLINE_BASE_URL=http://fileview.jeecg.com/onlinePreview


 src/views/andon/AndonOrderList.vue

@@ -149,7 +149,7 @@
          {
            title:'安灯人',
            align:"center",
            dataIndex: 'operator'
            dataIndex: 'operator_dictText'
          },
          {
            title:'安灯时间',
@@ -164,7 +164,7 @@
          {
            title:'响应人',
            align:"center",
            dataIndex: 'responder'
            dataIndex: 'responder_dictText'
          },
          {
            title:'响应时间',
@@ -174,7 +174,7 @@
          {
            title:'处理人',
            align:"center",
            dataIndex: 'processor'
            dataIndex: 'processor_dictText'
          },
          {
            title:'处理完成时间',

 src/views/andon/modules/AndonButtonConfigForm.vue

@@ -1,46 +1,59 @@
<template>
  <a-spin :spinning="confirmLoading">
    <j-form-container :disabled="formDisabled">
    <j-form-container :disabled="formDisabled" class="andon-button-form">
      <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
        <a-row>
        <!-- ç¬¬ä¸€è¡Œï¼šå®‰ç¯åç§° + å®‰ç¯ç¼–码 -->
        <a-row :gutter="24">
          <a-col :span="12">
            <a-form-model-item label="安灯名称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="buttonName">
              <a-input v-model="model.buttonName" placeholder="请输入安灯名称"  ></a-input>
              <a-input v-model="model.buttonName" placeholder="请输入" />
            </a-form-model-item>
          </a-col>
          <a-col :span="12">
            <a-form-model-item label="安灯编码" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="buttonCode">
              <a-input v-model="model.buttonCode" placeholder="请输入安灯编码"  ></a-input>
              <a-input v-model="model.buttonCode" placeholder="请输入" />
            </a-form-model-item>
          </a-col>
        </a-row>

        <!-- ç¬¬äºŒè¡Œï¼šå‡çº§å“åº”时长 + å‡çº§å¤„理时长 -->
        <a-row :gutter="24">
          <a-col :span="12">
            <a-form-model-item label="升级响应" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="upgradeResponseDuration">
              <a-input-number v-model="model.upgradeResponseDuration" placeholder="请输入" style="width: 100%" />
            </a-form-model-item>
          </a-col>
          <a-col :span="12">
            <a-form-model-item label="升级响应时长(分钟)" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="upgradeResponseDuration">
              <a-input-number v-model="model.upgradeResponseDuration" placeholder="请输入升级响应时长(分钟)" style="width: 100%" />
            <a-form-model-item label="升级处理" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="upgradeProcessDuration">
              <a-input-number v-model="model.upgradeProcessDuration" placeholder="请输入" style="width: 100%" />
            </a-form-model-item>
          </a-col>
        </a-row>

        <!-- ç¬¬ä¸‰è¡Œï¼šäºŒæ¬¡å‡çº§å“åº”时长 + äºŒæ¬¡å‡çº§å¤„理时长 -->
        <a-row :gutter="24">
          <a-col :span="12">
            <a-form-model-item label="二次升级响应" :labelCol="labelColWide" :wrapperCol="wrapperColNarrow" prop="secondUpgradeResponseDuration">
              <a-input-number v-model="model.secondUpgradeResponseDuration" placeholder="请输入" style="width: 100%" />
            </a-form-model-item>
          </a-col>
          <a-col :span="12">
            <a-form-model-item label="升级处理时长(分钟)" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="upgradeProcessDuration">
              <a-input-number v-model="model.upgradeProcessDuration" placeholder="请输入升级处理时长(分钟)" style="width: 100%" />
            <a-form-model-item label="二次升级处理" :labelCol="labelColWide" :wrapperCol="wrapperColNarrow" prop="secondUpgradeProcessDuration">
              <a-input-number v-model="model.secondUpgradeProcessDuration" placeholder="请输入" style="width: 100%" />
            </a-form-model-item>
          </a-col>
        </a-row>

        <!-- ç¬¬å››è¡Œï¼šå®‰ç¯æŒ‰é’®çŠ¶æ€ + å¤‡æ³¨ -->
        <a-row :gutter="24">
          <a-col :span="12">
            <a-form-model-item label="二次升级响应时长(分钟)" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="secondUpgradeResponseDuration">
              <a-input-number v-model="model.secondUpgradeResponseDuration" placeholder="请输入二次升级响应时长(分钟)" style="width: 100%" />
            </a-form-model-item>
          </a-col>
          <a-col :span="12">
            <a-form-model-item label="二次升级处理时长(分钟)" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="secondUpgradeProcessDuration">
              <a-input-number v-model="model.secondUpgradeProcessDuration" placeholder="请输入二次升级处理时长(分钟)" style="width: 100%" />
            </a-form-model-item>
          </a-col>
          <a-col :span="12">
            <a-form-model-item label="安灯按钮状态" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="buttonStatus">
              <j-dict-select-tag type="list" v-model="model.buttonStatus" dictCode="button_status" placeholder="请选择安灯按钮状态" />
            <a-form-model-item label="按钮状态" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="buttonStatus">
              <j-dict-select-tag type="list" v-model="model.buttonStatus" dictCode="button_status" placeholder="请选择" />
            </a-form-model-item>
          </a-col>
          <a-col :span="12">
            <a-form-model-item label="备注" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="remark">
              <a-input v-model="model.remark" placeholder="请输入备注"  ></a-input>
              <a-input v-model="model.remark" placeholder="请输入" />
            </a-form-model-item>
          </a-col>
        </a-row>
@@ -50,111 +63,173 @@
</template>

<script>
import { httpAction, getAction } from '@/api/manage'
import { validateDuplicateValue } from '@/utils/util'

  import { httpAction, getAction } from '@/api/manage'
  import { validateDuplicateValue } from '@/utils/util'

  export default {
    name: 'AndonButtonConfigForm',
    components: {
    },
    props: {
      //表单禁用
      disabled: {
        type: Boolean,
        default: false,
        required: false
      }
    },
    data () {
      return {
        model:{
         },
        labelCol: {
          xs: { span: 24 },
          sm: { span: 5 },
        },
        wrapperCol: {
          xs: { span: 24 },
          sm: { span: 16 },
        },
        confirmLoading: false,
        validatorRules: {
          buttonName: [
            { required: true, message: '安灯名称是必选项', trigger: 'change' }
          ],
          buttonCode: [
            { required: true, message: '安灯编码是必选项', trigger: 'change' }
          ],
          upgradeResponseDuration: [
            { required: true, message: '升级响应时长是必选项', trigger: 'change' }
          ],
          upgradeProcessDuration: [
            { required: true, message: '升级处理时长是必选项', trigger: 'change' }
          ],
          secondUpgradeResponseDuration: [
            { required: true, message: '二次升级响应时长是必选项', trigger: 'change' }
          ],
          secondUpgradeProcessDuration: [
            { required: true, message: '二次升级处理时长是必选项', trigger: 'change' }
          ],
          buttonStatus: [
            { required: true, message: '安灯按钮状态是必选项', trigger: 'change' }
          ],
        },
        url: {
          add: "/andonbuttonconfig/andonButtonConfig/add",
          edit: "/andonbuttonconfig/andonButtonConfig/edit",
          queryById: "/andonbuttonconfig/andonButtonConfig/queryById"
        }
      }
    },
    computed: {
      formDisabled(){
        return this.disabled
      },
    },
    created () {
       //备份model原始值
      this.modelDefault = JSON.parse(JSON.stringify(this.model));
    },
    methods: {
      add () {
        this.edit(this.modelDefault);
      },
      edit (record) {
        this.model = Object.assign({}, record);
        this.visible = true;
      },
      submitForm () {
        const that = this;
        // è§¦å‘表单验证
        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)=>{
              if(res.success){
                that.$message.success(res.message);
                that.$emit('ok');
              }else{
                that.$message.warning(res.message);
              }
            }).finally(() => {
              that.confirmLoading = false;
            })
          }

        })
      },
export default {
  name: 'AndonButtonConfigForm',
  components: {},
  props: {
    disabled: {
      type: Boolean,
      default: false,
      required: false
    }
  },
  data() {
    return {
      model: {},
      // æ™®é€šæ ‡ç­¾åˆ—宽度
      labelCol: {
        xs: { span: 24 },
        sm: { span: 6 },
      },
      // å®½æ ‡ç­¾åˆ—（用于“二次升级响应”等长标签）
      labelColWide: {
        xs: { span: 24 },
        sm: { span: 8 }, // å¢žåŠ æ ‡ç­¾å®½åº¦
      },
      // çª„输入框列（配合宽标签，保持布局平衡）
      wrapperColNarrow: {
        xs: { span: 24 },
        sm: { span: 16 },
      },
      wrapperCol: {
        xs: { span: 24 },
        sm: { span: 18 },
      },
      confirmLoading: false,
      validatorRules: {
        buttonName: [
          { required: true, message: '安灯名称是必选项', trigger: 'change' }
        ],
        buttonCode: [
          { required: true, message: '安灯编码是必选项', trigger: 'change' }
        ],
        upgradeResponseDuration: [
          { required: true, message: '升级响应时长是必选项', trigger: 'change' }
        ],
        upgradeProcessDuration: [
          { required: true, message: '升级处理时长是必选项', trigger: 'change' }
        ],
        secondUpgradeResponseDuration: [
          { required: true, message: '二次升级响应时长是必选项', trigger: 'change' }
        ],
        secondUpgradeProcessDuration: [
          { required: true, message: '二次升级处理时长是必选项', trigger: 'change' }
        ],
        buttonStatus: [
          { required: true, message: '安灯按钮状态是必选项', trigger: 'change' }
        ],
      },
      url: {
        add: '/andonbuttonconfig/andonButtonConfig/add',
        edit: '/andonbuttonconfig/andonButtonConfig/edit',
        queryById: '/andonbuttonconfig/andonButtonConfig/queryById'
      }
    }
  },
  computed: {
    formDisabled() {
      return this.disabled
    },
  },
  created() {
    this.modelDefault = JSON.parse(JSON.stringify(this.model));
  },
  methods: {
    add() {
      this.edit(this.modelDefault);
    },
    edit(record) {
      this.model = Object.assign({}, record);
      this.visible = true;
    },
    submitForm() {
      const that = this;
      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) => {
            if (res.success) {
              that.$message.success(res.message);
              that.$emit('ok');
            } else {
              that.$message.warning(res.message);
            }
          }).finally(() => {
            that.confirmLoading = false;
          })
        }
      })
    },
  }
</script>
}
</script>

<style scoped>
.andon-button-form {
  padding: 24px;
  background-color: #fff;
  border-radius: 8px;
  box-shadow: 0 2px 8px rgba(0, 0, 0, 0.1);
}

/* ç»Ÿä¸€è¡¨å•é¡¹åž‚直间距 */
.a-form-model-item {
  margin-bottom: 16px !important;
}

/* æ ‡ç­¾ä¸Žè¾“入框水平间距（解决文字拥挤） */
.a-form-model-item-label {
  margin-right: 12px !important;
}

/* è¾“入框 & æ•°å­—输入框 å ä½ç¬¦æ ·å¼ä¼˜åŒ– */
.a-input::placeholder,
.a-input-number::placeholder {
  color: #ccc;
  font-style: italic;
}

/* å¿…选标签的红色星号强调 */
.a-form-model-item-label > span:first-child {
  color: #f5222d;
  margin-right: 2px;
}

/* æŒ‰é’®åŒºåŸŸå³å¯¹é½ & æŒ‰é’®æ ·å¼ä¼˜åŒ– */
.a-form-footer {
  text-align: right;
  margin-top: 32px;
}

.a-button-primary {
  background-color: #1890ff;
  border-color: #1890ff;
  transition: all 0.3s ease;
}

.a-button-primary:hover {
  background-color: #40a9ff;
  border-color: #40a9ff;
}

.a-button-default {
  border-color: #d9d9d9;
  transition: all 0.3s ease;
}

.a-button-default:hover {
  border-color: #bfbfbf;
}
</style>

 src/views/andon/modules/AndonOrderForm.vue

@@ -1,76 +1,58 @@
<template>
  <a-spin :spinning="confirmLoading">
    <j-form-container :disabled="formDisabled">
    <j-form-container :disabled="formDisabled" class="andon-order-form">
      <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
        <a-row>
          <a-col :span="24">
        <!-- ç¬¬ä¸€è¡Œï¼šäº§çº¿ + å®‰ç¯ç±»åž‹ -->
        <a-row :gutter="24">
          <a-col :span="12">
            <a-form-model-item label="产线" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="factoryId">
              <a-row :gutter="24">
                <a-col :span="24">
                  <a-form-item
                    :labelCol="labelCol"
                    :wrapperCol="wrapperCol"
                    label=""
                  >
                    <j-select-factory
                      :disabled="disabled"
                      v-model="model.factoryId"
                      :multi="true"
                      @back="backFactoryInfo"
                      :backProduction="true"
                      :treeProductOpera="true"
                    ></j-select-factory>
                  </a-form-item>
                </a-col>
              </a-row>
              <j-select-factory
                :disabled="disabled"
                v-model="model.factoryId"
                :multi="true"
                @back="backFactoryInfo"
                :backProduction="true"
                :treeProductOpera="true"
              ></j-select-factory>
            </a-form-model-item>
          </a-col>
          <a-col :span="12">
            <a-form-model-item label="安灯类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="buttonId">
              <j-search-select-tag v-model="model.buttonId" placeholder="请输入安灯类型"
                                   dict="andon_button_config,button_name,id"></j-search-select-tag>
              <j-search-select-tag v-model="model.buttonId" placeholder="请输入安灯类型" dict="andon_button_config,button_name,id"></j-search-select-tag>
            </a-form-model-item>
          </a-col>
        </a-row>

        <!-- ç¬¬äºŒè¡Œï¼šå®‰ç¯äºº + å®‰ç¯æ—¶é—´ -->
        <a-row :gutter="24">
          <a-col :span="12">
            <a-form-model-item label="安灯人" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="operator">
              <j-select-user-by-dep :multi="false" v-model="model.operator" placeholder="请输入安灯人"  ></j-select-user-by-dep>
              <j-select-user-by-dep :multi="false" v-model="model.operator" placeholder="请选择安灯人"></j-select-user-by-dep>
            </a-form-model-item>
          </a-col>
          <a-col :span="12">
            <a-form-model-item label="安灯时间" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="operateTime">
              <j-date placeholder="请选择安灯时间"  v-model="model.operateTime" :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" style="width: 100%" />
              <j-date placeholder="请选择安灯时间" v-model="model.operateTime" :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" style="width: 100%" />
            </a-form-model-item>
          </a-col>
        </a-row>

        <!-- ç¬¬ä¸‰è¡Œï¼šå®‰ç¯ç­‰çº§ + å®‰ç¯çŠ¶æ€ -->
        <a-row :gutter="24">
          <a-col :span="12">
            <a-form-model-item label="安灯等级" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="andonLevel">
              <j-dict-select-tag type="list" v-model="model.andonLevel" dictCode="andon_level" placeholder="请选择安灯等级" />
            </a-form-model-item>
          </a-col>
<!--          <a-col :span="12">-->
<!--            <a-form-model-item label="响应人" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="responder">-->
<!--              <j-select-user-by-dep v-model="model.responder" placeholder="请输入响应人"  ></j-select-user-by-dep>-->
<!--            </a-form-model-item>-->
<!--          </a-col>-->
<!--          <a-col :span="12">-->
<!--            <a-form-model-item label="响应时间" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="responseTime">-->
<!--              <j-date placeholder="请选择响应时间"  v-model="model.responseTime" :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" style="width: 100%" />-->
<!--            </a-form-model-item>-->
<!--          </a-col>-->
<!--          <a-col :span="12">-->
<!--            <a-form-model-item label="处理人" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="processor">-->
<!--              <j-select-user-by-dep v-model="model.processor" placeholder="请输入处理人"  ></j-select-user-by-dep>-->
<!--            </a-form-model-item>-->
<!--          </a-col>-->
<!--          <a-col :span="12">-->
<!--            <a-form-model-item label="处理完成时间" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="processTime">-->
<!--              <j-date placeholder="请选择处理完成时间"  v-model="model.processTime" :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" style="width: 100%" />-->
<!--            </a-form-model-item>-->
<!--          </a-col>-->
          <a-col :span="12">
            <a-form-model-item label="安灯状态" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="orderStatus">
              <j-dict-select-tag type="list" v-model="model.orderStatus" dictCode="order_status" placeholder="请选择安灯状态" />
            </a-form-model-item>
          </a-col>
        </a-row>

        <!-- ç¬¬å››è¡Œï¼šé—®é¢˜æè¿° + å¤„理结果描述 -->
        <a-row :gutter="24">
          <a-col :span="12">
            <a-form-model-item label="问题描述" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="problemDescreption">
              <a-textarea v-model="model.problemDescreption" rows="4" placeholder="请输入问题描述" />
@@ -81,9 +63,13 @@
              <a-textarea v-model="model.resolutionDescreption" rows="4" placeholder="请输入处理结果描述" />
            </a-form-model-item>
          </a-col>
        </a-row>

        <!-- ç¬¬äº”行：处理结果图片 -->
        <a-row :gutter="24">
          <a-col :span="12">
            <a-form-model-item label="处理结果图片" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="imageFiles">
              <j-image-upload isMultiple  v-model="model.imageFiles" ></j-image-upload>
              <j-image-upload isMultiple v-model="model.imageFiles"></j-image-upload>
            </a-form-model-item>
          </a-col>
        </a-row>
@@ -93,117 +79,124 @@
</template>

<script>
import { httpAction, getAction } from '@/api/manage'
import { validateDuplicateValue } from '@/utils/util'
import JSelectFactory from '@comp/jeecgbiz/JSelectFactory.vue'

  import { httpAction, getAction } from '@/api/manage'
  import { validateDuplicateValue } from '@/utils/util'
  import JSelectFactory from '@comp/jeecgbiz/JSelectFactory.vue'

  export default {
    name: 'AndonOrderForm',
    components: {
      JSelectFactory
    },
    props: {
      //表单禁用
      disabled: {
        type: Boolean,
        default: false,
        required: false
      }
    },
    data () {
      return {
        model:{
         },
        labelCol: {
          xs: { span: 24 },
          sm: { span: 5 },
        },
        wrapperCol: {
          xs: { span: 24 },
          sm: { span: 16 },
        },
        confirmLoading: false,
        validatorRules: {
          factoryId: [
            { required: true, message: '产线是必选项', trigger: 'change' }
          ],
          buttonId: [
            { required: true, message: '安灯类型是必选项', trigger: 'change' }
          ],
          operator: [
            { required: true, message: '安灯人是必选项', trigger: 'change' }
          ],
          operateTime: [
            { required: true, message: '安灯时间是必选项', trigger: 'change' }
          ],
          andonLevel: [
            { required: true, message: '安灯等级是必选项', trigger: 'change' }
          ],
          orderStatus: [
            { required: true, message: '安灯状态是必选项', trigger: 'change' }
          ],
        },
        url: {
          add: "/andonorder/andonOrder/add",
          edit: "/andonorder/andonOrder/edit",
          queryById: "/andonorder/andonOrder/queryById"
        }
      }
    },
    computed: {
      formDisabled(){
        return this.disabled
      },
    },
    created () {
       //备份model原始值
      this.modelDefault = JSON.parse(JSON.stringify(this.model));
    },
    methods: {
      backFactoryInfo(info) {
        this.model.factoryIds = this.model.factoryId
        this.nextFactoryOptions = info.map((item, index, arr) => {
          let c = { label: item.text, value: item.value + '' }
          return c
        })
      },
      add () {
        this.edit(this.modelDefault);
      },
      edit (record) {
        this.model = Object.assign({}, record);
        this.visible = true;
      },
      submitForm () {
        const that = this;
        // è§¦å‘表单验证
        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)=>{
              if(res.success){
                that.$message.success(res.message);
                that.$emit('ok');
              }else{
                that.$message.warning(res.message);
              }
            }).finally(() => {
              that.confirmLoading = false;
            })
          }

        })
      },
export default {
  name: 'AndonOrderForm',
  components: {
    JSelectFactory
  },
  props: {
    disabled: {
      type: Boolean,
      default: false,
      required: false
    }
  },
  data() {
    return {
      model: {},
      labelCol: {
        xs: { span: 24 },
        sm: { span: 6 }, // è°ƒæ•´æ ‡ç­¾å®½åº¦ï¼Œæ›´ç´§å‡‘
      },
      wrapperCol: {
        xs: { span: 24 },
        sm: { span: 16 },
      },
      confirmLoading: false,
      validatorRules: {
        factoryId: [{ required: true, message: '产线是必选项', trigger: 'change' }],
        buttonId: [{ required: true, message: '安灯类型是必选项', trigger: 'change' }],
        operator: [{ required: true, message: '安灯人是必选项', trigger: 'change' }],
        operateTime: [{ required: true, message: '安灯时间是必选项', trigger: 'change' }],
        andonLevel: [{ required: true, message: '安灯等级是必选项', trigger: 'change' }],
        orderStatus: [{ required: true, message: '安灯状态是必选项', trigger: 'change' }],
      },
      url: {
        add: '/andonorder/andonOrder/add',
        edit: '/andonorder/andonOrder/edit',
        queryById: '/andonorder/andonOrder/queryById'
      }
    }
  },
  computed: {
    formDisabled() {
      return this.disabled
    },
  },
  created() {
    this.modelDefault = JSON.parse(JSON.stringify(this.model));
  },
  methods: {
    backFactoryInfo(info) {
      this.model.factoryIds = this.model.factoryId
      this.nextFactoryOptions = info.map((item, index, arr) => {
        let c = { label: item.text, value: item.value + '' }
        return c
      })
    },
    add() {
      this.edit(this.modelDefault);
    },
    edit(record) {
      this.model = Object.assign({}, record);
      this.visible = true;
    },
    submitForm() {
      const that = this;
      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) => {
            if (res.success) {
              that.$message.success(res.message);
              that.$emit('ok');
            } else {
              that.$message.warning(res.message);
            }
          }).finally(() => {
            that.confirmLoading = false;
          })
        }
      })
    },
  }
</script>
}
</script>

<style scoped>
.andon-order-form {
  padding: 24px;
  background-color: #fff;
  border-radius: 8px;
  box-shadow: 0 2px 8px rgba(0, 0, 0, 0.1);
}
/* ç»Ÿä¸€è¡¨å•é¡¹é—´è· */
.a-form-model-item {
  margin-bottom: 16px !important;
}
/* è°ƒæ•´æ–‡æœ¬åŸŸé«˜åº¦å’Œå ä½ç¬¦æ ·å¼ */
.a-textarea {
  resize: vertical;
}
.a-textarea::placeholder {
  color: #ccc;
}
/* æŒ‰é’®åŒºåŸŸå³å¯¹é½ */
.a-form-footer {
  text-align: right;
  margin-top: 24px;
}
</style>

 src/views/andon/modules/AndonResponseConfigForm.vue

@@ -1,49 +1,73 @@
<template>
  <a-spin :spinning="confirmLoading">
    <j-form-container :disabled="formDisabled">
    <j-form-container :disabled="formDisabled" class="andon-response-form">
      <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
        <a-row>
          <a-col :span="24">

        <a-row :gutter="24">
          <a-col :span="12">
            <a-form-model-item label="产线" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="factoryId">
              <a-row :gutter="24">
                <a-col :span="24">
                  <a-form-item
                    :labelCol="labelCol"
                    :wrapperCol="wrapperCol"
                    label=""
                  >
                    <j-select-factory
                      :disabled="disabled"
                      v-model="model.factoryId"
                      :multi="true"
                      @back="backFactoryInfo"
                      :backProduction="true"
                      :treeProductOpera="true"
                    ></j-select-factory>
                  </a-form-item>
                </a-col>
              </a-row>
              <j-select-factory
                :disabled="disabled"
                v-model="model.factoryId"
                :multi="true"
                @back="backFactoryInfo"
                :backProduction="true"
                :treeProductOpera="true"
              ></j-select-factory>
            </a-form-model-item>
          </a-col>
        </a-row>


        <a-row :gutter="24">
          <a-col :span="12">
            <a-form-model-item label="安灯类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="buttonId">
              <j-search-select-tag v-model="model.buttonId" placeholder="请输入安灯类型"
                                   dict="andon_button_config,button_name,id"></j-search-select-tag>
              <j-search-select-tag
                v-model="model.buttonId"
                placeholder="请选择"
                dict="andon_button_config,button_name,id"
              ></j-search-select-tag>
            </a-form-model-item>
          </a-col>
          <a-col :span="12">
            <a-form-model-item label="初始响应人" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="firsterResponder">
              <j-select-user-by-dep :multi="false" v-model="model.firsterResponder" placeholder="请输入初始响应人"  ></j-select-user-by-dep>
              <j-select-user-by-dep
                :multi="false"
                v-model="model.firsterResponder"
                placeholder="请选择"
              ></j-select-user-by-dep>
            </a-form-model-item>
          </a-col>
        </a-row>

        <!-- äºŒçº§å“åº”人 + ä¸‰çº§å“åº”人 -->
        <a-row :gutter="24">
          <a-col :span="12">
            <a-form-model-item
              label="二级响应人"
              :labelCol="labelCol"
              :wrapperCol="wrapperCol"
              prop="secondResponder"
            >
              <j-select-user-by-dep
                :multi="false"
                v-model="model.secondResponder"
                placeholder="请选择"
              ></j-select-user-by-dep>
            </a-form-model-item>
          </a-col>
          <a-col :span="12">
            <a-form-model-item label="二级响应人(升级一次)" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="secondResponder">
              <j-select-user-by-dep :multi="false" v-model="model.secondResponder" placeholder="请输入二级响应人(升级一次)"  ></j-select-user-by-dep>
            </a-form-model-item>
          </a-col>
          <a-col :span="12">
            <a-form-model-item label="三级响应人(升级两次)" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="thirdResponder">
              <j-select-user-by-dep :multi="false" v-model="model.thirdResponder" placeholder="请输入三级响应人(升级两次)"  ></j-select-user-by-dep>
            <a-form-model-item
              label="三级响应人"
              :labelCol="labelCol"
              :wrapperCol="wrapperCol"
              prop="thirdResponder"
            >
              <j-select-user-by-dep
                :multi="false"
                v-model="model.thirdResponder"
                placeholder="请选择"
              ></j-select-user-by-dep>
            </a-form-model-item>
          </a-col>
        </a-row>
@@ -53,113 +77,153 @@
</template>

<script>
import { httpAction } from '@/api/manage'
import JSelectFactory from '@comp/jeecgbiz/JSelectFactory.vue'

  import { httpAction, getAction } from '@/api/manage'
  import { validateDuplicateValue } from '@/utils/util'
  import JSelectFactory from '@comp/jeecgbiz/JSelectFactory.vue'
  export default {
    name: 'AndonResponseConfigForm',
    components: {
      JSelectFactory
    },
    props: {
      //表单禁用
      disabled: {
        type: Boolean,
        default: false,
        required: false
      }
    },
    data () {
      return {
        model:{
         },
        labelCol: {
          xs: { span: 24 },
          sm: { span: 5 },
        },
        wrapperCol: {
          xs: { span: 24 },
          sm: { span: 16 },
        },
        confirmLoading: false,
        validatorRules: {
          factoryId: [
            { required: true, message: '产线是必选项', trigger: 'change' }
          ],
          buttonId: [
            { required: true, message: '安灯类型是必选项', trigger: 'change' }
          ],
          firsterResponder: [
            { required: true, message: '初始响应人是必选项', trigger: 'change' }
          ],
          secondResponder: [
            { required: true, message: '二级响应人是必选项', trigger: 'change' }
          ],
          thirdResponder: [
            { required: true, message: '三级响应人是必选项', trigger: 'change' }
          ],
        },
        url: {
          add: "/andonresponseconfig/andonResponseConfig/add",
          edit: "/andonresponseconfig/andonResponseConfig/edit",
          queryById: "/andonresponseconfig/andonResponseConfig/queryById"
        }
      }
    },
    computed: {
      formDisabled(){
        return this.disabled
      },
    },
    created () {
       //备份model原始值
      this.modelDefault = JSON.parse(JSON.stringify(this.model));
    },
    methods: {
      backFactoryInfo(info) {
        this.model.factoryIds = this.model.factoryId
        this.nextFactoryOptions = info.map((item, index, arr) => {
          let c = { label: item.text, value: item.value + '' }
          return c
        })
      },
      add () {
        this.edit(this.modelDefault);
      },
      edit (record) {
        this.model = Object.assign({}, record);
        this.visible = true;
      },
      submitForm () {
        const that = this;
        // è§¦å‘表单验证
        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)=>{
              if(res.success){
                that.$message.success(res.message);
                that.$emit('ok');
              }else{
                that.$message.warning(res.message);
              }
            }).finally(() => {
              that.confirmLoading = false;
            })
          }

        })
      },
export default {
  name: 'AndonResponseConfigForm',
  components: {
    JSelectFactory
  },
  props: {
    disabled: {
      type: Boolean,
      default: false,
      required: false
    }
  },
  data () {
    return {
      model: {},
      // ç»Ÿä¸€æ ‡ç­¾åˆ—宽度（产线、安灯类型等共用）
      labelCol: {
        xs: { span: 24 },
        sm: { span: 6 },
      },
      // ç»Ÿä¸€è¾“入框列宽度
      wrapperCol: {
        xs: { span: 24 },
        sm: { span: 18 },
      },
      confirmLoading: false,
      validatorRules: {
        factoryId: [
          { required: true, message: '产线是必选项', trigger: 'change' }
        ],
        buttonId: [
          { required: true, message: '安灯类型是必选项', trigger: 'change' }
        ],
        firsterResponder: [
          { required: true, message: '初始响应人是必选项', trigger: 'change' }
        ],
        secondResponder: [
          { required: true, message: '二级响应人是必选项', trigger: 'change' }
        ],
        thirdResponder: [
          { required: true, message: '三级响应人是必选项', trigger: 'change' }
        ],
      },
      url: {
        add: "/andonresponseconfig/andonResponseConfig/add",
        edit: "/andonresponseconfig/andonResponseConfig/edit",
        queryById: "/andonresponseconfig/andonResponseConfig/queryById"
      }
    }
  },
  computed: {
    formDisabled(){
      return this.disabled
    },
  },
  created () {
    this.modelDefault = JSON.parse(JSON.stringify(this.model));
  },
  methods: {
    backFactoryInfo(info) {
      this.model.factoryIds = this.model.factoryId
      this.nextFactoryOptions = info.map((item, index, arr) => {
        let c = { label: item.text, value: item.value + '' }
        return c
      })
    },
    add () {
      this.edit(this.modelDefault);
    },
    edit (record) {
      this.model = Object.assign({}, record);
      this.visible = true;
    },
    submitForm () {
      const that = this;
      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)=>{
            if(res.success){
              that.$message.success(res.message);
              that.$emit('ok');
            }else{
              that.$message.warning(res.message);
            }
          }).finally(() => {
            that.confirmLoading = false;
          })
        }
      })
    },
  }
</script>
}
</script>

<style scoped>
.andon-response-form {
  padding: 24px;
  background-color: #fff;
  border-radius: 8px;
  box-shadow: 0 2px 8px rgba(0, 0, 0, 0.1);
}
.a-form-model-item {
  margin-bottom: 20px !important;
}
.a-form-model-item-label {
  margin-right: 16px !important;
}
.a-input::placeholder,
.a-select-selection-placeholder {
  color: #ccc;
  font-style: italic;
}
.a-form-model-item-label > span:first-child {
  color: #f5222d;
  margin-right: 4px;
}
.a-form-footer {
  text-align: right;
  margin-top: 36px;
}
.a-button-primary {
  background-color: #1890ff;
  border-color: #1890ff;
  transition: all 0.3s ease;
}
.a-button-primary:hover {
  background-color: #40a9ff;
  border-color: #40a9ff;
}
.a-button-default {
  border-color: #d9d9d9;
  transition: all 0.3s ease;
}
.a-button-default:hover {
  border-color: #bfbfbf;
}
</style>

 src/views/base/FactoryManager.vue

@@ -72,7 +72,7 @@
              <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="factoryName" :label="nameLabel">
                <a-input placeholder="请输入产线/车间名称" v-model="model.factoryName"/>
              </a-form-model-item>
              <a-form-model-item v-if="this.factoryCategory == '3'" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="productionType" :label="nameLabel">
              <a-form-model-item v-if="this.factoryCategory == '3'" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="productionType" label="产线类型">
                <j-dict-select-tag type="list" placeholder="请选择产线类型" v-model="model.productionType" dictCode="production_type"/>
              </a-form-model-item>
              <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="父节点">

 src/views/cms/CuttingInboundList.vue

@@ -51,10 +51,10 @@
    <!-- æ“ä½œæŒ‰é’®åŒºåŸŸ -->
    <div class="table-operator">
      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
      <!-- <a-button type="primary" icon="download" @click="handleExportXls('刀具入库单')">导出</a-button>
      <a-button type="primary" icon="download" @click="handleExportXls('刀具入库单')">导出</a-button>
      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
        <a-button type="primary" icon="import">导入</a-button>
      </a-upload> -->
      </a-upload>
    </div>

    <!-- table区域-begin -->
@@ -128,6 +128,9 @@
  </a-card>
</template>




<script>

  import '@/assets/less/TableExpand.less'
@@ -135,6 +138,10 @@
  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
  import CuttingInboundModal from './modules/CuttingInboundModal'
  import CuttingInboundDetailList from './CuttingInboundDetailList'
  import { downFile } from '@api/manage'
  import Vue from 'vue'
  import { ACCESS_TOKEN } from '@/store/mutation-types'
  import store from '@/store'


  export default {
@@ -198,7 +205,7 @@
          {
            title:'入库单状态',
            align:"center",
            dataIndex: 'orderStatus'
            dataIndex: 'orderStatus_dictText',
          },
          {
            title: '操作',
@@ -215,14 +222,15 @@
          deleteBatch: "/cms/cuttingInbound/deleteBatch",
          exportXlsUrl: "/cms/cuttingInbound/exportXls",
          importExcelUrl: "cms/cuttingInbound/importExcel",
          
        },
        dictOptions:{},
        superFieldList:[],
      }
    },
    created() {
    this.getSuperFieldList();
      this.getSuperFieldList();
      // æ·»åŠ å­—典数据加载
      this.initDictConfig();
    },
    computed: {
      importExcelUrl: function(){
@@ -234,43 +242,146 @@
      this.queryParam = {}
      this.$refs.cuttingInbounDetailList.dataSource = []
      this.loadData(1);
    },
      },
      handleEdit: function (record) {
        this.$refs.modalForm.edit(record)
        this.$refs.modalForm.title = '编辑'
        this.$refs.modalForm.disableSubmit = false
    },
    handleAdd() {
      this.$refs.modalForm.add()
      this.$refs.modalForm.title = '新增'
      this.$refs.modalForm.disableSubmit = false
    },
    handleDetail:function(record){
      this.$refs.modalForm.edit(record);
      this.$refs.modalForm.title="详情";
      this.$refs.modalForm.disableSubmit = true;
    },
     customRow(record) {
      return {
        on: {
          click: (e) => {
            //将当前选中的记录传到子页面
            this.$bus.$emit('getToolingStorageData', record)
            //点击当前行变色
            let oldList = document.querySelectorAll('.checked-td-of-add-table')
            if (oldList) {
              for (let j = 0; j < oldList.length; j++) {
                oldList[j].classList.remove('checked-td-of-add-table')
      },
      handleAdd() {
        this.$refs.modalForm.add()
        this.$refs.modalForm.title = '新增'
        this.$refs.modalForm.disableSubmit = false
      },
      handleDetail:function(record){
        this.$refs.modalForm.edit(record);
        this.$refs.modalForm.title="详情";
        this.$refs.modalForm.disableSubmit = true;
      },
      // è‡ªå®šä¹‰è¡Œç‚¹å‡»äº‹ä»¶
      customRow(record) {
        return {
          on: {
            click: (e) => {
              //将当前选中的记录传到子页面
              this.$bus.$emit('getToolingStorageData', record)
              //点击当前行变色
              let oldList = document.querySelectorAll('.checked-td-of-add-table')
              if (oldList) {
                for (let j = 0; j < oldList.length; j++) {
                  oldList[j].classList.remove('checked-td-of-add-table')
                }
              }
            }
            let children = e.target.parentNode.children
            for (let i = 0; i < children.length; i++) {
              children[i].classList.add('checked-td-of-add-table')
            }
              let children = e.target.parentNode.children
              for (let i = 0; i < children.length; i++) {
                children[i].classList.add('checked-td-of-add-table')
              }
            },
          },
        },
      }
    },
        }
      },

      handleExportXls(fileName){
        if(!fileName || typeof fileName != "string"){
          fileName = "导出文件"
        }
        let param = this.getQueryParams();
        if(this.selectedRowKeys && this.selectedRowKeys.length>0){
          param['selections'] = this.selectedRowKeys.join(",")
        }



        console.log("导出参数",param)
        downFile(this.url.exportXlsUrl,param).then((data)=>{
          if (!data) {
            // this.$message.warning("文件下载失败")
            this.$notification.warning({
              message:'消息',
              description:"文件下载失败"
            });
            return
          }
          if (typeof window.navigator.msSaveBlob !== 'undefined') {
            window.navigator.msSaveBlob(new Blob([data],{type: 'application/vnd.ms-excel'}), fileName+'.xls')
          }else{
            let url = window.URL.createObjectURL(new Blob([data],{type: 'application/vnd.ms-excel'}))
            let link = document.createElement('a')
            link.style.display = 'none'
            link.href = url
            link.setAttribute('download', fileName+'.xls')
            document.body.appendChild(link)
            link.click()
            document.body.removeChild(link); //下载完成移除元素
            window.URL.revokeObjectURL(url); //释放掉blob对象
          }
        })
      },

      /* å¯¼å…¥ */
      handleImportExcel(info){
        this.loading = true;
        if (info.file.status !== 'uploading') {
          console.log(info.file, info.fileList);
        }
        if (info.file.status === 'done') {
          this.loading = false;
          if (info.file.response.success) {
            // this.$message.success(`${info.file.name} æ–‡ä»¶ä¸Šä¼ æˆåŠŸ`);
            if (info.file.response.code === 201) {
              let { message, result: { msg, fileUrl, fileName } } = info.file.response
              let href = window._CONFIG['domianURL'] + fileUrl
              this.$warning({
                title: message,
                content: (<div>
                    <span>{msg}</span><br/>
                    <span>具体详情请 <a href={href} target="_blank" download={fileName}>点击下载</a> </span>
                  </div>
                )
              })
            } else {
              // this.$message.success(info.file.response.message || `${info.file.name} æ–‡ä»¶ä¸Šä¼ æˆåŠŸ`)
              this.$notification.success({
                message:'消息',
                description:info.file.response.message || `${info.file.name} æ–‡ä»¶ä¸Šä¼ æˆåŠŸ`
              });
            }
            this.loadData()
          } else {
            // this.$message.error(`${info.file.name} ${info.file.response.message}.`);
            this.$notification.error({
              message:'消息',
              description:`${info.file.name} ${info.file.response.message}.`
            });
          }
        } else if (info.file.status === 'error') {
          this.loading = false;
          if (info.file.response.status === 500) {
            let data = info.file.response
            const token = Vue.ls.get(ACCESS_TOKEN)
            if (token && data.message.includes("Token失效")) {
              this.$error({
                title: '登录已过期',
                content: '很抱歉，登录已过期，请重新登录',
                okText: '重新登录',
                mask: false,
                onOk: () => {
                  store.dispatch('Logout').then(() => {
                    Vue.ls.remove(ACCESS_TOKEN)
                    window.location.reload();
                  })
                }
              })
            }
          } else {
            // this.$message.error(`文件上传失败: ${info.file.msg} `);
            this.$notification.error({
              message:'消息',
              description:`文件上传失败: ${info.file.msg} `
            });
          }
        }
      },
    }
  }
</script>

 src/views/cms/CuttingList.vue

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,43 @@
<template >
  <a-card :bordered="false" :body-style="{ padding: '0 24px 24px 24px' }">
    <a-tabs default-active-key="1">
      <a-tab-pane key="1" tab="刀具信息">
        <cutting-tool-list ref="cuttingToolList"></cutting-tool-list>
      </a-tab-pane>
      <a-tab-pane key="2" tab="刀具库存">
        <cutting-inventory-list ref="cuttingInventoryList"></cutting-inventory-list>
      </a-tab-pane>
      <a-tab-pane key="3" tab="刀具额定寿命">
        <rated-life-list ref="RatedLifeList"></rated-life-list>
      </a-tab-pane>
    </a-tabs>
  </a-card>
</template>

<script>
import CuttingToolList from './CuttingToolList'
import CuttingInventoryList from './CuttingInventoryList'
import RatedLifeList from './RatedLifeList.vue'

export default {
  name: '刀具台账',
  components: {
    CuttingToolList,
    CuttingInventoryList,
    RatedLifeList,
  },
  data() {
    return {}
  },
  methods: {
    callback(key) {
      console.log('切换到页签:', key)
    }
  }
}
</script>

<style scoped>
@import '~@assets/less/common.less';

</style>

 src/views/cms/CuttingToolList.vue

@@ -1,5 +1,5 @@
<template>
  <a-card :bordered="false">
  <a-card :bordered="false" >
    <!-- æŸ¥è¯¢åŒºåŸŸ -->
    <div class="table-page-search-wrapper">
      <a-form layout="inline" @keyup.enter.native="searchQuery">
@@ -10,38 +10,23 @@
            </a-form-item>
          </a-col>
          <a-col :md="6" :sm="8">
              <a-form-item label="刀具名称">
                <a-input placeholder="请输入刀具名称" v-model="queryParam.cuttingName" />
              </a-form-item>
            </a-col>
            <a-form-item label="刀具名称">
              <a-input placeholder="请输入刀具名称" v-model="queryParam.cuttingName" />
            </a-form-item>
          </a-col>
          <a-col :md="6" :sm="8">
              <a-form-item label="刀具分类">
                <j-search-select-tag
                  placeholder="请选择刀具分类"
                  v-model="queryParam.cuttingCategory"
                  dict="cutting_category"
                />
              </a-form-item>
            </a-col>
            <a-col
            :md="6"
            :sm="8"
          >
            <span
              style="float: left;overflow: hidden;"
              class="table-page-search-submitButtons"
            >
              <a-button
                type="primary"
                @click="searchQuery"
                icon="search"
              >查询</a-button>
              <a-button
                type="primary"
                @click="searchReset"
                icon="reload"
                style="margin-left: 8px"
              >重置</a-button>
            <a-form-item label="刀具分类">
              <j-search-select-tag
                placeholder="请选择刀具分类"
                v-model="queryParam.cuttingCategory"
                dict="cutting_category"
              />
            </a-form-item>
          </a-col>
          <a-col :md="6" :sm="8">
            <span style="float: left; overflow: hidden;" class="table-page-search-submitButtons">
              <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
              <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
            </span>
          </a-col>
        </a-row>
@@ -52,9 +37,14 @@
    <!-- æ“ä½œæŒ‰é’®åŒºåŸŸ -->
    <div class="table-operator">
      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
      <!-- å¯¼å…¥ã€å¯¼å‡ºåŠŸèƒ½ -->
      <a-button type="primary" icon="download" @click="handleExportXls('刀具信息')">导出</a-button>
      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
      <a-upload
        name="file"
        :showUploadList="false"
        :multiple="false"
        :headers="tokenHeader"
        :action="importExcelUrl"
        @change="handleImportExcel">
        <a-button type="primary" icon="import">导入</a-button>
      </a-upload>
    </div>
@@ -62,7 +52,8 @@
    <!-- 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>项
        <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>

@@ -71,12 +62,12 @@
        size="middle"
        :scroll="{x:true}"
        bordered
        rowKey="id"
        :rowKey="record => record.id"
        :columns="columns"
        :dataSource="dataSource"
        :pagination="ipagination"
        :loading="loading"
        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange,type:'radio'}"
        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange, type:'radio'}"
        class="j-table-force-nowrap"
        :customRow="customRow"
        @change="handleTableChange">
@@ -84,10 +75,19 @@
        <template slot="htmlSlot" slot-scope="text">
          <div v-html="text"></div>
        </template>

        <template slot="imgSlot" slot-scope="text,record">
          <span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>
          <img v-else :src="getImgView(text)" :preview="record.id" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/>
          <img
            v-else
            :src="getImgView(text)"
            :preview="record.id"
            height="25px"
            alt=""
            style="max-width:80px;font-size: 12px;font-style: italic;"
          />
        </template>

        <template slot="fileSlot" slot-scope="text">
          <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
          <a-button
@@ -103,7 +103,6 @@

        <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>
@@ -119,165 +118,162 @@
            </a-menu>
          </a-dropdown>
        </span>

      </a-table>
    </div>

    <a-tabs defaultActiveKey="1">
      <a-tab-pane tab="扩展属性" key="1">
        <cutting-properties-list ref="cuttingPropertiesList"></cutting-properties-list>
      </a-tab-pane>
      <!-- <a-tab-pane tab="额定寿命" key="2">
        <rated-life-list ref="ratedLifeList"></rated-life-list>
      </a-tab-pane> -->
    </a-tabs>
    <!-- table区域-end -->
    <cutting-tool-modal ref="modalForm" @ok="modalFormOk"></cutting-tool-modal>

    <cutting-tool-modal ref="modalForm" @ok="handleOk"></cutting-tool-modal>
  </a-card>
</template>

<script>
import '@/assets/less/TableExpand.less'
import { mixinDevice } from '@/utils/mixin'
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import CuttingToolModal from './modules/CuttingToolModal'
import CuttingPropertiesList from './CuttingPropertiesList'
import JDictSelectTag from '@/components/dict/JDictSelectTag'
import JSearchSelectTag from '@/components/dict/JSearchSelectTag'

  import '@/assets/less/TableExpand.less'
  import { mixinDevice } from '@/utils/mixin'
  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
  import CuttingToolModal from './modules/CuttingToolModal'
  import CuttingPropertiesList from './CuttingPropertiesList'
  import JDictSelectTag from '@/components/dict/JDictSelectTag'
  import JSearchSelectTag from '@/components/dict/JSearchSelectTag'

  export default {
    name: 'CuttingToolList',
    mixins:[JeecgListMixin, mixinDevice],
    components: {
      CuttingToolModal,CuttingPropertiesList, JDictSelectTag,
export default {
  name: 'CuttingToolList',
  mixins: [JeecgListMixin, mixinDevice],
  components: {
    CuttingToolModal,
    CuttingPropertiesList,
    JDictSelectTag,
    JSearchSelectTag
    },
    data () {
      return {
        description: '刀具信息管理页面',
        // è¡¨å¤´
        columns: [
          {
            title: '#',
            dataIndex: '',
            key:'rowIndex',
            width:60,
            align:"center",
            customRender:function (t,r,index) {
              return parseInt(index)+1;
            }
          },
          {
            title:'刀具编码',
            align:"center",
            dataIndex: 'cuttingCode'
          },
          {
            title:'刀具名称',
            align:"center",
            dataIndex: 'cuttingName'
          },
          {
            title:'刀具分类',
            align:"center",
            dataIndex: 'cuttingCategory'
          },
          {
            title:'存放位置',
            align:"center",
            dataIndex: 'storeLocation'
          },
          {
            title:'供应商',
            align:"center",
            dataIndex: 'supplierId'
          },
          {
            title:'最小包装单位',
            align:"center",
            dataIndex: 'minimumPackageUnit'
          },
          {
            title:'刀具材质',
            align:"center",
            dataIndex: 'cuttingMaterial'
          },
          {
            title:'型号',
            align:"center",
            dataIndex: 'cuttingModel'
          },
          {
            title:'图号',
            align:"center",
            dataIndex: 'drawingNumber'
          },
          {
            title:'库存预警值',
            align:"center",
            dataIndex: 'inventoryWarning'
          },
          {
            title:'备注',
            align:"center",
            dataIndex: 'remark'
          },
          {
            title: '操作',
            dataIndex: 'action',
            align:"center",
            fixed:"right",
            width:147,
            scopedSlots: { customRender: 'action' }
          }
        ],
        url: {
          list: "/cms/cuttingTool/getCuttingToolList",
          delete: "/cms/cuttingTool/delete",
          deleteBatch: "/cms/cuttingTool/deleteBatch",
          exportXlsUrl: "/cms/cuttingTool/exportXls",
          importExcelUrl: "cms/cuttingTool/importExcel",
          
  },
  data() {
    return {
      description: '刀具信息管理页面',
      columns: [
        {
          title: '#',
          dataIndex: '',
          key: 'rowIndex',
          width: 60,
          align: "center",
          customRender: (t, r, index) => parseInt(index) + 1
        },
        dictOptions:{},
        superFieldList:[],
      }
    },
    created() {
      this.getSuperFieldList();
    },
    computed: {
      importExcelUrl: function(){
        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
        {
          title: '刀具编码',
          align: "center",
          dataIndex: 'cuttingCode'
        },
        {
          title: '刀具名称',
          align: "center",
          dataIndex: 'cuttingName'
        },
        {
          title: '刀具分类',
          align: "center",
          dataIndex: 'cuttingCategory'
        },
        {
          title: '存放位置',
          align: "center",
          dataIndex: 'storeLocation'
        },
        {
          title: '供应商',
          align: "center",
          dataIndex: 'supplierId'
        },
        {
          title: '最小包装单位',
          align: "center",
          dataIndex: 'minimumPackageUnit'
        },
        {
          title: '刀具材质',
          align: "center",
          dataIndex: 'cuttingMaterial'
        },
        {
          title: '型号',
          align: "center",
          dataIndex: 'cuttingModel'
        },
        {
          title: '图号',
          align: "center",
          dataIndex: 'drawingNumber'
        },
        {
          title: '库存预警值',
          align: "center",
          dataIndex: 'inventoryWarning'
        },
        {
          title: '备注',
          align: "center",
          dataIndex: 'remark'
        },
        {
          title: '操作',
          dataIndex: 'action',
          align: "center",
          fixed: "right",
          width: 147,
          scopedSlots: { customRender: 'action' }
        }
      ],
      url: {
        list: "/cms/cuttingTool/getCuttingToolList",
        delete: "/cms/cuttingTool/delete",
        deleteBatch: "/cms/cuttingTool/deleteBatch",
        exportXlsUrl: "/cms/cuttingTool/exportXls",
        importExcelUrl: "cms/cuttingTool/importExcel"
      },
    },
    methods: {
      customRow(record) {
        return {
      dictOptions: {},
      superFieldList: []
    }
  },
  computed: {
    importExcelUrl() {
      return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
    }
  },
  created() {
    this.getSuperFieldList();
  },
  methods: {
    customRow(record) {
      return {
        on: {
          click: e => {
            this.onSelectChange(record.id.split(","), [record]);
          click: () => {
            this.onSelectChange([record.id], [record]);
          }
        }
      };
      },
      onSelectChange(selectedRowKeys) {
      this.selectedRowKeys = selectedRowKeys;
      this.$refs.cuttingPropertiesList.getCuttingProperties(selectedRowKeys[0]);
    },
    handleEdit: function (record) {
        this.$refs.modalForm.edit(record)
        this.$refs.modalForm.title = '编辑'
        this.$refs.modalForm.disableSubmit = false
    onSelectChange(selectedRowKeys) {
      this.selectedRowKeys = selectedRowKeys;
      if (selectedRowKeys.length > 0) {
        this.$refs.cuttingPropertiesList.getCuttingProperties(selectedRowKeys[0]);
      }
    },
    handleEdit(record) {
      this.$refs.modalForm.edit(record);
      this.$refs.modalForm.title = '编辑';
      this.$refs.modalForm.disableSubmit = false;
    },
    handleAdd() {
      this.$refs.modalForm.add()
      this.$refs.modalForm.title = '新增'
      this.$refs.modalForm.disableSubmit = false
      this.$refs.modalForm.add();
      this.$refs.modalForm.title = '新增';
      this.$refs.modalForm.disableSubmit = false;
    },
    handleDetail:function(record){
    handleDetail(record) {
      this.$refs.modalForm.edit(record);
      this.$refs.modalForm.title="详情";
      this.$refs.modalForm.title = "详情";
      this.$refs.modalForm.disableSubmit = true;
    },
    searchQuery() {
@@ -288,15 +284,24 @@
      this.loadData();
    },
    searchReset() {
      this.queryParam.cuttingCode = '';
      this.queryParam.cuttingName = '';
      this.queryParam.cuttingCategory = '';
      this.queryParam = {
        cuttingCode: '',
        cuttingName: '',
        cuttingCategory: ''
      };
      this.$refs.cuttingPropertiesList.getCuttingProperties("-1");
      this.loadData();
    },
    }
    handleOk() {
      // æ–°å¢ž/修改 æˆåŠŸæ—¶ï¼Œé‡è½½åˆ—表
      this.loadData();
      //清空列表选中
      this.onClearSelected()
    },
  }
}
</script>

<style scoped>
  @import '~@assets/less/common.less';
@import '~@assets/less/common.less';
</style>

 src/views/cms/RatedLifeList.vue

@@ -43,10 +43,10 @@
    <!-- æ“ä½œæŒ‰é’®åŒºåŸŸ -->
    <div class="table-operator">
      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
      <!-- <a-button type="primary" icon="download" @click="handleExportXls('额定寿命')">导出</a-button>
      <a-button type="primary" icon="download" @click="handleExportXls('额定寿命')">导出</a-button>
      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
        <a-button type="primary" icon="import">导入</a-button>
      </a-upload> -->
      </a-upload>
    </div>

    <!-- table区域-begin -->
@@ -147,7 +147,8 @@
          {
            title:'刀具编码',
            align:"center",
            dataIndex: 'cuttingId'
            dataIndex: 'cuttingId',
            sorter: true
          },
          {
            title:'工件材质',
@@ -174,7 +175,7 @@
          deleteBatch: "/cms/ratedLife/deleteBatch",
          exportXlsUrl: "/cms/ratedLife/exportXls",
          importExcelUrl: "cms/ratedLife/importExcel",
          

        },
        dictOptions:{},
        superFieldList:[],

 src/views/cms/ToolStocktakingList.vue

@@ -232,9 +232,9 @@
      initDictConfig(){
      },
      handleAdd(){
      this.$refs.modalForm.add()
      this.$refs.modalForm.title = '新增'
      this.$refs.modalForm.disableSubmit = false      
        this.$refs.modalForm.add()
        this.$refs.modalForm.title = '新增'
        this.$refs.modalForm.disableSubmit = false      
      },
      getSuperFieldList(){
        let fieldList=[];

 src/views/cms/modules/CuttingToolModal.vue

@@ -98,8 +98,8 @@
                slot-scope='text, record, index'
              >
                <div :key="col.dataIndex">
                  
          



                  <a-input
                    :value="text"
@@ -329,7 +329,7 @@
      }
      this.$nextTick(() => {
        this.form.setFieldsValue(
          pick(this.model, 'cuttingCode', 'cuttingName', 'cuttingCategory', 'storeLocation','cuttingModel', 'supplierId', 'minimumPackageUnit', 
          pick(this.model, 'cuttingCode', 'cuttingName', 'cuttingCategory', 'storeLocation','cuttingModel', 'supplierId', 'minimumPackageUnit',
          'cuttingMaterial','drawingNumber','inventoryWarning','remark')
        )
      })
@@ -354,6 +354,7 @@
        this.deletePropertiesIds.push(record.id);
      }
    },

    handleOk() {
      const that = this
      let dataSource = that.dataSource;
@@ -388,7 +389,7 @@
    handleCancel() {
      this.close()
    },
  

    //添加扩展属性
    addPropertiesList() {
      const temp = [...(this.dataSource || [])]

 src/views/cms/modules/RatedLifeForm.vue

@@ -5,7 +5,14 @@
        <a-row>
          <a-col :span="24">
            <a-form-model-item label="刀具编码" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="cuttingId">
              <a-input v-model="model.cuttingId" placeholder="请输入刀具编码"  ></a-input>
<!--              <a-input v-model="model.cuttingId" placeholder="请输入刀具编码"  ></a-input>-->
              <j-search-select-tag
                placeholder="请选择刀具编码"
                v-model="model.cuttingId"
                :remoteSearch="true"
                :async="true"
                dict="cms_cutting_tool,cutting_code,cutting_code"
              />
            </a-form-model-item>
          </a-col>
          <a-col :span="24">
@@ -106,7 +113,7 @@
              that.confirmLoading = false;
            })
          }
         

        })
      },
    }

 src/views/mes/MesKittingCompletenessCheckList.vue

@@ -187,11 +187,11 @@
          }
        ],
        url: {
          list: "/meskittingcompletenesscheck/mesKittingCompletenessCheck/list",
          delete: "/meskittingcompletenesscheck/mesKittingCompletenessCheck/delete",
          deleteBatch: "/meskittingcompletenesscheck/mesKittingCompletenessCheck/deleteBatch",
          exportXlsUrl: "/meskittingcompletenesscheck/mesKittingCompletenessCheck/exportXls",
          importExcelUrl: "meskittingcompletenesscheck/mesKittingCompletenessCheck/importExcel",
          list: "/mes/mesKittingCompletenessCheck/list",
          delete: "/mes/mesKittingCompletenessCheck/delete",
          deleteBatch: "/mes/mesKittingCompletenessCheck/deleteBatch",
          exportXlsUrl: "/mes/mesKittingCompletenessCheck/exportXls",
          importExcelUrl: "mes/mesKittingCompletenessCheck/importExcel",

        },
        dictOptions:{},

 src/views/mes/MesMaterialTransferRequestList.vue

@@ -12,24 +12,24 @@
    <!-- æ“ä½œæŒ‰é’®åŒºåŸŸ -->
    <div class="table-operator">
      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
      <a-button type="primary" icon="download" @click="handleExportXls('物料拉动申请')">导出</a-button>
      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
        <a-button type="primary" icon="import">导入</a-button>
      </a-upload>
      <!-- é«˜çº§æŸ¥è¯¢åŒºåŸŸ -->
      <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
      <a-dropdown v-if="selectedRowKeys.length > 0">
        <a-menu slot="overlay">
          <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
          <a-menu-item key="1" @click="batchDel">
            <a-icon type="delete" />
            åˆ é™¤
          </a-menu-item>
        </a-menu>
        <a-button style="margin-left: 8px"> æ‰¹é‡æ“ä½œ <a-icon type="down" /></a-button>
        <a-button style="margin-left: 8px"> æ‰¹é‡æ“ä½œ
          <a-icon type="down" />
        </a-button>
      </a-dropdown>
    </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>项
        <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>

@@ -46,27 +46,6 @@
        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
        class="j-table-force-nowrap"
        @change="handleTableChange">

        <template slot="htmlSlot" slot-scope="text">
          <div v-html="text"></div>
        </template>
        <template slot="imgSlot" slot-scope="text,record">
          <span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>
          <img v-else :src="getImgView(text)" :preview="record.id" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/>
        </template>
        <template slot="fileSlot" slot-scope="text">
          <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
          <a-button
            v-else
            :ghost="true"
            type="primary"
            icon="download"
            size="small"
            @click="downloadFile(text)">
            ä¸‹è½½
          </a-button>
        </template>

        <span slot="action" slot-scope="text, record">
          <a @click="handleEdit(record)">编辑</a>

@@ -95,138 +74,104 @@

<script>

  import '@/assets/less/TableExpand.less'
  import { mixinDevice } from '@/utils/mixin'
  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
  import MesMaterialTransferRequestModal from './modules/MesMaterialTransferRequestModal'
  import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
import '@/assets/less/TableExpand.less'
import { mixinDevice } from '@/utils/mixin'
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import MesMaterialTransferRequestModal from './modules/MesMaterialTransferRequestModal'

  export default {
    name: 'MesMaterialTransferRequestList',
    mixins:[JeecgListMixin, mixinDevice],
    components: {
      MesMaterialTransferRequestModal
    },
    data () {
      return {
        description: '物料拉动申请管理页面',
        // è¡¨å¤´
        columns: [
          {
            title: '#',
            dataIndex: '',
            key:'rowIndex',
            width:60,
            align:"center",
            customRender:function (t,r,index) {
              return parseInt(index)+1;
            }
          },
          {
            title:'删除标记',
            align:"center",
            dataIndex: 'delFlag'
          },
          {
            title:'拉动单号',
            align:"center",
            dataIndex: 'requestCode'
          },
          {
            title:'工单ID',
            align:"center",
            dataIndex: 'workOrderId'
          },
          {
            title:'SAP预留号',
            align:"center",
            dataIndex: 'reservationCode'
          },
          {
            title:'发布状态',
            align:"center",
            dataIndex: 'publishStatus_dictText'
          },
          {
            title:'请求状态',
            align:"center",
            dataIndex: 'requestStatus_dictText'
          },
          {
            title:'请求时间',
            align:"center",
            dataIndex: 'requestTime'
          },
          {
            title:'原库存地',
            align:"center",
            dataIndex: 'originalWarehouseId'
          },
          {
            title:'目标库存地',
            align:"center",
            dataIndex: 'targetWarehouseId'
          },
          {
            title:'优先级（拉动类型）',
            align:"center",
            dataIndex: 'priority_dictText'
          },
          {
            title:'最晚配送时间',
            align:"center",
            dataIndex: 'latestDeliveryTime'
          },
          {
            title: '操作',
            dataIndex: 'action',
            align:"center",
            fixed:"right",
            width:147,
            scopedSlots: { customRender: 'action' }
export default {
  name: 'MesMaterialTransferRequestList',
  mixins: [JeecgListMixin, mixinDevice],
  components: {
    MesMaterialTransferRequestModal
  },
  data() {
    return {
      description: '物料拉动申请管理页面',
      // è¡¨å¤´
      columns: [
        {
          title: '#',
          dataIndex: '',
          key: 'rowIndex',
          width: 60,
          align: 'center',
          customRender: function(t, r, index) {
            return parseInt(index) + 1
          }
        ],
        url: {
          list: "/mesmaterialtransferrequest/mesMaterialTransferRequest/list",
          delete: "/mesmaterialtransferrequest/mesMaterialTransferRequest/delete",
          deleteBatch: "/mesmaterialtransferrequest/mesMaterialTransferRequest/deleteBatch",
          exportXlsUrl: "/mesmaterialtransferrequest/mesMaterialTransferRequest/exportXls",
          importExcelUrl: "mesmaterialtransferrequest/mesMaterialTransferRequest/importExcel",
          
        },
        dictOptions:{},
        superFieldList:[],
      }
    },
    created() {
    this.getSuperFieldList();
    },
    computed: {
      importExcelUrl: function(){
        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
      },
    },
    methods: {
      initDictConfig(){
      },
      getSuperFieldList(){
        let fieldList=[];
        fieldList.push({type:'int',value:'delFlag',text:'删除标记',dictCode:''})
        fieldList.push({type:'string',value:'requestCode',text:'拉动单号',dictCode:''})
        fieldList.push({type:'string',value:'workOrderId',text:'工单ID',dictCode:''})
        fieldList.push({type:'string',value:'reservationCode',text:'SAP预留号',dictCode:''})
        fieldList.push({type:'string',value:'publishStatus',text:'发布状态',dictCode:'publish_status'})
        fieldList.push({type:'string',value:'requestStatus',text:'请求状态',dictCode:'request_status'})
        fieldList.push({type:'datetime',value:'requestTime',text:'请求时间'})
        fieldList.push({type:'string',value:'originalWarehouseId',text:'原库存地',dictCode:''})
        fieldList.push({type:'string',value:'targetWarehouseId',text:'目标库存地',dictCode:''})
        fieldList.push({type:'string',value:'priority',text:'优先级（拉动类型）',dictCode:'priority'})
        fieldList.push({type:'datetime',value:'latestDeliveryTime',text:'最晚配送时间'})
        this.superFieldList = fieldList
        {
          title: '拉动单号',
          align: 'center',
          dataIndex: 'requestCode'
        },
        {
          title: '工单ID',
          align: 'center',
          dataIndex: 'workOrderId'
        },
        {
          title: 'SAP预留号',
          align: 'center',
          dataIndex: 'reservationCode'
        },
        {
          title: '发布状态',
          align: 'center',
          dataIndex: 'publishStatus_dictText'
        },
        {
          title: '请求状态',
          align: 'center',
          dataIndex: 'requestStatus_dictText'
        },
        {
          title: '请求时间',
          align: 'center',
          dataIndex: 'requestTime'
        },
        {
          title: '原库存地',
          align: 'center',
          dataIndex: 'originalWarehouseId'
        },
        {
          title: '目标库存地',
          align: 'center',
          dataIndex: 'targetWarehouseId'
        },
        {
          title: '优先级（拉动类型）',
          align: 'center',
          dataIndex: 'priority_dictText'
        },
        {
          title: '最晚配送时间',
          align: 'center',
          dataIndex: 'latestDeliveryTime'
        },
        {
          title: '操作',
          dataIndex: 'action',
          align: 'center',
          fixed: 'right',
          width: 147,
          scopedSlots: { customRender: 'action' }
        }
      ],
      url: {
        list: '/mes/mesMaterialTransferRequest/list',
        delete: '/mes/mesMaterialTransferRequest/delete',
        deleteBatch: '/mes/mesMaterialTransferRequest/deleteBatch'
      }
    }
  }
  },
  created() {
  },
  computed: {},
  methods: {}
}
</script>
<style scoped>
  @import '~@assets/less/common.less';
@import '~@assets/less/common.less';
</style>

 src/views/mes/MesProductionOrderListView.vue

@@ -475,13 +475,13 @@
        ]
      },
      url: {
        list: '/mesproductionwork/mesProductionOrder/list',
        delete: '/mesproductionwork/mesProductionOrder/delete',
        deleteBatch: '/mesproductionwork/mesProductionOrder/deleteBatch',
        exportXlsUrl: '/mesproductionwork/mesProductionOrder/exportXls',
        importExcelUrl: 'mesproductionwork/mesProductionOrder/importExcel',
        queryWorkReportingByOrderId:'/mesworkreporting/mesWorkReporting/queryWorkReportingByOrderId',
        queryOrderPrintByOrderId:'/mestransferorderprint/mesTransferOrderPrint/queryOrderPrintByOrderId'
        list: '/mes/productionOrder/list',
        delete: '/mes/productionOrder/delete',
        deleteBatch: '/mes/productionOrder/deleteBatch',
        exportXlsUrl: '/mes/productionOrder/exportXls',
        importExcelUrl: 'mes/productionOrder/importExcel',
        queryWorkReportingByOrderId:'/mes/mesWorkReporting/queryWorkReportingByOrderId',
        queryOrderPrintByOrderId:'/mes/mesTransferOrderPrint/queryOrderPrintByOrderId'
      },
      dictOptions: {},
      superFieldList: []

 src/views/mes/MesProductionWorkOrderList.vue

@@ -275,14 +275,14 @@
        }
      ],
      url: {
        list: '/mesproductionworkorder/mesProductionWorkOrder/list',
        delete: '/mesproductionworkorder/mesProductionWorkOrder/delete',
        deleteBatch: '/mesproductionworkorder/mesProductionWorkOrder/deleteBatch',
        exportXlsUrl: '/mesproductionworkorder/mesProductionWorkOrder/exportXls',
        importExcelUrl: 'mesproductionworkorder/mesProductionWorkOrder/importExcel',
        list: '/mes/mesProductionWorkOrder/list',
        delete: '/mes/mesProductionWorkOrder/delete',
        deleteBatch: '/mes/mesProductionWorkOrder/deleteBatch',
        exportXlsUrl: '/mes/mesProductionWorkOrder/exportXls',
        importExcelUrl: 'mes/mesProductionWorkOrder/importExcel',
        listProductionLinesOption: '/base/factory/queryIdTree',
        schedule: '/mesproductionworkorder/mesProductionWorkOrder/schedule',
        publish: '/mesproductionworkorder/mesProductionWorkOrder/publish'
        schedule: '/mes/mesProductionWorkOrder/schedule',
        publish: '/mes/mesProductionWorkOrder/publish'
      },
      dictOptions: {},
      superFieldList: [],

 src/views/mes/MesProductionWorkOrderListView.vue

@@ -155,26 +155,6 @@
            </template>
          </j-vxe-table>
        </a-tab-pane>
        <a-tab-pane tab="物料拉动申请" :key="refKeys2[0]" :forceRender="true">
          <div style="display: flex; align-items: center; margin-bottom: 10px;">
          </div>
          <j-vxe-table
            keep-source
            :ref="refKeys2[0]"
            :loading="mesMaterialTransferRequest.loading"
            :columns="mesMaterialTransferRequest.columns"
            :dataSource="mesMaterialTransferRequest.dataSource"
            :maxHeight="300"
            :rowNumber="true"
            :rowSelection="true"
            :toolbar="false">
            <template slot="showTransferDetail" slot-scope="{row}">
              <a-button type="primary" @click="handleTransferDetail(row)" size="small">
                <a-icon type="eye" />物料拉动明细
              </a-button>
            </template>
          </j-vxe-table>
        </a-tab-pane>
        <a-tab-pane tab="上下料查询" :key="refKeys3[0]" :forceRender="true">
          <div style="display: flex; align-items: center; margin-bottom: 10px;">
          </div>
@@ -261,9 +241,6 @@
      // å·¥å•æŠ¥å·¥
      refKeys1: ['mesWorkReporting'],
      tableKeys1: ['mesWorkReporting'],
      //物料拉动申请
      refKeys2: ['mesMaterialTransferRequest'],
      tableKeys2: ['mesMaterialTransferRequest'],
      //上料
      refKeys3: ['mesMaterialLoading'],
      tableKeys3: ['mesMaterialLoading'],
@@ -455,101 +432,6 @@
          },
        ]
      },
      mesMaterialTransferRequest: {
        loading: false,
        dataSource: [],
        columns: [
          {
            title: '操作',
            key: 'action',
            type: JVXETypes.slot,
            slotName: 'showTransferDetail',
            width: '120px',
            align: 'center'
          },
          {
            title: '拉动单号',
            key: 'requestCode',
            type: JVXETypes.input,
            width: '200px',
            placeholder: '请输入${title}',
            defaultValue: ''
          },
          {
            title: '工单号',
            key: 'workOrderCode',
            type: JVXETypes.input,
            width: '200px',
            placeholder: '请输入${title}',
            defaultValue: ''
          },
          {
            title: 'SAP预留号',
            key: 'reservationCode',
            type: JVXETypes.input,
            width: '200px',
            placeholder: '请输入${title}',
            defaultValue: ''
          },
          {
            title: '发布状态',
            key: 'publishStatus',
            type: JVXETypes.input,
            width: '200px',
            placeholder: '请输入${title}',
            defaultValue: ''
          },
          {
            title: '请求状态',
            key: 'requestStatus',
            type: JVXETypes.input,
            width: '200px',
            placeholder: '请输入${title}',
            defaultValue: ''
          },
          {
            title: '请求时间',
            key: 'requestTime',
            type: JVXETypes.input,
            width: '200px',
            placeholder: '请输入${title}',
            defaultValue: ''
          },
          {
            title: '原库存地',
            key: 'originalWarehouseName',
            type: JVXETypes.input,
            width: '200px',
            placeholder: '请输入${title}',
            defaultValue: ''
          },
          {
            title: '目标库存地',
            key: 'targetWarehouseName',
            type: JVXETypes.input,
            width: '200px',
            placeholder: '请输入${title}',
            defaultValue: ''
          },
          {
            title: '优先级',
            key: 'priority',
            type: JVXETypes.select,
            dictCode: 'priority',
            width: '200px',
            placeholder: '请输入${title}',
            defaultValue: ''
          },
          {
            title: '最晚配送时间',
            key: 'latestDeliveryTime',
            type: JVXETypes.input,
            width: '200px',
            placeholder: '请输入${title}',
            defaultValue: ''
          },
        ]
      },
      mesMaterialLoading: {
        loading: false,
        dataSource: [],
@@ -691,20 +573,19 @@
        ]
      },
      url: {
        list: '/mesproductionworkorder/mesProductionWorkOrder/list',
        delete: '/mesproductionworkorder/mesProductionWorkOrder/delete',
        deleteBatch: '/mesproductionworkorder/mesProductionWorkOrder/deleteBatch',
        exportXlsUrl: '/mesproductionworkorder/mesProductionWorkOrder/exportXls',
        importExcelUrl: 'mesproductionworkorder/mesProductionWorkOrder/importExcel',
        queryWorkReportingByWorkOrderId:'/mesworkreporting/mesWorkReporting/queryWorkReportingByWorkOrderId',
        queryMaterialTransferRequestByWorkOrderId:'/mesmaterialtransferrequest/mesMaterialTransferRequest/queryMaterialTransferRequestByWorkOrderId',
        list: '/mes/mesProductionWorkOrder/list',
        delete: '/mes/mesProductionWorkOrder/delete',
        deleteBatch: '/mes/mesProductionWorkOrder/deleteBatch',
        exportXlsUrl: '/mes/mesProductionWorkOrder/exportXls',
        importExcelUrl: 'mes/mesProductionWorkOrder/importExcel',
        queryWorkReportingByWorkOrderId:'/mes/mesWorkReporting/queryWorkReportingByWorkOrderId',
        queryLoadingByWorkOrderId:'/mes/mesMaterialLoading/queryLoadingByWorkOrderId',
        queryCompletenessCheckByWorkOrderId:'/meskittingcompletenesscheck/mesKittingCompletenessCheck/queryCompletenessCheckByWorkOrderId',
        queryOrderById:'/mesproductionwork/mesProductionOrder/queryById',
        queryCompletenessCheckByWorkOrderId:'/mes/mesKittingCompletenessCheck/queryCompletenessCheckByWorkOrderId',
        queryOrderById:'/mes/productionOrder/queryById',
        queryUnloadingByLoadingId:'/mes/mesMaterialUnloading/queryUnloadingByLoadingId',
        queryTransferDetailBy:'/mes/mesMaterialTransferDetail/queryTransferDetailBy',
        publish: '/mesproductionworkorder/mesProductionWorkOrder/publish',
        execute: '/mesproductionworkorder/mesProductionWorkOrder/execute',
        publish: '/mes/mesProductionWorkOrder/publish',
        execute: '/mes/mesProductionWorkOrder/execute',
      },
      dictOptions: {},
      superFieldList: []
@@ -770,15 +651,13 @@
      this.$refs.MesProductionOrderModal.disableSubmit = true;
    },
    async onSelectChange(selectedRowKeys){
      //mesWorkReporting,mesMaterialTransferRequest,mesMaterialLoading,mesKittingCompletenessCheck
      //mesWorkReporting,·,mesMaterialLoading,mesKittingCompletenessCheck
      this.mesWorkReporting.loading = true
      this.mesMaterialTransferRequest.loading = true
      this.mesMaterialLoading.loading = true
      this.mesKittingCompletenessCheck.loading = true

      this.selectedRowKeys = selectedRowKeys
      this.mesWorkReporting.dataSource=[]
      this.mesMaterialTransferRequest.dataSource=[]
      this.mesMaterialLoading.dataSource=[]
      this.mesKittingCompletenessCheck.dataSource=[]
      if (selectedRowKeys.length > 0) {
@@ -787,15 +666,12 @@
          'workOrderId':selectedId
        }
        const mesWorkReportingResult = await getAction(this.url.queryWorkReportingByWorkOrderId, parm)
        const mesMaterialTransferRequestResult = await getAction(this.url.queryMaterialTransferRequestByWorkOrderId, parm)
        const mesMaterialLoadingResult = await getAction(this.url.queryLoadingByWorkOrderId, parm)
        const mesKittingCompletenessCheckResult = await getAction(this.url.queryCompletenessCheckByWorkOrderId, parm)
        this.mesWorkReporting.dataSource = mesWorkReportingResult.result
        this.mesMaterialTransferRequest.dataSource = mesMaterialTransferRequestResult.result
        this.mesMaterialLoading.dataSource = mesMaterialLoadingResult.result
        this.mesKittingCompletenessCheck.dataSource = mesKittingCompletenessCheckResult.result
        this.mesWorkReporting.loading = false
        this.mesMaterialTransferRequest.loading = false
        this.mesMaterialLoading.loading = false
        this.mesKittingCompletenessCheck.loading = false
      }

 src/views/mes/MesTransferOrderPrintList.vue

@@ -187,12 +187,12 @@
          }
        ],
        url: {
          list: "/mestransferorderprint/mesTransferOrderPrint/list",
          delete: "/mestransferorderprint/mesTransferOrderPrint/delete",
          deleteBatch: "/mestransferorderprint/mesTransferOrderPrint/deleteBatch",
          exportXlsUrl: "/mestransferorderprint/mesTransferOrderPrint/exportXls",
          importExcelUrl: "mestransferorderprint/mesTransferOrderPrint/importExcel",
          
          list: "/mes/mesTransferOrderPrint/list",
          delete: "/mes/mesTransferOrderPrint/delete",
          deleteBatch: "/mes/mesTransferOrderPrint/deleteBatch",
          exportXlsUrl: "/mes/mesTransferOrderPrint/exportXls",
          importExcelUrl: "mes/mesTransferOrderPrint/importExcel",

        },
        dictOptions:{},
        superFieldList:[],

 src/views/mes/MesWorkReportingList.vue

@@ -227,11 +227,11 @@
          }
        ],
        url: {
          list: "/mesworkreporting/mesWorkReporting/list",
          delete: "/mesworkreporting/mesWorkReporting/delete",
          deleteBatch: "/mesworkreporting/mesWorkReporting/deleteBatch",
          exportXlsUrl: "/mesworkreporting/mesWorkReporting/exportXls",
          importExcelUrl: "mesworkreporting/mesWorkReporting/importExcel",
          list: "/mes/mesWorkReporting/list",
          delete: "/mes/mesWorkReporting/delete",
          deleteBatch: "/mes/mesWorkReporting/deleteBatch",
          exportXlsUrl: "/mes/mesWorkReporting/exportXls",
          importExcelUrl: "mes/mesWorkReporting/importExcel",

        },
        dictOptions:{},

 src/views/mes/modules/MesKittingCompletenessCheckForm.vue

@@ -72,9 +72,9 @@
        validatorRules: {
        },
        url: {
          add: "/meskittingcompletenesscheck/mesKittingCompletenessCheck/add",
          edit: "/meskittingcompletenesscheck/mesKittingCompletenessCheck/edit",
          queryById: "/meskittingcompletenesscheck/mesKittingCompletenessCheck/queryById"
          add: "/mes/mesKittingCompletenessCheck/add",
          edit: "/mes/mesKittingCompletenessCheck/edit",
          queryById: "/mes/mesKittingCompletenessCheck/queryById"
        }
      }
    },
@@ -121,7 +121,7 @@
              that.confirmLoading = false;
            })
          }
         

        })
      },
    }

 src/views/mes/modules/MesMaterialTransferRequestForm.vue

@@ -4,58 +4,43 @@
      <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
        <a-row>
          <a-col :span="12">
            <a-form-model-item label="删除标记" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="delFlag">
              <a-input-number v-model="model.delFlag" placeholder="请输入删除标记" style="width: 100%" />
            </a-form-model-item>
          </a-col>
          <a-col :span="12">
            <a-form-model-item label="拉动单号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="requestCode">
              <a-input v-model="model.requestCode" placeholder="请输入拉动单号"  ></a-input>
              <a-input v-model="model.requestCode" placeholder="拉动单号自动生成" readOnly></a-input>
            </a-form-model-item>
          </a-col>
          <a-col :span="12">
            <a-form-model-item label="工单ID" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="workOrderId">
            <a-form-model-item label="起始库存地点" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="originalWarehouseId">
              <j-dict-select-tag type="list" v-model="model.originalWarehouseId" dictCode="original_warehouse_list" placeholder="请选择起始库存地点" />
            </a-form-model-item>
          </a-col>
          <a-col :span="12">
            <a-form-model-item label="任务号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="workOrderId">
              <a-input v-model="model.workOrderId" placeholder="请输入工单ID"  ></a-input>
            </a-form-model-item>
          </a-col>
          <a-col :span="12">
            <a-form-model-item label="SAP预留号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="reservationCode">
              <a-input v-model="model.reservationCode" placeholder="请输入SAP预留号"  ></a-input>
            <a-form-model-item label="目标库存地点" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="targetWarehouseId">
              <a-input v-model="model.targetWarehouseId" placeholder="自动获取" readOnly ></a-input>
            </a-form-model-item>
          </a-col>
          <a-col :span="12">
            <a-form-model-item label="发布状态" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="publishStatus">
              <j-dict-select-tag type="list" v-model="model.publishStatus" dictCode="publish_status" placeholder="请选择发布状态" />
            </a-form-model-item>
          </a-col>
          <a-col :span="12">
            <a-form-model-item label="请求状态" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="requestStatus">
              <j-dict-select-tag type="list" v-model="model.requestStatus" dictCode="request_status" placeholder="请选择请求状态" />
            </a-form-model-item>
          </a-col>
          <a-col :span="12">
            <a-form-model-item label="请求时间" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="requestTime">
              <j-date placeholder="请选择请求时间"  v-model="model.requestTime" :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" style="width: 100%" />
            </a-form-model-item>
          </a-col>
          <a-col :span="12">
            <a-form-model-item label="原库存地" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="originalWarehouseId">
              <a-input v-model="model.originalWarehouseId" placeholder="请输入原库存地"  ></a-input>
            </a-form-model-item>
          </a-col>
          <a-col :span="12">
            <a-form-model-item label="目标库存地" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="targetWarehouseId">
              <a-input v-model="model.targetWarehouseId" placeholder="请输入目标库存地"  ></a-input>
            </a-form-model-item>
          </a-col>
          <a-col :span="12">
            <a-form-model-item label="优先级（拉动类型）" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="priority">
              <j-dict-select-tag type="list" v-model="model.priority" dictCode="priority" placeholder="请选择优先级（拉动类型）" />
            <a-form-model-item label="拉动类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="materialTransferCategory">
              <j-dict-select-tag type="list" v-model="model.materialTransferCategory" dictCode="material_transfer_category" placeholder="请选择拉动类型" />
            </a-form-model-item>
          </a-col>
          <a-col :span="12">
            <a-form-model-item label="最晚配送时间" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="latestDeliveryTime">
              <j-date placeholder="请选择最晚配送时间"  v-model="model.latestDeliveryTime" :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" style="width: 100%" />
              <j-date placeholder="请选择最晚配送时间"  v-model="model.latestDeliveryTime" :show-time="false" date-format="YYYY-MM-DD" style="width: 100%" />
            </a-form-model-item>
          </a-col>
          <a-col :span="12">
            <a-form-model-item label="拉动物料" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="materialNumber">
              <j-dict-select-tag type="list" v-model="model.materialNumber" dictCode="priority" placeholder="请选择拉动物料" />
            </a-form-model-item>
          </a-col>
          <a-col :span="12">
            <a-form-model-item label="拉动数量" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="specifiedQuantity">
              <a-input-number v-model="model.specifiedQuantity" placeholder="请输入拉动数量" style="width: 100%" />
            </a-form-model-item>
          </a-col>
        </a-row>
@@ -87,7 +72,7 @@
         },
        labelCol: {
          xs: { span: 24 },
          sm: { span: 5 },
          sm: { span: 6 },
        },
        wrapperCol: {
          xs: { span: 24 },
@@ -95,11 +80,26 @@
        },
        confirmLoading: false,
        validatorRules: {
          originalWarehouseId: [
            { required: true, message: '起始库存地点必选', trigger: 'change' }
          ],
          workOrderId: [
            { required: true, message: '任务号必选', trigger: 'change' }
          ],
          materialNumber: [
            { required: true, message: '拉动物料必选', trigger: 'change' }
          ],
          specifiedQuantity: [
            { required: true, message: '拉动数量必填', trigger: 'change' }
          ],
          materialTransferCategory: [
            { required: true, message: '拉动类型必选', trigger: 'change' }
          ],
        },
        url: {
          add: "/mesmaterialtransferrequest/mesMaterialTransferRequest/add",
          edit: "/mesmaterialtransferrequest/mesMaterialTransferRequest/edit",
          queryById: "/mesmaterialtransferrequest/mesMaterialTransferRequest/queryById"
          add: "/mes/mesMaterialTransferRequest/add",
          edit: "/mes/mesMaterialTransferRequest/edit",
          queryById: "/mes/mesMaterialTransferRequest/queryById"
        }
      }
    },
@@ -146,7 +146,7 @@
              that.confirmLoading = false;
            })
          }
         

        })
      },
    }

 src/views/mes/modules/MesProductionWorkOrderCompletenessCheckModal.vue

@@ -107,8 +107,8 @@
      url: {
        report: '/mesworkreporting/mesWorkReporting/add',
        selectReportWorkOrderList: '/mes/productionOrder/selectReportWorkOrderList',
        workOrderCompletenessCheck: '/mesproductionworkorder/mesProductionWorkOrder/workOrderCompletenessCheck',
        add: '/meskittingcompletenesscheck/mesKittingCompletenessCheck/addBatch'
        workOrderCompletenessCheck: '/mes/mesProductionWorkOrder/workOrderCompletenessCheck',
        add: '/mes/mesKittingCompletenessCheck/addBatch'
      },
      workOrderOptions: []
    }

 src/views/mes/modules/MesProductionWorkOrderForm.vue

@@ -112,9 +112,9 @@
        validatorRules: {
        },
        url: {
          add: "/mesproductionworkorder/mesProductionWorkOrder/add",
          edit: "/mesproductionworkorder/mesProductionWorkOrder/edit",
          queryById: "/mesproductionworkorder/mesProductionWorkOrder/queryById"
          add: "/mes/mesProductionWorkOrder/add",
          edit: "/mes/mesProductionWorkOrder/edit",
          queryById: "/mes/mesProductionWorkOrder/queryById"
        }
      }
    },

 src/views/mes/modules/MesProductionWorkOrderListModal.vue

@@ -97,7 +97,7 @@
        workOrderDateOptions: [],
        url: {
          queryShiftGroupByFactoryId: '/base/shiftGroup/queryShiftGroupByFactoryId',
          addSchedulePlan: '/mesproductionworkorder/mesProductionWorkOrder/addSchedulePlan'
          addSchedulePlan: '/mes/mesProductionWorkOrder/addSchedulePlan'
        },
        editRules: {
          materialNumber: [

 src/views/mes/modules/MesProductionWorkOrderReportModal.vue

@@ -81,7 +81,7 @@
        sm: { span: 18 },
      },
      url: {
        report: '/mesworkreporting/mesWorkReporting/add',
        report: '/mes/mesWorkReporting/add',
        selectReportWorkOrderList: '/mes/productionOrder/selectReportWorkOrderList'
      },
      workOrderOptions: []

 src/views/mes/modules/MesProductionWorkOrderRepublishModal.vue

@@ -73,7 +73,7 @@
        sm: { span: 18 },
      },
      url: {
        republish: '/mesproductionworkorder/mesProductionWorkOrder/republish'
        republish: '/mes/mesProductionWorkOrder/republish'
      }
    }
  },

 src/views/mes/modules/MesProductionWorkOrderScheduleModal.vue

@@ -157,7 +157,6 @@
<!--              :layouts="['PrevPage', 'JumpNumber', 'NextPage', 'FullJump', 'Sizes', 'Total']"-->
<!--              @page-change="handlePageChange">-->
<!--            </vxe-pager>-->
          </div>
        </a-card>
      </a-col>
      <a-col :span="12">
@@ -233,16 +232,17 @@
      },
      // è¡¨å¤´
      url: {
        list: '/mesproductionworkorder/mesProductionWorkOrder/list',
        delete: '/mesproductionworkorder/mesProductionWorkOrder/delete',
        deleteBatch: '/mesproductionworkorder/mesProductionWorkOrder/deleteBatch',
        exportXlsUrl: '/mesproductionworkorder/mesProductionWorkOrder/exportXls',
        importExcelUrl: 'mesproductionworkorder/mesProductionWorkOrder/importExcel',
        list: '/mes/mesProductionWorkOrder/list',
        delete: '/mes/mesProductionWorkOrder/delete',
        deleteBatch: '/mes/mesProductionWorkOrder/deleteBatch',
        exportXlsUrl: '/mes/mesProductionWorkOrder/exportXls',
        importExcelUrl: 'mes/mesProductionWorkOrder/importExcel',
        listProductionLinesOption: '/base/factory/queryIdTree',
        queryShiftGroupByFactoryId: '/base/shiftGroup/queryShiftGroupByFactoryId',
        queryFactoryById: '/base/factory/queryById',
        schedule: '/mesproductionworkorder/mesProductionWorkOrder/schedule',
        addSchedulePlan: '/mesproductionworkorder/mesProductionWorkOrder/addSchedulePlan'
        queryLswMaterialByProductionType: '/lsw/lswMaterial/queryLswMaterialByProductionType',
        schedule: '/mes/mesProductionWorkOrder/schedule',
        addSchedulePlan: '/mes/mesProductionWorkOrder/addSchedulePlan'
      },
      editRules: {
        materialNumber: [
@@ -482,21 +482,20 @@
        });
        promises.push(shiftGroupPromise);

        const materialNumberPromise = ajaxGetDictItems("lsw_material,material_name,material_number,del_flag!='1' order by material_number asc", null).then(res => {
        const materialNumberPromise = getAction(this.url.queryLswMaterialByProductionType, { factoryId: factoryId }).then(res => {
          if (res.success) {
            this.materialOptions = res.result.map(item => {
              return {
                value: item.value,
                label: item.value
                value: item.materialNumber,
                label: item.materialNumber
              }
            });
            })
            this.materNumberNameMap = res.result.reduce((map, item) => {
              map[item.value] = item.text
              map[item.materialNumber] = item.materialName
              return map
            }, {})
          }
        }).catch(() => {
        });
        })
        promises.push(materialNumberPromise);

        // ç­‰å¾…所有请求完成
@@ -522,6 +521,8 @@
          if (this.dateRange[0]) {
            this.calendarStartDate = this.dateRange[0].clone().startOf('week');
          }
        } else {
          this.$message.error(res.message)
        }
      })
    },

 src/views/mes/modules/MesTransferOrderPrintForm.vue

@@ -97,9 +97,9 @@
        validatorRules: {
        },
        url: {
          add: "/mestransferorderprint/mesTransferOrderPrint/add",
          edit: "/mestransferorderprint/mesTransferOrderPrint/edit",
          queryById: "/mestransferorderprint/mesTransferOrderPrint/queryById"
          add: "/mes/mesTransferOrderPrint/add",
          edit: "/mes/mesTransferOrderPrint/edit",
          queryById: "/mes/mesTransferOrderPrint/queryById"
        }
      }
    },
@@ -146,7 +146,7 @@
              that.confirmLoading = false;
            })
          }
         

        })
      },
    }

 src/views/mes/modules/MesWorkReportingForm.vue

@@ -97,9 +97,9 @@
        validatorRules: {
        },
        url: {
          add: "/mesworkreporting/mesWorkReporting/add",
          edit: "/mesworkreporting/mesWorkReporting/edit",
          queryById: "/mesworkreporting/mesWorkReporting/queryById"
          add: "/mes/mesWorkReporting/add",
          edit: "/mes/mesWorkReporting/edit",
          queryById: "/mes/mesWorkReporting/queryById"
        }
      }
    },
@@ -146,7 +146,7 @@
              that.confirmLoading = false;
            })
          }
         

        })
      },
    }