zss
2023-12-20 c787513ce9b21ba4d9d0273fdcba8a5d560dd092
修改
已修改6个文件
65 ■■■■■ 文件已修改
src/views/plan/manufacturingorder/productorder-form.vue 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/plan/operationtask/operationtask-form.vue 49 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/quality/finishedProductInspection/finishedProduct-form.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/quality/processInspect/processInspect-form.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/quality/teststandard/index.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
vue.config.js 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/plan/manufacturingorder/productorder-form.vue
@@ -65,6 +65,7 @@
            </el-col>
            <el-col :span="6">
              <el-form-item label="零件" prop="partId">
                <el-tooltip class="item" effect="dark" :content="partStr" >
                <el-input v-model="partStr" placeholder="" readonly>
                  <el-button
                    v-if="!this.dataForm.id"
@@ -73,6 +74,7 @@
                    @click="openRoutingDialog()"
                  ></el-button>
                </el-input>
                </el-tooltip>
              </el-form-item>
            </el-col>
          </el-row>
src/views/plan/operationtask/operationtask-form.vue
@@ -145,7 +145,7 @@
                          </el-select>
                        </el-form-item>
                      </el-col>
                      <el-col :span="7">
                      <el-col :span="10">
                        <el-form-item label="工作中心" prop="workCenter">
                          <el-select v-model="dataForm.workCenter" :disabled="!editable" filterable placeholder="请选择工作中心"
                            style="width:100%" @change="changeWorkCenter">
@@ -153,6 +153,16 @@
                              :key="index">
                            </el-option>
                          </el-select>
                        </el-form-item>
                      </el-col>
                    </el-row>
                    <el-row :gutter="10">
                      <el-col :span="15">
                        <el-form-item label="计划时间" prop="localDateTimes">
                          <el-date-picker :class="tattimest ? 'sed' : ''" v-model="dataForm.localDateTimes"
                            type="datetimerange" range-separator="至" start-placeholder="开始" end-placeholder="结束"
                            value-format="yyyy-MM-dd HH:mm:ss" @change="selectChangedplannedDate">
                          </el-date-picker>
                        </el-form-item>
                      </el-col>
                      <el-col :span="6">
@@ -167,39 +177,36 @@
                      </el-col>
                    </el-row>
                    <el-row :gutter="10">
                      <el-col :span="14">
                        <el-form-item label="计划时间" prop="localDateTimes">
                          <el-date-picker :class="tattimest ? 'sed' : ''" v-model="dataForm.localDateTimes"
                            type="datetimerange" range-separator="至" start-placeholder="开始" end-placeholder="结束"
                            value-format="yyyy-MM-dd HH:mm:ss" @change="selectChangedplannedDate">
                          </el-date-picker>
                        </el-form-item>
                      </el-col>
                      <el-col :span="10">
                        <el-form-item label="计划数量" prop="plannedQuantity">
                          <el-input v-model="dataForm.plannedQuantity" :disabled="!editable" placeholder="计划数量"
                            style="width:calc(100% - 30px)"></el-input>
                          <span>{{ dataForm.unit }}</span>
                        </el-form-item>
                      </el-col></el-row>
                    <el-row :gutter="10">
                      <el-col :span="12">
                        <el-form-item label="零件" prop="partName">
                          <el-input v-model="dataForm.partName" placeholder="零件" disabled></el-input>
                        </el-form-item>
                      </el-col>
                      <el-col :span="6">
                        <el-form-item label="零件号" prop="partNo">
                          <el-input v-model="dataForm.partNo" placeholder="零件号" disabled></el-input>
                        </el-form-item>
                      </el-col>
                      <el-col :span="6">
                      <el-col :span="10">
                        <el-form-item label="工单所需时间" prop="taskTheoreticalTime">
                          <el-input v-model="dataForm.taskTheoreticalTime" placeholder="工单所需时间"
                            style="width:calc(100% - 30px)"></el-input>
                          <span>min</span>
                        </el-form-item>
                      </el-col>
                      </el-row>
                    <el-row :gutter="10">
                      <el-col :span="12">
                        <el-form-item label="零件" prop="partName">
                          <el-tooltip class="item" effect="dark" :content="dataForm.partName" >
                          <el-input v-model="dataForm.partName" placeholder="零件" disabled></el-input>
                          </el-tooltip>
                        </el-form-item>
                      </el-col>
                      <el-col :span="10">
                        <el-form-item label="零件号" prop="partNo">
                          <el-tooltip class="item" effect="dark" :content="dataForm.partNo" >
                          <el-input v-model="dataForm.partNo" placeholder="零件号" disabled></el-input>
                          </el-tooltip>
                        </el-form-item>
                      </el-col>
                    </el-row>
                    <el-row :gutter="10">
                      <span style="float:right; margin-right:30px; margin-top: 55px">
src/views/quality/finishedProductInspection/finishedProduct-form.vue
@@ -48,12 +48,14 @@
                        </el-col>
                        <el-col :span="6">
                            <el-form-item label="产品名称:">
                                <el-tooltip class="item" effect="dark" :content="processInspectVo.material">
                                <el-select style="width: 100%" @change="changeOptionsSamplename" :disabled="processInspectVo.id != null"
                                    v-model="processInspectVo.material" size="small" placeholder="请选择产品名称">
                                    <el-option v-for="(item,index) in optionsSamplename" :key="index" :label="item.material"
                                        :value="item.materialCode">
                                    </el-option>
                                </el-select>
                                </el-tooltip>
                            </el-form-item>
                        </el-col>
                        <el-col :span="6">
@@ -63,7 +65,9 @@
                        </el-col>
                        <el-col :span="6">
                            <el-form-item label="规格型号:">
                                <el-tooltip class="item" effect="dark" :content="processInspectVo.specificationsModel">
                                <el-input disabled v-model="processInspectVo.specificationsModel" autocomplete="off" />
                                </el-tooltip>
                            </el-form-item>
                        </el-col>
                    </el-row>
src/views/quality/processInspect/processInspect-form.vue
@@ -31,6 +31,7 @@
                            </el-col>
                            <el-col :span="6">
                                <el-form-item label="产品名称:">
                                    <el-tooltip class="item" effect="dark" :content="processInspectVo.material">
                                    <el-select style="width: 100%" @change="changeOptionsSamplename"
                                        :disabled="processInspectVo.id != null" v-model="processInspectVo.material"
                                        size="small" placeholder="请选择产品名称">
@@ -38,6 +39,7 @@
                                            :label="item.material" :value="item.materialCode">
                                        </el-option>
                                    </el-select>
                                    </el-tooltip>
                                </el-form-item>
                            </el-col>
                            <el-col :span="6">
@@ -50,8 +52,10 @@
                        <el-row>
                            <el-col :span="6">
                                <el-form-item label="规格型号:">
                                    <el-tooltip class="item" effect="dark" :content="processInspectVo.specs">
                                    <el-input disabled v-model="processInspectVo.specs" 
                                        autocomplete="off" />
                                    </el-tooltip>
                                </el-form-item>
                            </el-col>
                        
src/views/quality/teststandard/index.vue
@@ -321,7 +321,7 @@
      isShowQuery: false,
      uploadInfo: {
        // 是否展示上传EXCEL以及对应的url
        isShow: true,
        isShow: false,
        url: '/mes/testStandard/upload'
      },
      prelang: 'operation',
vue.config.js
@@ -4,10 +4,6 @@
 */
// 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.2.7:9999'
//const url = 'http://192.168.32.45:9999'
// const url = 'http://192.168.0.23:9999'