是否合格字段修改

src/Form/serviceWorkItem/add.vue

@@ -73,9 +73,8 @@
             <el-col :span="24">
               <el-form-item :label="$t('是否合格：')" prop="passcheck">
                 <el-radio-group v-model="form.passcheck">
-                  <el-radio :label="11">{{ $t("必填") }}</el-radio>
-                  <el-radio :label="1">{{ $t("非必填") }}</el-radio>
-                  <el-radio :label="0">{{ $t("无") }}</el-radio>
+                <el-radio :label="1">{{ $t("是") }}</el-radio>
+                  <el-radio :label="0">{{ $t("否") }}</el-radio>
                 </el-radio-group>
               </el-form-item>
             </el-col>
@@ -158,7 +157,7 @@ export default {
         fileupload: 0, //附件上传,0不需要 1可上传 11必须上传
         signature: 0, //客户签名,0不需要 1可填写 11必须填写
         additem: 0, //物料添加,0不添加 1添加 11必须添加
-        passcheck: 0, //合格确认,0不需要 1需要 11必须
+        passcheck: 0, //合格确认,0否1是
         formcheck: 0, //表单验证,0 不需要 1 需要
         panorama: 0, //全景影像,0不需要 1可上传 11必须上传
         servicenode: 0, //服务节点,0 不需要 1 需要

src/bgj/serviceWorkItem/index.vue

@@ -37,7 +37,7 @@ export default {
   data() {
     return {
       // 是否类型字段
-      booleanFields: ["formcheck", "servicenode", "logreport"],
+      booleanFields: ["formcheck", "servicenode", "logreport", "passcheck"],
       // 通用状态
       commonStatusMap: { 0: "无", 1: "非必填", 11: "必填" },
       // 是否状态

src/bgj/serviceWorkItem/modules/detail.vue

@@ -160,23 +160,16 @@ export default {
 
                 {
                     label: "是否合格",
-                    value: this.mainData.passcheck
-                        ? this.mainData.passcheck == 1
-                            ? "非必填"
-                            : "必填"
-                        : "无",
+                    value: this.mainData.passcheck ? "是" : "否",
                     style: function () {
                         let style = {};
                         switch (that.mainData.passcheck) {
-                            case 0:
-                                style = { color: "#333333" };
-                                break;
                             case 1:
-                                style = { color: "#008000" };
-                                break;
-                            case 11:
                                 style = { color: "#ff0000" };
                                 break;
+                            case 0:
+                                style = { color: "#666666" };
+                                break;
                             default:
                                 break;
                         }

src/bgj/terminalWorkBillModule/modules/taskDetail/components/addTop.vue

@@ -113,20 +113,16 @@
                         </div>
                         <div
                             v-else-if="scope.column.columnname == 'passcheck'"
-                            :style="
-                                scope.column.data.passcheck
-                                    ? scope.column.data.passcheck == 1
-                                        ? 'color:#008000'
-                                        : 'color:#ff0000'
-                                    : ''
+                             :style="
+                                scope.column.data.passcheck == 1
+                                    ? 'color:#ff0000'
+                                    : 'color:#666666'
                             "
                         >
                             {{
-                                scope.column.data.passcheck
-                                    ? scope.column.data.passcheck == 1
-                                        ? $t("非必填")
-                                        : $t("必填")
-                                    : $t("无")
+                                scope.column.data.passcheck == 1
+                                    ? $t("是")
+                                    : $t("否")
                             }}
                         </div>
                         <div

src/bgj/terminalWorkBillModule/modules/taskDetail/index.vue

@@ -122,13 +122,7 @@
                 width="120"
             >
                 <template slot-scope="scope">
-                    {{
-                        scope.row.passcheck
-                            ? scope.row.passcheck == 1
-                                ? $t("非必填")
-                                : $t("必填")
-                            : $t("无")
-                    }}
+                    {{ scope.row.passcheck == 1 ? $t("是") : $t("否") }}
                 </template>
             </el-table-column>
             <el-table-column

src/bgj/workOrderManage/index.vue

@@ -187,6 +187,7 @@
           :id="scope.data.data.sc_workorderid"
           :disabled="true"
           @deleteSuccess="onSuccess"
+          style="padding-left: 10px;"
         />
       </template>
     </basicLayout>