Merge remote-tracking branch 'origin/master'

zss

2023-12-14 1789ce3650a2665b5abca7a3028611190d1983df

Merge remote-tracking branch 'origin/master'

 src/api/plan/operationtask.js

@@ -294,3 +294,9 @@
    params: query
  })
}
export function getTechnologyRouting(id) {
  return request({
    url: '/mes/operationTask/getTechnologyRouting/'+id,
    method: 'get',
  })
}

 src/const/crud/customerOrder/customerOrderForm.js

@@ -17,6 +17,7 @@
export const tableOption = {
  border: true,
  index: true,
  indexFixed: false,
  height: '292px',
  indexLabel: '序号',
  menuAlign: 'center',

 src/views/basic/company/index.vue

@@ -49,6 +49,7 @@
          isShowHide:true,//是否显示显影按钮
          isSearch:false,//高级查询按钮
          isCopy: true,
          isRefresh: true, // æ˜¯å¦æ˜¾ç¤ºåˆ·æ–°æŒ‰é’®
          defaultOrderBy:{column:'createTime',direction:'desc'}
        },
        table: {
@@ -108,6 +109,10 @@
    },
    methods: {
      hello(){
        if(this.multipleSelection.length < 1){
          this.$message.error("请先选择要复制的数据!")
          return
        }
        copy(this.multipleSelection).then(response =>{
          this.getData()
        })

 src/views/basic/crew/crew-form.vue

@@ -24,11 +24,11 @@
        >确定</el-button
      >
    </span>
    <staffDialog
    <!-- <staffDialog
      :currshowlist.sync="showStaff"
      :multiSelect="true"
      @handleSelectionChange="selectStaff"
    />
    /> -->
  </el-dialog>
</template>


 src/views/basic/division/index.vue

@@ -52,6 +52,7 @@
        seqNo: true,
        isShowHide: true, // æ˜¯å¦æ˜¾ç¤ºæ˜¾å½±æŒ‰é’®
        isSearch: false, // é«˜çº§æŸ¥è¯¢æŒ‰é’®
        isRefresh: true, // æ˜¯å¦æ˜¾ç¤ºåˆ·æ–°æŒ‰é’®
        defaultOrderBy: { column: 'createTime', direction: 'desc' }
      },
      table: {

 src/views/basic/factory/index.vue

@@ -53,6 +53,7 @@
        seqNo: true,
        isShowHide: true, // æ˜¯å¦æ˜¾ç¤ºæ˜¾å½±æŒ‰é’®
        isSearch: false, // é«˜çº§æŸ¥è¯¢æŒ‰é’®
        isRefresh: true, // æ˜¯å¦æ˜¾ç¤ºåˆ·æ–°æŒ‰é’®
        defaultOrderBy: { column: 'createTime', direction: 'desc' }
      },
      table: {

 src/views/basic/location/index.vue

@@ -59,6 +59,7 @@
        seqNo: true,
        isShowHide: true, // æ˜¯å¦æ˜¾ç¤ºæ˜¾å½±æŒ‰é’®
        isSearch: true, // é«˜çº§æŸ¥è¯¢æŒ‰é’®
        isRefresh: true, // æ˜¯å¦æ˜¾ç¤ºåˆ·æ–°æŒ‰é’®
        defaultOrderBy: { column: 'createTime', direction: 'desc' }
      },
      table: {

 src/views/basic/param/index.vue

@@ -51,6 +51,7 @@
        seqNo: true,
        isShowHide: true, // æ˜¯å¦æ˜¾ç¤ºæ˜¾å½±æŒ‰é’®
        isSearch: true, // é«˜çº§æŸ¥è¯¢æŒ‰é’®
        isRefresh: true, // æ˜¯å¦æ˜¾ç¤ºåˆ·æ–°æŒ‰é’®
        defaultOrderBy: { column: 'createTime', direction: 'desc' }
      },
      table: {

 src/views/basic/part/index.vue

@@ -504,9 +504,7 @@
      })
    },
    getMaterialType(type) {
      console.log(type);
      remote(type).then((response) => {
        console.log("类型",response);
        const code = response.data.code
        if (code === 0) {
          const _data = response.data.data

 src/views/basic/template/index.vue

@@ -204,6 +204,7 @@
        seqNo: true,
        isShowHide: true, // æ˜¯å¦æ˜¾ç¤ºæ˜¾å½±æŒ‰é’®
        isSearch: true, // é«˜çº§æŸ¥è¯¢æŒ‰é’®
        isRefresh: true, // æ˜¯å¦æ˜¾ç¤ºåˆ·æ–°æŒ‰é’®
        defaultOrderBy: { column: 'id', direction: 'desc' }
      },
      table: {

 src/views/basic/warehouse/index.vue

@@ -54,6 +54,7 @@
        seqNo: true,
        isShowHide: true, // æ˜¯å¦æ˜¾ç¤ºæ˜¾å½±æŒ‰é’®
        isSearch: true, // é«˜çº§æŸ¥è¯¢æŒ‰é’®
        isRefresh: true, // æ˜¯å¦æ˜¾ç¤ºåˆ·æ–°æŒ‰é’®
        defaultOrderBy: { column: 'createTime', direction: 'desc' }
      },
      table: {

 src/views/basic/workstation/workstation-form.vue

@@ -1,10 +1,10 @@
<template>
  <el-dialog
    v-diadrag
    :title="!dataForm.id ? '新增' : '修改'"
    :close-on-click-modal="false"
    :visible.sync="visible"
    style="min-width: 2000px"
    width="60%"
    top="5vh"
  >
    <el-row>
      <el-form

 src/views/common/document.vue

@@ -61,7 +61,7 @@
      <el-button @click="innerVisible = false">取 æ¶ˆ</el-button>
      <el-button type="primary" @click="saveSelectRow">ç¡® å®š</el-button>
    </div>
    <DocumentDetail :currshowlist.sync="showDocument" :docId="documentId">
    <DocumentDetail :currshowlist.sync="showDocument" :docId="Number(documentId)">
    </DocumentDetail>
  </el-dialog>
</template>

 src/views/common/documentDetail.vue

@@ -166,7 +166,7 @@
            >
              <TeststandardDialog
                :editable="editable"
                :documentId="Number(dataForm.id)"
                :documentId="Number(docId)"
              >
              </TeststandardDialog>
            </el-tab-pane>

 src/views/common/ztt-table.vue

@@ -397,6 +397,7 @@
        @size-change="sizeChangeHandle"
        :page-sizes="[10, 20, 50, 100]"
        :page-size="pagination.pageSize"
        :page-count="pagination.size"
        :layout="
          size
            ? 'total, prev, pager, next'
@@ -718,6 +719,7 @@
        currentPage:
          this.table.currentPage == null ? 1 : this.table.currentPage,
        pageSize: this.table.pageSize == null ? 20 : this.table.pageSize,
        size: this.table.size == null ? 7 : this.table.size,
        total: this.table.total == null ? 0 : this.table.total
      }, // åˆ†é¡µä¿¡æ¯
      inMemoryColWidth: {}, // è®°å¿†ä¸­åˆ—宽，默认列宽
@@ -1576,7 +1578,7 @@
      if (response.code != '0') {
        this.$message.warning(response.msg)
      } else {
      if(response.data!=""&&response.data!=[]){
      if(response.data!=""&&response.data!=[]&&response.data!=null){
        this.$message({
          message: response.data,
          type: 'success'

 src/views/equipment/metering/index.vue

@@ -85,7 +85,7 @@
          isRefresh: true, // æ˜¯å¦æ˜¾ç¤ºåˆ·æ–°æŒ‰é’®
          isShowHide: true, // æ˜¯å¦æ˜¾ç¤ºæ˜¾å½±æŒ‰é’®
          isSearch: false, // é«˜çº§æŸ¥è¯¢æŒ‰é’®
          defaultOrderBy: { column: 'manufactureDate', direction: 'desc' }
          defaultOrderBy: { column: 'id', direction: 'desc' }
        },
        table: {
          total: 0,

 src/views/plan/manfacturingorderstatement/index.vue

@@ -1,20 +1,11 @@
<template>
  <div class="mod-config">
    <basic-container>
      <div class="avue-crud">
      <div class="avue-crud" style="margin: 0px 10px">
        <el-form :model="paramObject" label-width="100px" label-position="right">
        <el-row>
          <el-col :span="1">
            <div>
              <el-divider direction="vertical"></el-divider>
              <div
                style="float: left;height: 18px;font-size: 13px;line-height: 18px;font-weight: bold"
              >
                <span>销售订单</span>
              </div>
            </div>
          </el-col>
          <el-col :span="3">
            <div>
            <el-col :span="5">
              <el-form-item label="销售订单">
              <el-input
                clearable
                @keyup.enter.native="getDataList"
@@ -22,22 +13,11 @@
                placeholder="销售订单"
                @clear="getDataList"
                style="width: 100%"
              >
              </el-input>
            </div>
                > </el-input>
              </el-form-item>
          </el-col>
          <el-col :span="1" offset="1">
            <div>
              <el-divider direction="vertical"></el-divider>
              <div
                style="float: left;height: 18px;font-size: 13px;line-height: 18px;font-weight: bold"
              >
                <span>主计划号</span>
              </div>
            </div>
          </el-col>
          <el-col :span="3">
            <div>
            <el-col :span="5">
              <el-form-item label="主计划号">
              <el-input
                clearable
                @keyup.enter.native="getDataList"
@@ -45,22 +25,11 @@
                placeholder="主计划号"
                @clear="getDataList"
                style="width: 100%"
              >
              </el-input>
            </div>
                > </el-input>
              </el-form-item>
          </el-col>
          <el-col :span="1" offset="1">
            <div>
              <el-divider direction="vertical"></el-divider>
              <div
                style="float: left;height: 18px;font-size: 13px;line-height: 18px;font-weight: bold"
              >
                <span>车间订单</span>
              </div>
            </div>
          </el-col>
          <el-col :span="3">
            <div>
            <el-col :span="5">
              <el-form-item label="车间订单">
              <el-input
                clearable
                @keyup.enter.native="getDataList"
@@ -68,23 +37,13 @@
                placeholder="车间订单"
                @clear="getDataList"
                style="width: 100%"
              >
              </el-input>
            </div>
                > </el-input>
              </el-form-item>
          </el-col>
          <el-col :span="1" offset="1">
            <div>
              <el-divider direction="vertical"></el-divider>
              <div
                style="float: left;height: 18px;font-size: 13px;line-height: 18px;font-weight: bold"
              >
                <span>需求日期</span>
              </div>
            </div>
          </el-col>
          <el-col :span="3">
            <div>
            <el-col :span="5">
              <el-form-item label="需求日期">
              <el-date-picker
                  style="width:100%"
                clearable
                v-model="paramObject.requiredDate"
                type="datetimerange"
@@ -93,15 +52,15 @@
                value-format="yyyy-MM-dd HH:mm:ss"
                @change="feedDateChange($event)"
                size="mini"
                style="width:100px"
              >
              </el-date-picker>
            </div>
                > </el-date-picker>
              </el-form-item>
          </el-col>
          <el-col :span="2" offset="1">
            <el-col :span="3" :offset="1">
            <el-button type="primary" @click="getDataList()">搜索</el-button>
          </el-col>
        </el-row>
        </el-form>

        <el-table
          :data="dataList"
          border
@@ -110,12 +69,14 @@
          class="l-mes-table"
          :height="screenHeight"
        >
          <el-table-column type="index" label="序号" width="50">
          <el-table-column type="index" label="序号" align="center" width="50">
          </el-table-column>
          <el-table-column
            prop="customerName"
            header-align="center"
            align="center"
            min-width="120"
            show-overflow-tooltip
            label="客户名称"
          >
          </el-table-column>
@@ -123,6 +84,8 @@
            prop="customerOrderNo"
            header-align="center"
            align="center"
            min-width="120"
            show-overflow-tooltip
            label="销售订单号"
          >
          </el-table-column>
@@ -130,6 +93,8 @@
            prop="mpsNo"
            header-align="center"
            align="center"
            min-width="120"
            show-overflow-tooltip
            label="主计划号"
          >
          </el-table-column>
@@ -137,6 +102,8 @@
            prop="partNo"
            header-align="center"
            align="center"
            min-width="120"
            show-overflow-tooltip
            label="零件号"
          >
          </el-table-column>
@@ -144,6 +111,8 @@
            prop="partName"
            header-align="center"
            align="center"
            min-width="120"
            show-overflow-tooltip
            label="零件名称"
          >
          </el-table-column>
@@ -151,6 +120,8 @@
            prop="qtyRequired"
            header-align="center"
            align="center"
            min-width="120"
            show-overflow-tooltip
            label="车间订单需求数量"
          >
          </el-table-column>
@@ -158,6 +129,8 @@
            prop="unit"
            header-align="center"
            align="center"
            min-width="120"
            show-overflow-tooltip
            label="单位"
          >
          </el-table-column>
@@ -165,6 +138,8 @@
            prop="requiredDate"
            header-align="center"
            align="center"
            min-width="120"
            show-overflow-tooltip
            label="需求日期"
          >
          </el-table-column>
@@ -172,6 +147,8 @@
            prop="moNo"
            header-align="center"
            align="center"
            min-width="120"
            show-overflow-tooltip
            label="车间订单号"
          >
          </el-table-column>
@@ -180,6 +157,8 @@
              prop="name"
              header-align="center"
              align="center"
              min-width="100"
              show-overflow-tooltip
              label="工序名称"
            >
            </el-table-column>
@@ -187,6 +166,8 @@
              prop="operationPartNo"
              header-align="center"
              align="center"
              min-width="100"
              show-overflow-tooltip
              label="工序零件号"
            >
            </el-table-column>
@@ -194,6 +175,8 @@
              prop="operationPartName"
              header-align="center"
              align="center"
              min-width="100"
              show-overflow-tooltip
              label="工序零件名称"
            >
            </el-table-column>
@@ -201,6 +184,8 @@
              prop="pda"
              header-align="center"
              align="center"
              min-width="100"
              show-overflow-tooltip
              label="工序需求数量"
            >
            </el-table-column>
@@ -208,6 +193,8 @@
              prop="plannedQuantity"
              header-align="center"
              align="center"
              min-width="100"
              show-overflow-tooltip
              label="工单的计划数量"
            >
            </el-table-column>
@@ -215,6 +202,8 @@
              prop="completedQuantity"
              header-align="center"
              align="center"
              min-width="100"
              show-overflow-tooltip
              label="工单的完成数量"
            >
            </el-table-column>
@@ -222,6 +211,8 @@
              prop="units"
              header-align="center"
              align="center"
              min-width="100"
              show-overflow-tooltip
              label="单位"
            >
            </el-table-column>
@@ -230,6 +221,8 @@
            prop="count"
            header-align="center"
            align="center"
            min-width="100"
            show-overflow-tooltip
            label="工序完成进度"
          >
          </el-table-column>

 src/views/plan/manufacturingorder/customerorder.vue

@@ -207,7 +207,7 @@
                  ></el-input
                ></el-form-item>
              </el-row>
            </el-card>
            <!-- </el-card> -->
          </el-tab-pane>
          <el-tab-pane label="附件" type="card" name="附件">
            <div style="display: flex;justify-content:flex-end;">
@@ -321,16 +321,6 @@
          </el-tab-pane>
        </el-tabs>
      </el-form>
      <span slot="footer" class="dialog-footer">
      <el-button @click="visible = false">取消</el-button>
      <el-button
        type="primary"
        :disabled="buttonDisable"
        v-thinclick="`dataFormSubmit`"
        v-if="editable"
        >确定</el-button
      >
    </span>
    </el-tab-pane>
  </el-tabs>
</template>
@@ -369,6 +359,8 @@
      fileList: [],
      title: '',
      orderParamList: [],
      progrecessFileLoading: false,
      editable: true,
      isFullScreen: false,
      visible: false,
      buttonDisable: false,

 src/views/plan/manufacturingorder/routing.vue

@@ -96,15 +96,15 @@
            isSearch: true,
            searchInfoType: 'text'
          },
          {
            minWidth: '100',
            prop: 'name',
            label: '工艺名称',
            sort: true,
            isTrue: true,
            isSearch: true,
            searchInfoType: 'text'
          },
          // {
          //   minWidth: '100',
          //   prop: 'name',
          //   label: '工艺名称',
          //   sort: true,
          //   isTrue: true,
          //   isSearch: true,
          //   searchInfoType: 'text'
          // },
          // å·¥è‰ºç±»åž‹
          {
            minWidth: '120',

 src/views/plan/operationtask/operationtask-form.vue

@@ -778,6 +778,7 @@
            //              this.dataForm.partName = this.routingList.partName
            //              this.dataForm.partId = this.routingList.partId
            // åˆ¶é€ è®¢å•form创建的，自动带出工序
            console.log(this.routingOptions);
            if (param.selectedRoutingOperationId && this.routingOptions) {
              const option = this.routingOptions.find(
                (e) => e.id === param.selectedRoutingOperationId

 src/views/plan/productionschedul/index.vue

@@ -4,8 +4,14 @@
      <el-row>
        <el-col :span="12">
          <div style="height:80vh;padding: 0px 10px;">
            <avue-crud :data="tableData" ref="crud" :option="option" :span-method="spanMethod" 
            <avue-crud 
            :data="tableData" 
            ref="crud" 
            :option="option" 
            :span-method="spanMethod" 
            @refresh-change="getData"
            @current-change="handleCurrentChange"
            @size-change="handleSizeChange"
            :page="page" 
            @selection-change="selectionRow"
            :table-loading="loading">
@@ -134,7 +140,6 @@
  deleteSchedul,
  updateSchedul
} from '@/api//plan/productionschedul'
import TableForm from './template-form'
import ttable from '@/views/common/ztt-table.vue'
import { mapGetters } from 'vuex'
export default {
@@ -156,7 +161,8 @@
      page: {
        total: 10,
        currentPage: 1,
        pageSize: 10
        pageSize: 10,
        pagerCount: 5
      },
      option: {
        height: 400,
@@ -291,7 +297,6 @@
  },
  components: {
    ttable,
    TableForm,
  },
  computed: {
    ...mapGetters(['permissions']),
@@ -455,12 +460,24 @@
      }
      return ''
    },
    handleSizeChange(val){
      if(val){
        this.page.pageSize=val
        this.getData()
      }
    },
    handleCurrentChange(val){
      if(val){
        this.page.currentPage=val
        this.getData()
      }
    },
    // èŽ·å–数据列表
    getData() {
      this.loading = true
      let param = {
        size: 20,
        current: 1,
        size: this.page.pageSize,
        current: this.page.currentPage,
      }
      fetchScheduleList(param).then((res) => {
        this.tableData = res.data.data.records
@@ -469,9 +486,6 @@
        this.scheduleList = []
      })
      this.loading = false
    },
    handleCurrentChange(val) {
      this.multipleSelection = val
    },
    // åˆ é™¤
    deleteHandle(row,index) {
@@ -559,6 +573,9 @@
}
</script>
<style>
.el-tag--small{
  display: none;
}
.basic-template-table .el-table__body .el-table__row td:first-child .cell {
  padding-left: 0px;
  padding-right: 0px;

 src/views/plan/productionschedul/template-form.vue

ÎļþÒÑɾ³ý

 src/views/product/workbench/steprecord-tab.vue

@@ -740,7 +740,6 @@
    },
    personBoardList: {
      handler(newValue, oldValue) {
        console.log('personBoardList的watch')
        this.staffList = []
        var userInfoFlag = true
        var staff

 src/views/quality/finishedProductInspection/index.vue

@@ -188,30 +188,13 @@
                        },
                    ],
                    toolbar: [
                    /* {
                        text: '新增',
                        type: 'primary',
                        fun: this.addOrUpdateHandle
                    }, 
                    {
                        text: '导出',
                            text: '下载检验报告',
                        type: 'primary',
                        fun: this.exportExcel
                    }*/
                            fun: this.downloadProReport
                        }
                    ],
                    operator: [{
                        text: '打印',
                        type: 'text',
                        size: 'small',
                        fun: this.showPrint,
                        show: {
                            val: [
                                '1',
                                '0'
                            ],
                            key: 'result'
                        }
                    },{
                        text: '作废',
                        type: 'text',
                        size: 'small',
@@ -235,6 +218,9 @@
        }
    },
        methods: {
            downloadProReport(){
                this.$message.info("开发中...")
            },
            //打印按钮
            printFun() {
                const style = '@page {margin: 10mm 5mm; margin-bottom: 0;margin-top:0;} ' +'@media print {.title{font-size:30pt;font-weight: 400;font-family: é»‘体;!important;}' ;

 src/views/technology/document/teststandard.vue

@@ -59,7 +59,7 @@
  deleteTestStandard,
  getTestStand,
  saveTestStandard
} from '../../../api/technology/document'
} from '@/api/technology/document'
import qualityStandardDialog from '@/views/common/teststandardradio.vue'

export default {
@@ -187,6 +187,9 @@
  created() {
    getTestStand(this.paramObj)
  },
  mounted(){
    getTestStand(this.paramObj)
  },
  methods: {
    // èŽ·å–数据列表
    getData() {