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

zouyu

2023-12-14 93bb83a3376eb619a4a2673373f15849cd99337d

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

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

@@ -171,8 +171,8 @@
            <el-input v-model="dataForm.specs" placeholder="规格型号"></el-input>
          </el-form-item>
        </el-col>
        <el-col :span="12">
          <el-form-item label="检验员" prop="examiner">
       <!--  <el-col :span="12"> -->
          <!-- <el-form-item label="检验员" prop="examiner">
            <el-select
              v-model="dataForm.examiner"
              placeholder="请选择"
@@ -186,7 +186,7 @@
              >
              </el-option>
            </el-select>
          </el-form-item>
          </el-form-item> -->
          <!-- <el-form-item label="检验规则" prop="testRuleId">
            <el-select
              v-model="dataForm.testRuleId"
@@ -204,7 +204,7 @@
              </el-option>
            </el-select>
          </el-form-item> -->
        </el-col>
        <!-- </el-col> -->
        <!-- <el-col :span="12">
          <el-form-item label="图号" prop="drawingNumber">
            <el-input
@@ -266,8 +266,8 @@
            </el-select>
          </el-form-item>
        </el-col> -->
      </el-row>
      <el-row>
     <!--  </el-row>
      <el-row> -->
        <!-- <el-col :span="12">
          <el-form-item label="电压等级" prop="voltageLevel">
            <el-input
@@ -275,13 +275,15 @@
              placeholder="电压等级"
            ></el-input> </el-form-item
        ></el-col> -->
      </el-row>
      <el-row>
     <!--  </el-row>
      <el-row> -->
        <el-col :span="12"
          ><el-form-item label="重量" prop="weight">
            <el-input v-model="dataForm.weight" placeholder="重量"></el-input>
          </el-form-item>
        </el-col>
      </el-row>
      <el-row>
        <el-col :span="12">
          <el-form-item label="版本号" prop="engChgLevel">
            <el-input
@@ -291,6 +293,20 @@
            ></el-input>
          </el-form-item>
        </el-col>
        <el-col :span="12">
          <el-form-item label="零件属性" prop="materialAttribute">
            <el-select v-model="dataForm.materialAttribute" style="width: 100%">
              <el-option
                v-for="(item, index) in materialAttributeOptions"
                :key="index"
                :label="item.label"
                :value="item.value"
              >
              </el-option>
            </el-select>
          </el-form-item>
        </el-col>
      </el-row>
        <!-- <el-col :span="12">
            <el-form-item label="IFS启用批次管理" prop="lotTrackingIfs">
              <el-select
@@ -318,7 +334,7 @@
            </el-select>
          </el-form-item>
        </el-col> -->
      </el-row>
      <!-- </el-row> -->
      <el-row>
        <el-col :span="12">
          <el-form-item
@@ -342,20 +358,8 @@
          </el-form-item>
        </el-col>
      </el-row>
      <!-- <el-row> -->
      <el-row>
        <el-col :span="12">
          <el-form-item label="零件属性" prop="materialAttribute">
            <el-select v-model="dataForm.materialAttribute" style="width: 100%">
              <el-option
                v-for="(item, index) in materialAttributeOptions"
                :key="index"
                :label="item.label"
                :value="item.value"
              >
              </el-option>
            </el-select>
          </el-form-item>
        </el-col>
        <el-col :span="12">
          <el-form-item label="备注" prop="description">
            <el-input

 src/views/quality/finishedProductInspection/finishedProduct-form.vue

@@ -26,27 +26,24 @@
                        <el-col :span="6">
                            <el-form-item label="订单号：">
                                <el-input @blur="selectInfoByOrderId" :disabled="processInspectVo.id != null"
                                v-model="processInspectVo.orderNumber" placeholder="请输入订单号" autocomplete="off" />
                                v-model="processInspectVo.orderNumber" autocomplete="off" />
                            </el-form-item>
                        </el-col>
                        <el-col :span="6">
                            <el-form-item label="报工单号：">
                                <el-input disabled v-model="processInspectVo.productNo"
                                    placeholder="请输入报工单号：" autocomplete="off" />
                                <el-input disabled v-model="processInspectVo.productNo" autocomplete="off" />
                            </el-form-item>
                        </el-col>
                        <el-col :span="6">
                            <el-form-item label="客户名称：">
                                <el-input disabled v-model="processInspectVo.prname"
                                    placeholder="请输入客户名称" autocomplete="off" />
                                <el-input disabled v-model="processInspectVo.prname" autocomplete="off" />
                            </el-form-item>
                        </el-col>
                    </el-row>
                    <el-row>
                        <el-col :span="6">
                            <el-form-item label="工程名称：">
                                <el-input disabled v-model="processInspectVo.sname"
                                    placeholder="请输入工程名称" autocomplete="off" />
                                <el-input disabled v-model="processInspectVo.sname" autocomplete="off" />
                            </el-form-item>
                        </el-col>
                        <el-col :span="6">
@@ -60,15 +57,13 @@
                            </el-form-item>
                        </el-col>
                        <el-col :span="6">
                            <el-form-item label="产品编码：">
                                <el-input disabled v-model="processInspectVo.mcode"
                                    placeholder="请输入产品编码" autocomplete="off" />
                            <el-form-item label="产品编号：">
                                <el-input disabled v-model="processInspectVo.mcode" autocomplete="off" />
                            </el-form-item>
                        </el-col>
                        <el-col :span="6">
                            <el-form-item label="规格型号：">
                                <el-input disabled v-model="processInspectVo.specificationsModel"
                                    placeholder="请输入规格型号" autocomplete="off" />
                                <el-input disabled v-model="processInspectVo.specificationsModel" autocomplete="off" />
                            </el-form-item>
                        </el-col>
                    </el-row>
@@ -161,7 +156,7 @@
                                </div>
                            </template>
                        </el-table-column>
                        <el-table-column prop="inspectionValue">
                        <el-table-column prop="inspectionValue"
                                label="检验描述" width="240" style="text-align: center;">
                                <template slot-scope="scope">
                                    <el-col v-if="scope.row.itype === '1'">

 src/views/quality/finishedProductInspection/index.vue

@@ -127,7 +127,7 @@
                        {
                            minWidth: '120',
                            prop: 'materialCode',
                            label: '产品编码',
                            label: '产品编号',
                            isTrue: true,
                            isSearch: true,
                            searchInfoType: 'text'

 src/views/quality/processInspect/index.vue

@@ -73,6 +73,14 @@
                        },
                        {
                            minWidth: '120',
                            prop: 'materialCode',
                            label: '产品编号',
                            isTrue: true,
                            isSearch: true,
                            searchInfoType: 'text'
                        },
                        {
                            minWidth: '120',
                            prop: 'material',
                            label: '产品名称',
                            isTrue: true,

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

@@ -41,8 +41,8 @@
                                </el-form-item>
                            </el-col>
                            <el-col :span="6">
                                <el-form-item label="产品编码：">
                                    <el-input disabled v-model="processInspectVo.materialCode" placeholder="请输入产品编码"
                                <el-form-item label="产品编号：">
                                    <el-input disabled v-model="processInspectVo.materialCode" placeholder="请输入产品编号"
                                        autocomplete="off" />
                                </el-form-item>
                            </el-col>
@@ -50,7 +50,7 @@
                        <el-row>
                            <el-col :span="6">
                                <el-form-item label="规格型号：">
                                    <el-input disabled v-model="processInspectVo.specs" placeholder="请输入规格型号"
                                    <el-input disabled v-model="processInspectVo.specs" 
                                        autocomplete="off" />
                                </el-form-item>
                            </el-col>

 src/views/warehouse/stock/index.vue

@@ -11,13 +11,13 @@
        ref="warehouseStockTable"
      >
        <template #toolbar>
          <el-button
          <!-- <el-button
            v-if="permissions.warehouse_stock_scm"
            @click="pushScm()"
            type="primary"
            style="margin-left:10px;"
            >成品推送SCM
          </el-button>
          </el-button> -->
        </template>
      </ttable>
      <!-- 创建主生产计划 -->
@@ -65,7 +65,7 @@
      multipleSelection: [],
      uploadInfo: {
        // 是否展示上传EXCEL以及对应的url
        isShow: true,
        isShow: false,
        url: '/mes/stock/upload'
      },
      prelang: 'operation',
@@ -161,7 +161,7 @@
            isSearch: true,
            searchInfoType: 'text'
          },
          {
         /*  {
            width: '100',
            minWidth: '100',
            prop: 'partBatchNo',
@@ -220,7 +220,7 @@
            isTrue: true,
            isSearch: true,
            searchInfoType: 'text'
          },
          }, */
          {
            width: '100',
            minWidth: '100',
@@ -261,7 +261,7 @@
            isSearch: true,
            searchInfoType: 'text'
          },
          {
         /*  {
            width: '100',
            minWidth: '100',
            prop: 'reserveQuantity',
@@ -270,7 +270,7 @@
            isTrue: true,
            isSearch: true,
            searchInfoType: 'text'
          },
          }, */
          {
            width: '100',
            minWidth: '120',
@@ -291,7 +291,7 @@
            isSearch: true,
            searchInfoType: 'text'
          },
          {
          /* {
            width: '100',
            minWidth: '120',
            prop: 'sstockQuantity',
@@ -320,8 +320,8 @@
            isTrue: true,
            isSearch: true,
            searchInfoType: 'text'
          },
          {
          }, */
          /* {
            minWidth: '100',
            prop: 'status',
            label: '状态',
@@ -329,7 +329,7 @@
            isTrue: true,
            isSearch: true,
            searchInfoType: 'text'
          },
          }, */
          {
            minWidth: '100',
            prop: 'ifsBatchNo',
@@ -350,7 +350,7 @@
          }
        ],
        toolbar: [
          {
          /* {
            text: '移库',
            type: 'primary',
            fun: this.moveStock
@@ -369,7 +369,7 @@
            text: '成品标签2',
            type: 'primary',
            fun: this.warehousingSmalllPrint
          }
          } */
        ]
      },
      addOrUpdateVisible: false,

 vue.config.js

@@ -2,11 +2,15 @@
 * 配置参考:
 * https://cli.vuejs.org/zh/config/
 */


// const url = 'http://192.168.2.7:9999'
const url = 'http://192.168.32.45:9999'
//const url = 'http://192.168.2.7:9999'
//const url = 'http://192.168.32.45:9999'
// const url = 'http://192.168.0.23:9999'

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


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