流程调整

src/views/process-center/applyListByTableName.vue

@@ -967,9 +967,11 @@ export default {
       if (result == 0) {
         text = '未提交'
         
-        if(recorde.follow_up == '1'){
-          text = '未提交(已确认)'
-        }
+        if (recorde.follow_up == '工厂待确认' || recorde.follow_up == '工厂已确认') {
+        
+          text = recorde.follow_up
+          
+        } 
         
         color = 'default'
       } else if (result == 1) {

src/views/system/modules/UserModal.vue

@@ -146,9 +146,10 @@
         </a-form-item>
 
         <a-form-item label="婚否" :labelCol="labelCol" :wrapperCol="wrapperCol">
-          <a-select v-decorator="['nmarriage', validatorRules.nmarriage]" placeholder="请选择性别">
+          <a-select v-decorator="['nmarriage', validatorRules.nmarriage]" placeholder="请选择">
             <a-select-option value="1">是</a-select-option>
             <a-select-option value="0">否</a-select-option>
+            <a-select-option value="2">离异</a-select-option>
           </a-select>
         </a-form-item>