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

zouyu

2023-12-20 beadc7f71e4eafeca1aee29be931c05df6bd07a5

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

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

@@ -187,12 +187,14 @@
            </el-col>
            <el-col :span="6">
              <el-form-item label="产品名称" prop="productName">
                <el-tooltip class="item" effect="dark" :content="dataForm.productName" >
                <el-input
                  v-model="dataForm.productName"
                  placeholder=""
                  disabled
                >
                </el-input>
                </el-tooltip>
              </el-form-item>
            </el-col>
            <el-col :span="6">
@@ -274,11 +276,13 @@
            </el-col>
            <el-col :span="6">
              <el-form-item label="产品型号" prop="customerPartSpec">
                <el-tooltip class="item" effect="dark" :content="dataForm.customerPartSpec" >
                <el-input
                  v-model="dataForm.customerPartSpec"
                  placeholder=""
                  disabled
                ></el-input>
                </el-tooltip>
              </el-form-item>
            </el-col>
          </el-row>
@@ -325,10 +329,12 @@
          <el-row>
            <el-col :span="6">
              <el-form-item label="收货地址" prop="shippingAddress">
                <el-tooltip class="item" effect="dark" :content="dataForm.shippingAddress" >
                <el-input
                  v-model="dataForm.shippingAddress"
                  placeholder=""
                ></el-input>
                </el-tooltip>
              </el-form-item>
            </el-col>
            <!-- <el-col :span="6">

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

@@ -40,6 +40,7 @@
              </el-form-item>

              <el-form-item label="零件名" prop="partName">
                <el-tooltip class="item" effect="dark" :content="treeForm.partName" >
                <el-input
                  v-model="treeForm.partName"
                  placeholder="零件名"
@@ -47,6 +48,7 @@
                  disabled
                >
                </el-input>
                </el-tooltip>
              </el-form-item>

              <el-form-item label="类型" prop="bomTypeDb">

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

@@ -113,7 +113,9 @@
            </el-col>
            <el-col :span="6">
              <el-form-item label="产品零件描述" prop="partName">
                <el-tooltip class="item" effect="dark" :content="dataForm.partName" >
                <el-input v-model="dataForm.partName" disabled> </el-input>
                </el-tooltip>
              </el-form-item>
            </el-col>
          </el-row>

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

@@ -50,12 +50,14 @@
            </el-col>
            <el-col :span="6">
              <el-form-item prop="partName" label="零件名称">
                <el-tooltip class="item" effect="dark" :content="dataForm.partName" >
                <el-input
                  v-model="dataForm.partName"
                  placeholder="零件名称"
                  readonly
                  style="width: 100%"
                ></el-input>
                </el-tooltip>
              </el-form-item>
            </el-col>
            <el-col :span="6">