min fix

src/Form/headquartersServiceMaterial/add.vue

@@ -468,13 +468,13 @@ export default {
                     this.loading = false;
                     this.$message.error(
                         res.msg ||
-                            (this.title_btn == "编辑" ? "编辑失败" : "新建失败")
+                            (this.title_btn == "编辑" ? this.$t("编辑失败") : this.$t("新建失败"))
                     );
                     return;
                 }
                 this.loading = false;
                 this.$message.success(
-                    this.title_btn == "编辑" ? "编辑成功" : "新建成功"
+                    this.title_btn == "编辑" ? this.$t("编辑成功") : this.$t("新建成功")
                 );
                 this.bindData = {
                     ownertable: "sc_item",

src/Form/ourServiceMaterial/add.vue

@@ -454,13 +454,13 @@ export default {
                     this.loading = false;
                     this.$message.error(
                         res.msg ||
-                            (this.title_btn == "编辑" ? "编辑失败" : "新建失败")
+                           (this.title_btn == "编辑" ? this.$t("编辑失败") : this.$t("新建失败"))
                     );
                     return;
                 }
                 this.loading = false;
                 this.$message.success(
-                    this.title_btn == "编辑" ? "编辑成功" : "新建成功"
+                    this.title_btn == "编辑" ? this.$t("编辑成功") : this.$t("新建成功")
                 );
                 this.bindData = {
                     ownertable: "sc_item_local",

src/Form/serviceWorkItem/add.vue

@@ -194,13 +194,13 @@ export default {
         if (res.code === 0) {
           this.loading = false;
           this.$message.error(
-            res.msg || (this.title_btn == "编辑" ? "编辑失败" : "新建失败")
+            res.msg || (this.title_btn == "编辑" ? this.$t("编辑失败") : this.$t("新建失败"))
           );
           return;
         }
         this.loading = false;
         this.$message.success(
-          this.title_btn == "编辑" ? "编辑成功" : "新建成功"
+          this.title_btn == "编辑" ? this.$t("编辑成功") : this.$t("新建成功")
         );
         this.$emit("onSuccess");
         this.$refs["form"].resetFields();

src/bgj/terminalWorkBillModule/modules/detail.vue

@@ -37,8 +37,8 @@
                     type="warning"
                     size="mini"
                     :loading="btnLoading"
-                    @click="onToggleUsed(0, '禁用')"
-                    >{{ $t("禁 用") }}</el-button
+                    @click="onToggleUsed(0, '停用')"
+                    >{{ $t("停 用") }}</el-button
                 >
                 <el-button type="danger" @click="onDelete" size="mini">{{
                     $t(`删 除`)
@@ -81,7 +81,7 @@ export default {
     methods: {
         onToggleUsed(value, actionText) {
             this.$confirm(
-                this.$t(`确认${actionText}当前工单模板吗`) + "?",
+                this.$t('确认') + this.$t(actionText) + this.$t('当前工单模板')+'?',
                 this.$t("提示"),
                 {
                     confirmButtonText: this.$t("确定"),
@@ -305,6 +305,24 @@ export default {
                             return style;
                         },
                     },
+                    {
+                    label: "是否工单完结时生成质保卡",
+                    value: this.mainData.iswarrantycard ? "是" : "否",
+                    style: function () {
+                        let style = {};
+                        switch (that.mainData.iswarrantycard) {
+                            case 1:
+                                style = { color: "#ff0000" };
+                                break;
+                            case 0:
+                                style = { color: "#666666" };
+                                break;
+                            default:
+                                break;
+                        }
+                        return style;
+                    },
+                },
                 ],
                 systemInfo: [
                     { label: "创建人", value: this.mainData.createby },

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

@@ -48,9 +48,9 @@
                             :style="
                                 scope.column.data.fileupload
                                     ? scope.column.data.fileupload == 1
-                                        ? 'color:green'
-                                        : 'color:red'
-                                    : 'color:#333333'
+                                        ? 'color:#008000'
+                                        : 'color:#ff0000'
+                                    : ''
                             "
                         >
                             {{
@@ -66,9 +66,9 @@
                             :style="
                                 scope.column.data.additem
                                     ? scope.column.data.additem == 1
-                                        ? 'color:green'
-                                        : 'color:red'
-                                    : 'color:#333333'
+                                        ? 'color:#008000'
+                                        : 'color:#ff0000'
+                                    : ''
                             "
                         >
                             {{
@@ -83,8 +83,8 @@
                             v-else-if="scope.column.columnname == 'formcheck'"
                             :style="
                                 scope.column.data.formcheck == 1
-                                    ? 'color:green'
-                                    : 'color:red'
+                                    ? 'color:#ff0000'
+                                    : 'color:#666666'
                             "
                         >
                             {{
@@ -98,9 +98,9 @@
                             :style="
                                 scope.column.data.panorama
                                     ? scope.column.data.panorama == 1
-                                        ? 'color:green'
-                                        : 'color:red'
-                                    : 'color:#333333'
+                                        ? 'color:#008000'
+                                        : 'color:#ff0000'
+                                    : ''
                             "
                         >
                             {{
@@ -116,9 +116,9 @@
                             :style="
                                 scope.column.data.passcheck
                                     ? scope.column.data.passcheck == 1
-                                        ? 'color:green'
-                                        : 'color:red'
-                                    : 'color:#333333'
+                                        ? 'color:#008000'
+                                        : 'color:#ff0000'
+                                    : ''
                             "
                         >
                             {{
@@ -134,9 +134,9 @@
                             :style="
                                 scope.column.data.signature
                                     ? scope.column.data.signature == 1
-                                        ? 'color:green'
-                                        : 'color:red'
-                                    : 'color:#333333'
+                                        ? 'color:#008000'
+                                        : 'color:#ff0000'
+                                    : ''
                             "
                         >
                             {{
@@ -151,8 +151,8 @@
                             v-else-if="scope.column.columnname == 'servicenode'"
                             :style="
                                 scope.column.data.servicenode == 1
-                                    ? 'color:green'
-                                    : 'color:red'
+                                    ? 'color:#ff0000'
+                                    : 'color:#666666'
                             "
                         >
                             {{
@@ -161,6 +161,20 @@
                                     : $t("否")
                             }}
                         </div>
+                        <div
+                            v-else-if="scope.column.columnname == 'logreport'"
+                            :style="
+                                scope.column.data.logreport == 1
+                                    ? 'color:#ff0000'
+                                    : 'color:#666666'
+                            "
+                        >
+                            {{
+                                scope.column.data.logreport == 1
+                                    ? $t("是")
+                                    : $t("否")
+                            }}
+                        </div>
                         <div v-else>
                             {{
                                 scope.column.data[[scope.column.columnname]]

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

@@ -150,15 +150,18 @@
                 prop="servicenode"
                 :label="$t(`是否必填服务节点`)"
                 width="160"
+            >
+                 <template slot-scope="scope">
+                    {{ scope.row.servicenode == 1 ? $t("是") : $t("否") }}
+                </template>
+            </el-table-column>
+            <el-table-column
+                prop="logreport"
+                :label="$t(`是否施工日志汇报`)"
+                width="160"
             >
                 <template slot-scope="scope">
-                    {{
-                        scope.row.servicenode
-                            ? scope.row.servicenode == 1
-                                ? $t("非必填")
-                                : $t("必填")
-                            : $t("无")
-                    }}
+                    {{ scope.row.logreport == 1 ? $t("是") : $t("否") }}
                 </template>
             </el-table-column>
             <el-table-column :label="$t('操作')" width="200" fixed="right">