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

王震

2023-12-20 b3ebb6f99f647a08cac70ebd9cf1baabdffc6852

 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">