生产版本和工作单元新增字段

src/views/mes/md/workunit/index.vue

@@ -110,6 +110,11 @@
           <dict-tag :options="dict.type.sys_yes_no" :value="scope.row.faultFlag"/>
         </template>
       </el-table-column>
+      <el-table-column label="是否固化" align="center" prop="solidify" >
+      <template slot-scope="scope">
+          <dict-tag :options="dict.type.sys_yes_no" :value="scope.row.solidify"/>
+        </template>
+      </el-table-column>
       <el-table-column label="备注" align="center" prop="remark" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
@@ -206,6 +211,26 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row>
+          <el-col :span="20">
+            <el-form-item label="是否固化" label-width="120px">
+              <el-radio-group v-model="form.solidify" disabled v-if="optType=='view'">
+                <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-radio-group v-model="form.solidify" v-else>
+                <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 :span="20">
             <el-form-item label="备注" label-width="120px" prop="remark">
@@ -274,6 +299,7 @@ export default {
         workunitName: '',
         enableFlag: 'Y',
         faultFlag: 'N',
+        solidify: 'N',
       },
       // 表单校验
       rules: {
@@ -317,6 +343,8 @@ export default {
         workunitName: '',
         enableFlag: 'Y',
         faultFlag: 'N',
+        solidify: 'N',
+        
       }
       this.autoGenFlag = false;
       this.resetForm("form");

src/views/mes/pro/productionSolution/components/ProogingProcess.vue

@@ -25,6 +25,7 @@
         </template>
       </el-table-column>
       <el-table-column label="基本数量" prop="quantity" align="center" />
+      <el-table-column label="固化时间" prop="solidifyTime" align="center" />
       <el-table-column label="计量单位" prop="unitOfMeasure" align="center" />
       <el-table-column label="雇员数量" prop="employeesNum" align="center" />
       <el-table-column label="关键工序" prop="keyFlag" align="center">