打样申请单增加产品外观字段

src/views/mes/pro/productiorequest/requestApply.vue

@@ -397,6 +397,25 @@ export default {
         createTime: null,
         updateBy: null,
         updateTime: null,
+        length: null,
+        width: null,
+        height: null,
+        thick: null,
+        weight: null,
+        angleType: null,
+        isAllotype:null,
+        isRightAngle:null,
+        fillet:null,
+        angle: null,
+        aperture: null,
+        singleLayerThick: null,
+        singleWeight: null,
+        layerNum: null,
+        isMould: null,
+        isCoding: null,
+        certification: null,
+        shape: null,
+        shapeSize: null,
       };
       this.resetForm("form");
     },

src/views/mes/pro/productiorequest/requestInfoAdd.vue

@@ -171,6 +171,140 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row>
+          <el-col :lg="6" :md="8" :sm="12" :xs="12">
+            <el-form-item label="长度cm" prop="length">
+              <el-input v-model="form.length" type="number" :precision="2" placeholder="请输入长度" />
+            </el-form-item>
+          </el-col>
+          <el-col :lg="6" :md="8" :sm="12" :xs="12">
+            <el-form-item label="宽度cm" prop="width">
+              <el-input v-model="form.width" type="number" :precision="2" placeholder="请输入宽度" />
+            </el-form-item>
+          </el-col>
+          <el-col :lg="6" :md="8" :sm="12" :xs="12">
+            <el-form-item label="高度cm" prop="height">
+              <el-input v-model="form.height" type="number" :precision="2" placeholder="请输入高度" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :lg="6" :md="8" :sm="12" :xs="12">
+            <el-form-item label="厚度mm" prop="thick">
+              <el-input v-model="form.thick" type="number" :precision="2" placeholder="请输入厚度" />
+            </el-form-item>
+          </el-col>
+          <el-col :lg="6" :md="8" :sm="12" :xs="12">
+            <el-form-item label="成品克重g" prop="weight">
+              <el-input v-model="form.weight" type="number" :precision="2" placeholder="请输入成品克重" />
+            </el-form-item>
+          </el-col>
+          <el-col :lg="6" :md="8" :sm="12" :xs="12">
+            <el-form-item label="单重(KG)" prop="singleWeight">
+              <el-input v-model="form.singleWeight" type="number" :precision="2" placeholder="请输入单重" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :lg="6" :md="8" :sm="12" :xs="12">
+            <el-form-item label="圆角" prop="fillet">
+              <el-input v-model="form.fillet" type="number" :precision="2" placeholder="请输入圆角" />
+            </el-form-item>
+          </el-col>
+          <el-col :lg="6" :md="8" :sm="12" :xs="12">
+            <el-form-item label="是否异型" prop="fillet">
+              <el-radio-group v-model="form.isAllotype" >
+                <el-radio
+                  v-for="dict in dict.type.sys_yes_no"
+                  :key="dict.value"
+                  :label="dict.value"
+                >{{dict.label}}</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+          <el-col :lg="6" :md="8" :sm="12" :xs="12">
+            <el-form-item :lg="6" :md="8" :sm="12" :xs="12" label="是否直角" prop="isRightAngle">
+              <el-radio-group v-model="form.isRightAngle">
+                <el-radio
+                  v-for="dict in dict.type.sys_yes_no"
+                  :key="dict.value"
+                  :label="dict.value"
+                >{{dict.label}}</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :lg="6" :md="8" :sm="12" :xs="12">
+            <el-form-item label="角度(mm)" prop="angle">
+              <el-input v-model="form.angle" type="number" :precision="2" placeholder="请输入角度" />
+            </el-form-item>
+          </el-col>
+          <el-col :lg="6" :md="8" :sm="12" :xs="12">
+            <el-form-item label="孔径(mm)" prop="aperture">
+              <el-input v-model="form.aperture" type="number" :precision="2" placeholder="请输入孔径" />
+            </el-form-item>
+          </el-col>
+          <el-col :lg="6" :md="8" :sm="12" :xs="12">
+            <el-form-item label="单层厚(丝)" prop="singleLayerThick">
+              <el-input v-model="form.singleLayerThick" type="number" :precision="2" placeholder="请输入单层厚(单位丝)" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+
+          <el-col :lg="6" :md="8" :sm="12" :xs="12">
+            <el-form-item label="层数" prop="layerNum">
+              <el-input v-model="form.layerNum" type="number" :precision="2" placeholder="请输入层数" />
+            </el-form-item>
+          </el-col>
+          <el-col :lg="6" :md="8" :sm="12" :xs="12">
+            <el-form-item label="是否防霉" prop="isMould">
+              <el-radio-group v-model="form.isMould" >
+                <el-radio
+                  v-for="dict in dict.type.sys_yes_no"
+                  :key="dict.value"
+                  :label="dict.value"
+                >{{dict.label}}</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+          <el-col :lg="6" :md="8" :sm="12" :xs="12">
+            <el-form-item label="是否写码" prop="isCoding">
+              <el-radio-group v-model="form.isCoding" >
+                <el-radio
+                  v-for="dict in dict.type.sys_yes_no"
+                  :key="dict.value"
+                  :label="dict.value"
+                >{{dict.label}}</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :lg="6" :md="8" :sm="12" :xs="12">
+            <el-form-item label="体系认证" prop="certification">
+              <el-input v-model="form.certification" placeholder="请输入体系认证" />
+            </el-form-item>
+          </el-col>
+          <el-col :lg="6" :md="8" :sm="12" :xs="12">
+            <el-form-item label="样品形状" prop="shape">
+              <el-select v-model="form.shape" placeholder="请选择样品形状">
+                <el-option
+                  v-for="dict in dict.type.product_shape"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :lg="6" :md="8" :sm="12" :xs="12">
+            <el-form-item label="样品形状大小" prop="shapeSize">
+              <el-input v-model="form.shapeSize" type="number" :precision="4" placeholder="请输入样品形状大小" />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
 
       <el-tabs type="border-card" @tab-click="tabClick">
@@ -210,7 +344,7 @@ export default {
     RoutesProcessSelect,
     FactorySelect,
   },
-  dicts: [],
+  dicts: ['product_shape'],
   provide() {
     return {
       mode: this.mode,
@@ -241,6 +375,25 @@ export default {
         remark: "",
         prototype: "",
         warehouse: "",
+        length: '',
+        width: '',
+        height: '',
+        thick: '',
+        weight: '',
+        angleType: '',
+        isAllotype:'',
+        isRightAngle:'',
+        fillet:'',
+        angle: '',
+        aperture: '',
+        singleLayerThick: '',
+        singleWeight: '',
+        layerNum: '',
+        isMould: '',
+        isCoding: '',
+        certification: '',
+        shape: '',
+        shapeSize: '',
       },
       rules: {},
     };
@@ -382,6 +535,25 @@ export default {
         remark: "",
         prototype: "",
         warehouse: "",
+        length: '',
+        width: '',
+        height: '',
+        thick: '',
+        weight: '',
+        angleType: '',
+        isAllotype:'',
+        isRightAngle:'',
+        fillet:'',
+        angle: '',
+        aperture: '',
+        singleLayerThick: '',
+        singleWeight: '',
+        layerNum: '',
+        isMould: '',
+        isCoding: '',
+        certification: '',
+        shape: '',
+        shapeSize: '',
       };
       this.$refs["ProogingBomRef"].resetState();
       this.$refs["ProogingProcessRef"].resetState();

src/views/mes/pro/productiorequest/requestInfoEdit.vue

@@ -180,6 +180,140 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row>
+          <el-col :lg="6" :md="8" :sm="12" :xs="12">
+            <el-form-item label="长度cm" prop="length">
+              <el-input v-model="form.length" type="number" :precision="2" placeholder="请输入长度" />
+            </el-form-item>
+          </el-col>
+          <el-col :lg="6" :md="8" :sm="12" :xs="12">
+            <el-form-item label="宽度cm" prop="width">
+              <el-input v-model="form.width" type="number" :precision="2" placeholder="请输入宽度" />
+            </el-form-item>
+          </el-col>
+          <el-col :lg="6" :md="8" :sm="12" :xs="12">
+            <el-form-item label="高度cm" prop="height">
+              <el-input v-model="form.height" type="number" :precision="2" placeholder="请输入高度" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :lg="6" :md="8" :sm="12" :xs="12">
+            <el-form-item label="厚度mm" prop="thick">
+              <el-input v-model="form.thick" type="number" :precision="2" placeholder="请输入厚度" />
+            </el-form-item>
+          </el-col>
+          <el-col :lg="6" :md="8" :sm="12" :xs="12">
+            <el-form-item label="成品克重g" prop="weight">
+              <el-input v-model="form.weight" type="number" :precision="2" placeholder="请输入成品克重" />
+            </el-form-item>
+          </el-col>
+          <el-col :lg="6" :md="8" :sm="12" :xs="12">
+            <el-form-item label="单重(KG)" prop="singleWeight">
+              <el-input v-model="form.singleWeight" type="number" :precision="2" placeholder="请输入单重" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :lg="6" :md="8" :sm="12" :xs="12">
+            <el-form-item label="圆角" prop="fillet">
+              <el-input v-model="form.fillet" type="number" :precision="2" placeholder="请输入圆角" />
+            </el-form-item>
+          </el-col>
+          <el-col :lg="6" :md="8" :sm="12" :xs="12">
+            <el-form-item label="是否异型" prop="fillet">
+              <el-radio-group v-model="form.isAllotype" >
+                <el-radio
+                  v-for="dict in dict.type.sys_yes_no"
+                  :key="dict.value"
+                  :label="dict.value"
+                >{{dict.label}}</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+          <el-col :lg="6" :md="8" :sm="12" :xs="12">
+            <el-form-item :lg="6" :md="8" :sm="12" :xs="12" label="是否直角" prop="isRightAngle">
+              <el-radio-group v-model="form.isRightAngle">
+                <el-radio
+                  v-for="dict in dict.type.sys_yes_no"
+                  :key="dict.value"
+                  :label="dict.value"
+                >{{dict.label}}</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :lg="6" :md="8" :sm="12" :xs="12">
+            <el-form-item label="角度(mm)" prop="angle">
+              <el-input v-model="form.angle" type="number" :precision="2" placeholder="请输入角度" />
+            </el-form-item>
+          </el-col>
+          <el-col :lg="6" :md="8" :sm="12" :xs="12">
+            <el-form-item label="孔径(mm)" prop="aperture">
+              <el-input v-model="form.aperture" type="number" :precision="2" placeholder="请输入孔径" />
+            </el-form-item>
+          </el-col>
+          <el-col :lg="6" :md="8" :sm="12" :xs="12">
+            <el-form-item label="单层厚(丝)" prop="singleLayerThick">
+              <el-input v-model="form.singleLayerThick" type="number" :precision="2" placeholder="请输入单层厚(单位丝)" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+
+          <el-col :lg="6" :md="8" :sm="12" :xs="12">
+            <el-form-item label="层数" prop="layerNum">
+              <el-input v-model="form.layerNum" type="number" :precision="2" placeholder="请输入层数" />
+            </el-form-item>
+          </el-col>
+          <el-col :lg="6" :md="8" :sm="12" :xs="12">
+            <el-form-item label="是否防霉" prop="isMould">
+              <el-radio-group v-model="form.isMould" >
+                <el-radio
+                  v-for="dict in dict.type.sys_yes_no"
+                  :key="dict.value"
+                  :label="dict.value"
+                >{{dict.label}}</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+          <el-col :lg="6" :md="8" :sm="12" :xs="12">
+            <el-form-item label="是否写码" prop="isCoding">
+              <el-radio-group v-model="form.isCoding" >
+                <el-radio
+                  v-for="dict in dict.type.sys_yes_no"
+                  :key="dict.value"
+                  :label="dict.value"
+                >{{dict.label}}</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :lg="6" :md="8" :sm="12" :xs="12">
+            <el-form-item label="体系认证" prop="certification">
+              <el-input v-model="form.certification" placeholder="请输入体系认证" />
+            </el-form-item>
+          </el-col>
+          <el-col :lg="6" :md="8" :sm="12" :xs="12">
+            <el-form-item label="样品形状" prop="shape">
+              <el-select v-model="form.shape" placeholder="请选择样品形状">
+                <el-option
+                  v-for="dict in dict.type.product_shape"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :lg="6" :md="8" :sm="12" :xs="12">
+            <el-form-item label="样品形状大小" prop="shapeSize">
+              <el-input v-model="form.shapeSize" type="number" :precision="4" placeholder="请输入样品形状大小" />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
 
       <el-tabs type="border-card" @tab-click="tabClick">
@@ -219,7 +353,7 @@ export default {
     FactorySelect,
     ImageUpload,
   },
-  dicts: [],
+  dicts: ['product_shape'],
   provide() {
     return {
       mode: this.mode,
@@ -250,6 +384,25 @@ export default {
         remark: "",
         prototype: "",
         warehouse: "",
+        length: '',
+        width: '',
+        height: '',
+        thick: '',
+        weight: '',
+        angleType: '',
+        isAllotype:'',
+        isRightAngle:'',
+        fillet:'',
+        angle: '',
+        aperture: '',
+        singleLayerThick: '',
+        singleWeight: '',
+        layerNum: '',
+        isMould: '',
+        isCoding: '',
+        certification: '',
+        shape: '',
+        shapeSize: '',
       },
       rules: {},
     };
@@ -388,6 +541,25 @@ export default {
         remark: "",
         prototype: "",
         warehouse: "",
+        length: '',
+        width: '',
+        height: '',
+        thick: '',
+        weight: '',
+        angleType: '',
+        isAllotype:'',
+        isRightAngle:'',
+        fillet:'',
+        angle: '',
+        aperture: '',
+        singleLayerThick: '',
+        singleWeight: '',
+        layerNum: '',
+        isMould: '',
+        isCoding: '',
+        certification: '',
+        shape: '',
+        shapeSize: '',
       };
       this.$refs["ProogingBomRef"].resetState();
       this.$refs["ProogingProcessRef"].resetState();