Merge remote-tracking branch 'origin/master'

86134

2023-11-11 4652431ce329b4dec6c4dcc0758d5c4ff97e0666

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

@@ -248,10 +248,11 @@
              </el-form-item>
            </el-col>
            <el-col :span="6">
              <el-form-item label="收货地址" prop="shippingAddress">
              <el-form-item label="工艺文件名称" prop="docName">
                <el-input
                  v-model="dataForm.shippingAddress"
                  v-model="dataForm.docName"
                  placeholder=""
                  disabled
                ></el-input>
              </el-form-item>
            </el-col>
@@ -323,6 +324,14 @@
            </el-col> -->
          </el-row>
          <el-row>
            <el-col :span="6">
              <el-form-item label="收货地址" prop="shippingAddress">
                <el-input
                  v-model="dataForm.shippingAddress"
                  placeholder=""
                ></el-input>
              </el-form-item>
            </el-col>
            <!-- <el-col :span="6">
              <el-form-item label="OTC推送状态" prop="remark">
                <span>{{
@@ -819,7 +828,9 @@
        productName: '',
        productType: '',
        partNo: '',
        technologyDocumentId: '',
        docNumber: '',
        docName: '',
        shippingAddress: '',
        remark: '',
        otcUnit: '',