Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before

zouyu

2024-01-17 3bda22fd0c61d053f0f817a95230d39c0c6baddb

Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before

 src/page/ScheduleData/index.vue

@@ -13,7 +13,7 @@
            @click="getCurrent(i)"
            ref="listItem"
          >
            è®¢å•å·ï¼š{{ x.customerOrderNo }}/{{ x.otcLineNo }}
            è®¢å•å·ï¼š{{ x.contractNo }}
          </div>
        </div>
        <!-- <el-pagination
@@ -176,6 +176,7 @@
        },
        1
      ).then((res) => {
        console.log(res,"1");
        const d = res.data.data
        this.pagination.total = d.total
        d.records.forEach((e) => (e.active = false))
@@ -212,6 +213,7 @@
                color: '#14a9d7'
              })
            )
            console.log(this.tasks,"----===");
            let endDate = e.actualFinishDate
            if (!e.actualFinishDate) {
              const s = Date.parse(e.actualStartDate)

 src/views/equipment/equipment/index.vue

@@ -97,6 +97,7 @@
          // è®¾å¤‡ç¼–号
          {
            minWidth: '30',
            width: '200',
            prop: 'number',
            label: '设备编号',
            sort: true,
@@ -110,8 +111,19 @@
          // è®¾å¤‡åç§°
          {
            minWidth: '30',
            width: '100',
            prop: 'name',
            label: '设备名称',
            sort: true,
            isTrue: true,
            isSearch: true,
            searchInfoType: 'text'
          },
          // çŠ¶æ€
          {
            minWidth: '30',
            prop: 'state',
            label: '状态',
            sort: true,
            isTrue: true,
            isSearch: true,
@@ -151,15 +163,15 @@
            searchInfoType: 'text'
          },
          // é‚®ç®±
          {
            minWidth: '30',
            prop: 'email',
            label: '邮箱',
            sort: true,
            isTrue: true,
            isSearch: false,
            searchInfoType: 'text'
          },
          // {
          //   minWidth: '30',
          //   prop: 'email',
          //   label: '邮箱',
          //   sort: true,
          //   isTrue: true,
          //   isSearch: false,
          //   searchInfoType: 'text'
          // },
          // ä¾›åº”商
          {
            minWidth: '30',
@@ -193,7 +205,7 @@
          // åˆ¶é€ æ—¥æœŸ
          {
            minWidth: '150',
            width: '250',
            width: '100',
            prop: 'manufactureDate',
            label: '制造日期',
            sort: true,
@@ -205,7 +217,7 @@
          // å®‰è£…日期
          {
            minWidth: '150',
            width: '250',
            width: '100',
            prop: 'installDate',
            label: '安装日期',
            sort: true,
@@ -213,16 +225,6 @@
            isSearch: true,
            formatter: this.formatReceiveTime,
            searchInfoType: 'datetimerange'
          },
          // çŠ¶æ€
          {
            minWidth: '30',
            prop: 'state',
            label: '状态',
            sort: true,
            isTrue: true,
            isSearch: true,
            searchInfoType: 'text'
          }
        ],
        toolbar: [],

 src/views/equipment/metering/index.vue

@@ -97,6 +97,7 @@
            // è®¾å¤‡ç¼–号
            {
              minWidth: '30',
              width: '100',
              prop: 'code',
              label: '设备编号',
              sort: true,
@@ -110,6 +111,7 @@
            // è®¾å¤‡åç§°
            {
              minWidth: '30',
              width: '100',
              prop: 'name',
              label: '设备名称',
              sort: true,
@@ -145,7 +147,7 @@
 // åˆ¶é€ æ—¥æœŸ
 {
              minWidth: '150',
              width: '250',
              width: '150',
              prop: 'createTime',
              label: '校准时间',
              sort: true,
@@ -157,7 +159,7 @@
           
            {
              minWidth: '150',
              width: '250',
              width: '150',
              prop: 'updateTime',
              label: '校准到期时间',
              sort: true,

 src/views/equipment/mould/index.vue

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,140 @@
<template>
    <div class="mod-config">
        <basic-container>
        <!-- <ttable
        :table="table"
        :isShowHide="true"
        :ajaxFun="ajaxFun"
        :prelang="prelang"
        :options="options" 
        ref="processconfiguration"
        > -->
        <!-- <template #toolbar></template>
        </ttable> -->
        <div>开发中。。。</div>
        </basic-container>
    </div>
</template>

<script>
import ttable from '@/views/common/ztt-table.vue'
import { fetchList, } from '@/api/quality/finishedDelivery'

export default {
    data(){
        return {
            ajaxFun: fetchList,
            prelang: 'operation',
            dataListLoading: false,
            options: {
                height: 300, // é»˜è®¤é«˜åº¦-为了表头固定
                stripe: true, // æ˜¯å¦ä¸ºæ–‘马纹 table
                highlightCurrentRow: false, // æ˜¯å¦è¦é«˜äº®å½“前行
                border: true, // æ˜¯å¦æœ‰çºµå‘边框
                lazy: false, // æ˜¯å¦éœ€è¦æ‡’加载
                fit: true, // åˆ—的宽度是否自撑开
                multiSelect: true, //
                seqNo: true,
                isShowHide: true, // æ˜¯å¦æ˜¾ç¤ºæ˜¾å½±æŒ‰é’®
                isRefresh: true, // æ˜¯å¦æ˜¾ç¤ºåˆ·æ–°æŒ‰é’®
                isSearch: true, // é«˜çº§æŸ¥è¯¢æŒ‰é’®
                defaultOrderBy: { column: 'createTime', direction: 'desc' }
            },
            table: {
                total: 0,
                currentPage: 1,
                pageSize: 20,
                data: [],
                // æ ‡é¢˜
                column: [
                  {
                    minWidth: '140',
                    prop: 'packageNo',
                    label: '包装编号',
                    isTrue: true,
                    isSearch: true,
                    searchInfoType: 'text',
                  },{
                    minWidth: '140',
                    prop: 'outBatchNo',
                    label: '批次号',
                    isTrue: true,
                    isSearch: true,
                    searchInfoType: 'text',
                  },
                  {
                    minWidth: '140',
                    prop: 'partNo',
                    label: '产品编号',
                    isTrue: true,
                    isSearch: true,
                    searchInfoType: 'text',
                  },
                  {
                    minWidth: '140',
                    prop: 'partName',
                    label: '产品名称',
                    isTrue: true,
                    isSearch: true,
                    searchInfoType: 'text',
                  },
                  {
                    minWidth: '140',
                    prop: 'specs',
                    label: '规格型号',
                    isTrue: true,
                    isSearch: true,
                    searchInfoType: 'text',
                  },
                  {
                    minWidth: '140',
                    prop: 'unit',
                    label: '单位',
                    isTrue: true,
                    isSearch: true,
                    searchInfoType: 'text',
                  },
                  {
                    minWidth: '140',
                    prop: 'number',
                    label: '数量',
                    isTrue: true,
                    isSearch: true,
                    searchInfoType: 'text',
                  },
                  {
                    minWidth: '130',
                    prop: 'createTime',
                    label: '入库时间',
                    sort: true,
                    isTrue: true,
                    isSearch: true,
                    searchInfoType: 'datetimerange',
                    formatter: this.formatDateTime,
                  },
                  {
                    minWidth: '130',
                    prop: 'createUser',
                    label: '创建人',
                    sort: true,
                    isTrue: true,
                    isSearch: true,
                    searchInfoType: 'text',
                  },
                ],
                toolbar: [],
                // operator: [],
                // operatorConfig: {}
            },
       }
    },
    components: {
      ttable
    },
    medthods: {
      formatDateTime(row, column, cellValue) {
          return cellValue ? fecha.format(new Date(cellValue), 'yyyy-MM-dd') : ''
      },
    },
}
</script>

 src/views/equipment/mouldrecord/index.vue

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,141 @@
<template>
    <div class="mod-config">
        <basic-container>
        <!-- <ttable
        :table="table"
        :isShowHide="true"
        :ajaxFun="ajaxFun"
        :prelang="prelang"
        :options="options" 
        ref="processconfiguration"
        >
        <template #toolbar></template>
        </ttable> -->
        <div>开发中。。。</div>
        </basic-container>
    </div>
</template>

<script>
import ttable from '@/views/common/ztt-table.vue'
import { fetchList, } from '@/api/quality/finishedDelivery'

export default {
    data(){
        return {
            ajaxFun: fetchList,
            prelang: 'operation',
            dataListLoading: false,
            options: {
                height: 300, // é»˜è®¤é«˜åº¦-为了表头固定
                stripe: true, // æ˜¯å¦ä¸ºæ–‘马纹 table
                highlightCurrentRow: false, // æ˜¯å¦è¦é«˜äº®å½“前行
                border: true, // æ˜¯å¦æœ‰çºµå‘边框
                lazy: false, // æ˜¯å¦éœ€è¦æ‡’加载
                fit: true, // åˆ—的宽度是否自撑开
                multiSelect: true, //
                seqNo: true,
                isShowHide: true, // æ˜¯å¦æ˜¾ç¤ºæ˜¾å½±æŒ‰é’®
                isRefresh: true, // æ˜¯å¦æ˜¾ç¤ºåˆ·æ–°æŒ‰é’®
                isSearch: true, // é«˜çº§æŸ¥è¯¢æŒ‰é’®
                defaultOrderBy: { column: 'createTime', direction: 'desc' }
            },
            table: {
                total: 0,
                currentPage: 1,
                pageSize: 20,
                data: [],
                // æ ‡é¢˜
                column: [
                  {
                    minWidth: '140',
                    prop: 'packageNo',
                    label: '包装编号',
                    isTrue: true,
                    isSearch: true,
                    searchInfoType: 'text',
                  },{
                    minWidth: '140',
                    prop: 'outBatchNo',
                    label: '批次号',
                    isTrue: true,
                    isSearch: true,
                    searchInfoType: 'text',
                  },
                  {
                    minWidth: '140',
                    prop: 'partNo',
                    label: '产品编号',
                    isTrue: true,
                    isSearch: true,
                    searchInfoType: 'text',
                  },
                  {
                    minWidth: '140',
                    prop: 'partName',
                    label: '产品名称',
                    isTrue: true,
                    isSearch: true,
                    searchInfoType: 'text',
                  },
                  {
                    minWidth: '140',
                    prop: 'specs',
                    label: '规格型号',
                    isTrue: true,
                    isSearch: true,
                    searchInfoType: 'text',
                  },
                  {
                    minWidth: '140',
                    prop: 'unit',
                    label: '单位',
                    isTrue: true,
                    isSearch: true,
                    searchInfoType: 'text',
                  },
                  {
                    minWidth: '140',
                    prop: 'number',
                    label: '数量',
                    isTrue: true,
                    isSearch: true,
                    searchInfoType: 'text',
                  },
                  {
                    minWidth: '130',
                    prop: 'createTime',
                    label: '入库时间',
                    sort: true,
                    isTrue: true,
                    isSearch: true,
                    searchInfoType: 'datetimerange',
                    formatter: this.formatDateTime,
                  },
                  {
                    minWidth: '130',
                    prop: 'createUser',
                    label: '创建人',
                    sort: true,
                    isTrue: true,
                    isSearch: true,
                    searchInfoType: 'text',
                  },
                ],
                toolbar: [],
                // operator: [],
                // operatorConfig: {}
            },
       }
    },

    components: {
      ttable
    },
    medthods: {
      formatDateTime(row, column, cellValue) {
          return cellValue ? fecha.format(new Date(cellValue), 'yyyy-MM-dd') : ''
      },
    },
}
</script>

 src/views/plan/manufacturingorder/productorder-form.vue

@@ -336,17 +336,14 @@
                            fallbackClass="fallbackStyle"
                            ghostClass="item_ghost"
                            @end="dragEnd"
                            :default-sort="{ prop: 'operationOrder' }"
                            @choose="operationRowClick"
                          >
                            <div
                              :class="{ dragItem: true, active: x.active }"
                              v-for="(x, i) in operations"
                              :key="i"
                            >
                              <!-- <div class="dragBody">
                                <div class="info">{{ x.operationNo }}</div>
                                <div class="info">{{ x.operationName }}</div>
                                <div class="info">{{ x.partName }}</div>
                              </div> -->
                              <el-row>
                                <el-col :span="2" class="frame">{{ i+1 }}
                                </el-col>
@@ -370,10 +367,6 @@
                        </el-card>
                      </el-col>
                    </el-row>
                  
                  
                  
                  
                  
                  
                  
@@ -1427,9 +1420,7 @@
              operationOrder:el.operationOrder,
            }
        })
      console.log(data,"id");
        changeOrder(data).then((res) =>{
            console.log(res,"回调");
        }).catch(error => {
                    console.error(error)
                });
@@ -1771,7 +1762,8 @@
      this.dataForm.bomId = null
    },
    // ç‚¹å‡»å·¥è‰ºå·¥åºè¡Œè§¦å‘校验工艺是否修改，若修改则不可操作，需先保存，若未修改，则可查询出对应的参数集
    operationRowClick(row) {
    operationRowClick(event) {
          const row = this.operations[event.oldIndex]
      if (this.dataForm.id != null && this.dataForm.id !== 0) {
        this.routingOperationId = row.technologyRoutingOperationId
        this.moRoutingOperationId = row.id

 src/views/quality/exception/exception-form.vue

@@ -78,7 +78,7 @@
              ></el-button>
            </el-input>
          </el-form-item>
          <el-form-item label="微信通知组" prop="notifierGroupId">
          <!-- <el-form-item label="微信通知组" prop="notifierGroupId">
            <el-select
              v-model="dataForm.notifierGroupId"
              style="width:100%;"
@@ -92,7 +92,7 @@
              >
              </el-option>
            </el-select>
          </el-form-item>
          </el-form-item> -->
          <el-form-item label="备注" prop="remark">
            <el-input
              type="textarea"
@@ -163,7 +163,7 @@

<script>
import { getObj, putObj } from '@/api/quality/exception'
import { fetchList } from '@/api/quality/wxnotice'
// import { fetchList } from '@/api/quality/wxnotice'
import workstationDialog from '@/views/common/workstation.vue'
import productoutDialog from '@/views/common/productout.vue'
import { getStore } from '../../../util/store'
@@ -229,6 +229,7 @@
        this.$refs.dataForm.resetFields()
        if (this.dataForm.id) {
          getObj(this.dataForm.id).then((response) => {
            console.log(response,"----");
            this.dataForm = response.data.data
            this.fileList = response.data.data.urlList
          })
@@ -304,6 +305,7 @@
    },
    getExceptionHandleType() {
      remote('exception_handle_type').then((response) => {
        console.log(response,"111111");
        if (response.data.code === 0) {
          this.exceptionHandleTypeOptions = response.data.data
        } else {
@@ -324,6 +326,7 @@
      })
    },
    selectUser(param) {
      console.log(param,"----===-=");
      if (param) {
        this.dataForm.processUser = param.userId
        this.dataForm.processUserName = param.username

 src/views/quality/exception/exceptionform.vue

@@ -40,10 +40,23 @@
        </el-input>
      </el-form-item>
      <el-form-item label="异常类型" prop="exceptionType">
        <el-input
        <!-- <el-input
          v-model="dataForm.exceptionType"
          placeholder="异常类型"
        ></el-input>
        ></el-input> -->
        <el-select
              v-model="dataForm.exceptionType"
              style="width:100%;"
              placeholder="异常类型"
            >
              <el-option
                v-for="item in exceptionHandleTypeOptions"
                :key="item.value"
                :label="item.label"
                :value="item.value"
              >
              </el-option>
            </el-select>
      </el-form-item>
      <el-form-item label="异常描述" prop="exceptionDescription">
        <el-input
@@ -88,6 +101,7 @@
import productoutDialog from '@/views/common/productout.vue'
import { loadWarehouse } from '../../../api/warehouse/location'
import { loadWorkstation } from '../../../api/basic/workstation'
import { remote } from '@/api/admin/dict'
import { loadProductMain } from '../../../api/product/personboard'

export default {
@@ -98,6 +112,7 @@
      productoutVisible: false,
      workstationVisible: false,
      visible: false,
      exceptionHandleTypeOptions:[],
      dataForm: {
        id: 0,
        code: '',
@@ -124,7 +139,21 @@
      clickSaveArr: []
    }
  },
  created() {
    console.log("22222222");
    this.getExceptionHandleType()
  },
  methods: {
    getExceptionHandleType() {
      remote('exception_handle_type').then((response) => {
        console.log(response,"-----");
        if (response.data.code === 0) {
          this.exceptionHandleTypeOptions = response.data.data
        } else {
          this.exceptionHandleTypeOptions = []
        }
      })
    },
    init(id, id1, id2) {
      this.dataForm.workstationId = id1
      if (this.dataForm.workstationId) {

 vue.config.js

@@ -7,7 +7,7 @@
// const url = 'http://192.168.2.7:9999'
// const url = 'https://ztms-mes.chinaztt.cn/'

 const url = 'http://localhost:9999'
const url = 'http://localhost:9999'


const localUrl = 'http://localhost:8089'