合并冲突

licp

2024-04-29 ea1a8cf41c11f8f533cea594e1f1c03640cf4a96

合并冲突

 src/router/router.js

@@ -8,7 +8,7 @@
//创建路由
const createRouter = () => {
  return new VueRouter({
    mode: 'history',
    // mode: 'history',
    scrollBehavior (to, from, savedPosition) {
      if (savedPosition) {
        return savedPosition

 src/views/common/ztt-table.vue

@@ -181,6 +181,7 @@
        <el-table-column
          align="center"
          type="selection"
          :reserve-selection="options.reserveSelection"
          v-if="options.multiSelect && !isEdit"
          style="width: 55px;"
          :selectable="selectHandle"
@@ -666,7 +667,8 @@
        tableCellMerge: false,
        cancelRunCreated: false, // 是否执行created()内容
        isGenerateId: false,
        isGenerateField: 'id'
        isGenerateField: 'id',
        reserveSelection: false,
      }
    },
    // table自适应高度底部高度

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

@@ -890,9 +890,6 @@
        customerOrderNo: [
          { required: true, message: '客户订单号不能为空', trigger: 'blur' }
        ],
        customerNo: [
          { required: true, message: '客户编号不能为空', trigger: 'blur' }
        ],
        customerName: [
          { required: true, message: '客户名称不能为空', trigger: 'blur' }
        ],

 src/views/plan/customerorder/index.vue

@@ -535,6 +535,7 @@
        isSearch: true, // 高级查询按钮
        defaultOrderBy: { column: 'placeOrderDate', direction: 'desc' },
        cancelRunCreated: true,
        reserveSelection: true,//是否保留之前选择的数据
      },
      table: {
        total: 0,

 src/views/plan/manufacturingorder/auto-operationtask.vue

@@ -282,8 +282,8 @@
        if(ele.name.indexOf(opName)>-1){
          workId = ele.id
        }
      }) 
      return workId                                               
      })
      return workId
    },
    getManufactureAttrs(type) {
      remote(type).then((response) => {
@@ -551,11 +551,12 @@
            const resData = response.data
            if (resData.code === 0) {
              const autoTaskList = resData.data
              console.log("autoTaskList-----",autoTaskList);
              autoTaskList.forEach((item) => {
                this.operationData.push({
                  operationName: item.operationName,
                  workCenter: item.workCenter,
                  workstationId: item.workstationId ? item.workstationId : this.initWorkStation(item.operationName,item.workstations),
                  workstationId: item.workstationId ? item.workstationId : this.initWorkStation(item.operationName,item.workstations||[]),
                  locationId: item.locationId,
                  partNo: item.partNo,
                  partName: item.partName,

 src/views/technology/document/document-form.vue

@@ -24,10 +24,12 @@
          <el-row>
            <el-col :span="6">
              <el-form-item prop="name" label="文件名称">
                <el-tooltip class="item" effect="dark" :content="dataForm.name" >
                <el-input
                  v-model="dataForm.name"
                  placeholder="文件名称"
                ></el-input>
                </el-tooltip>
              </el-form-item>
            </el-col>
            <el-col :span="6">

 src/views/technology/document/teststandard.vue

@@ -51,7 +51,7 @@
            width="50"
          />
          <el-table-column label="参数编号" prop="code" align="center" />
          <el-table-column label="参数项" prop="parameterItem" align="center" />
          <el-table-column label="参数项" prop="parameterItem" align="center"/>
          <el-table-column
            label="要求值"
            prop="referenceValue"
@@ -59,38 +59,46 @@
            width="120px"
          >
          <template slot-scope="scope">
            <el-tooltip class="item" effect="dark" :content="scope.row.referenceValue" >
                <el-input
                v-model="scope.row.referenceValue"
                placeholder="值"
                :disabled="!editable"
                ></el-input>
                </el-tooltip>
            </template>
            </el-table-column>
          <el-table-column label="单位" prop="unit" align="center" width="120px">
            <template slot-scope="scope">
              <el-tooltip class="item" effect="dark" :content="scope.row.unit" >
                <el-input
                v-model="scope.row.unit"
                placeholder="单位"
                :disabled="!editable"
                ></el-input>
                </el-tooltip>
            </template>
          </el-table-column>
          <el-table-column label="测试方法" prop="method" align="center">
            <template slot-scope="scope">
              <el-tooltip class="item" effect="dark" :content="scope.row.method" >
                <el-input
                v-model="scope.row.method"
                placeholder=""
                :disabled="!editable"
                ></el-input>
                </el-tooltip>
            </template>
          </el-table-column>
          <el-table-column label="测试目的" prop="purpose" align="center">
            <template slot-scope="scope">
              <el-tooltip class="item" effect="dark" :content="scope.row.purpose" >
                <el-input
                v-model="scope.row.purpose"
                placeholder=""
                :disabled="!editable"
                ></el-input>
                </el-tooltip>
            </template>
          </el-table-column>
          <el-table-column label="操作" align="center" fixed="right">

 vue.config.js

@@ -5,9 +5,9 @@



const url = 'https://ztms-mes.chinaztt.cn/'
//  const url = 'http://localhost:9999'
// const url = 'http://192.168.32.45:9999'
// const url = 'https://ztms-mes.chinaztt.cn/'
  const url = 'http://localhost:9999'
//const url = 'http://192.168.32.45:9999'


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