Merge branch 'green' into allTestUrgent

src/Form/headquartersServiceMaterial/add.vue

@@ -17,240 +17,245 @@
             @close="onCancel"
         >
             <div class="drawer__panel">
-                <el-form
-                    :model="form"
-                    :rules="rules"
-                    ref="form"
-                    :label-width="tool.onlyZh('180px')"
-                    label-position="right"
-                    size="mini"
-                >
-                    <el-col :span="24">
-                        <el-form-item :label="$t('物料名称：')" prop="name">
-                            <el-input
-                                v-model="form.name"
-                                :placeholder="$t('请填写物料名称')"
-                            ></el-input>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="24">
-                        <el-form-item :label="$t('物料编号：')" prop="code">
-                            <el-input
-                                v-model="form.code"
-                                :placeholder="$t('请填写物料编号')"
-                            ></el-input>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="24">
-                        <el-form-item
-                            :label="$t('erp品名：')"
-                            prop="erpitemname"
-                        >
-                            <el-input
-                                v-model="form.erpitemname"
-                                :placeholder="$t('请填写erp品名')"
-                            ></el-input>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="24">
-                        <el-form-item :label="$t('erp品号：')" prop="erpitemno">
-                            <el-input
-                                v-model="form.erpitemno"
-                                :placeholder="$t('请填写erp品号')"
-                            ></el-input>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="24">
-                        <el-form-item :label="$t('牌价：')" prop="marketprice">
-                            <el-input
-                                v-model="form.marketprice"
-                                :placeholder="$t('请填写牌价')"
-                            ></el-input>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="24">
-                        <el-form-item
-                            :label="$t('辅助单位：')"
-                            prop="isauxunit"
-                        >
-                            <el-checkbox
-                                v-model="form.isauxunit"
-                                :true-label="1"
-                                :false-label="0"
+                <el-row :gutter="20">
+                    <el-form
+                        :model="form"
+                        :rules="rules"
+                        ref="form"
+                        :label-width="tool.onlyZh('100px')"
+                        label-position="right"
+                        size="mini"
+                    >
+                        <el-col :span="24">
+                            <el-form-item :label="$t('物料名称：')" prop="name">
+                                <el-input
+                                    v-model="form.name"
+                                    :placeholder="$t('请填写物料名称')"
+                                ></el-input>
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="24">
+                            <el-form-item :label="$t('物料编号：')" prop="code">
+                                <el-input
+                                    v-model="form.code"
+                                    :placeholder="$t('请填写物料编号')"
+                                ></el-input>
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="24">
+                            <el-form-item
+                                :label="$t('erp品名：')"
+                                prop="erpitemname"
                             >
-                                {{ $t("是否需要辅助单位") }}
-                            </el-checkbox>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="24">
-                        <el-form-item :label="$t(`主单位`)" prop="unitid">
-                            <el-select
-                                style="width: 100%"
-                                v-model="form.unitid"
-                                :placeholder="$t('请选择')"
-                                @change="unitChange"
-                                clearable
+                                <el-input
+                                    v-model="form.erpitemname"
+                                    :placeholder="$t('请填写erp品名')"
+                                ></el-input>
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="24">
+                            <el-form-item
+                                :label="$t('erp品号：')"
+                                prop="erpitemno"
                             >
-                                <el-option
-                                    v-for="item in unitData"
-                                    :key="item.unitid"
-                                    :label="$t(item.unitname)"
-                                    :value="item.unitid"
-                                >
-                                </el-option>
-                            </el-select>
-                        </el-form-item>
-                    </el-col>
-                    <!-- 辅助单位 -->
-                    <!-- <el-col :span="24">
-                        <el-form-item :label="$t('辅助单位：')" prop="auxunit">
-                            <el-input v-model="form.auxunit" :placeholder="$t('请填写辅助单位')"></el-input>
-                        </el-form-item>
-                    </el-col> -->
-                    <el-col :span="24">
-                        <el-form-item :label="$t(`辅助单位`)">
-                            <el-select
-                                style="width: 100%"
-                                v-model="form.auxunitid"
-                                :disabled="form.isauxunit === 0"
-                                :placeholder="$t('请选择')"
-                                clearable
-                                @change="auxunitChange"
+                                <el-input
+                                    v-model="form.erpitemno"
+                                    :placeholder="$t('请填写erp品号')"
+                                ></el-input>
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="24">
+                            <el-form-item
+                                :label="$t('牌价：')"
+                                prop="marketprice"
+                            >
+                                <el-input
+                                    v-model="form.marketprice"
+                                    :placeholder="$t('请填写牌价')"
+                                ></el-input>
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="24">
+                            <el-form-item
+                                :label="$t('辅助单位：')"
+                                prop="isauxunit"
                             >
-                                <el-option
-                                    v-for="item in unitGroupData"
-                                    :key="item.unitgroupid"
-                                    :label="$t(item.unitgroupname)"
-                                    :value="item.unitgroupid"
+                                <el-checkbox
+                                    v-model="form.isauxunit"
+                                    :true-label="1"
+                                    :false-label="0"
                                 >
-                                    <p style="float: left">
-                                        {{ item.unitgroupname }}
-                                    </p>
-                                    <p
-                                        style="
-                                            float: right;
-                                            color: #8492a6;
-                                            font-size: 13px;
-                                        "
+                                    {{ $t("是否需要辅助单位") }}
+                                </el-checkbox>
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="24">
+                            <el-form-item :label="$t(`主单位`)" prop="unitid">
+                                <el-select
+                                    style="width: 100%"
+                                    v-model="form.unitid"
+                                    :placeholder="$t('请选择')"
+                                    @change="unitChange"
+                                    clearable
+                                >
+                                    <el-option
+                                        v-for="item in unitData"
+                                        :key="item.unitid"
+                                        :label="$t(item.unitname)"
+                                        :value="item.unitid"
                                     >
-                                        {{ item.conversionrate
-                                        }}{{ item.unitname }}/{{
-                                            item.auxunitname
-                                        }},{{ $t(`换算率`) }}:{{
-                                            "1:" + item.conversionrate
-                                        }}
-                                    </p>
-                                </el-option>
-                            </el-select>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="24">
-                        <el-form-item :label="$t(`领域`)" prop="domains">
-                            <el-select
-                                style="width: 100%"
-                                v-model="form.domains"
-                                multiple
-                                :placeholder="$t('请选择')"
-                                clearable
-                            >
-                                <el-option
-                                    v-for="item in tradefield"
-                                    :key="item.value"
-                                    :label="$t(item.value)"
-                                    :value="item.value"
+                                    </el-option>
+                                </el-select>
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="24">
+                            <el-form-item :label="$t(`辅助单位`)">
+                                <el-select
+                                    style="width: 100%"
+                                    v-model="form.auxunitid"
+                                    :disabled="form.isauxunit === 0"
+                                    :placeholder="$t('请选择')"
+                                    clearable
+                                    @change="auxunitChange"
+                                >
+                                    <el-option
+                                        v-for="item in unitGroupData"
+                                        :key="item.unitgroupid"
+                                        :label="$t(item.unitgroupname)"
+                                        :value="item.unitgroupid"
+                                    >
+                                        <p style="float: left">
+                                            {{ item.unitgroupname }}
+                                        </p>
+                                        <p
+                                            style="
+                                                float: right;
+                                                color: #8492a6;
+                                                font-size: 13px;
+                                            "
+                                        >
+                                            {{ item.conversionrate
+                                            }}{{ item.unitname }}/{{
+                                                item.auxunitname
+                                            }},{{ $t(`换算率`) }}:{{
+                                                "1:" + item.conversionrate
+                                            }}
+                                        </p>
+                                    </el-option>
+                                </el-select>
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="24">
+                            <el-form-item :label="$t(`领域`)" prop="domains">
+                                <el-select
+                                    style="width: 100%"
+                                    v-model="form.domains"
+                                    multiple
+                                    :placeholder="$t('请选择')"
+                                    clearable
                                 >
-                                </el-option>
-                            </el-select>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="24">
-                        <el-form-item :label="$t('型号：')" prop="type">
-                            <el-input
-                                v-model="form.type"
-                                :placeholder="$t('请填写型号')"
-                            ></el-input>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="24">
-                        <el-form-item :label="$t('规格：')" prop="spec">
-                            <el-input
-                                v-model="form.spec"
-                                :placeholder="$t('请填写规格')"
-                            ></el-input>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="24">
-                        <el-form-item :label="$t('起订量：')" prop="start_num">
-                            <el-input-number
-                                v-model="form.start_num"
-                                :min="1"
-                                :placeholder="$t('请填写起订量')"
-                            />
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="24">
-                        <el-form-item :label="$t('增量：')" prop="increment">
-                            <el-input-number
-                                v-model="form.increment"
-                                :min="1"
-                                :placeholder="$t('请填写增量')"
-                            />
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="24">
-                        <el-form-item :label="$t('备注：')" prop="remark">
-                            <el-input
-                                type="textarea"
-                                v-model="form.remark"
-                                :placeholder="$t('请填写备注')"
-                            ></el-input>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="20">
-                        <el-form-item :label="$t('物料图：')">
-                            <div
-                                class="flex-align-center"
-                                style="flex-wrap: wrap"
+                                    <el-option
+                                        v-for="item in tradefield"
+                                        :key="item.value"
+                                        :label="$t(item.value)"
+                                        :value="item.value"
+                                    >
+                                    </el-option>
+                                </el-select>
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="24">
+                            <el-form-item :label="$t('型号：')" prop="type">
+                                <el-input
+                                    v-model="form.type"
+                                    :placeholder="$t('请填写型号')"
+                                ></el-input>
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="24">
+                            <el-form-item :label="$t('规格：')" prop="spec">
+                                <el-input
+                                    v-model="form.spec"
+                                    :placeholder="$t('请填写规格')"
+                                ></el-input>
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="24">
+                            <el-form-item
+                                :label="$t('起订量：')"
+                                prop="start_num"
+                            >
+                                <el-input-number
+                                    v-model="form.start_num"
+                                    :min="1"
+                                    :placeholder="$t('请填写起订量')"
+                                />
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="24">
+                            <el-form-item
+                                :label="$t('增量：')"
+                                prop="increment"
                             >
-                                <uploadFile
-                                    ref="upload"
-                                    style="margin-top: 10px"
-                                    :folderid="folderid"
-                                    accept=".JPG,.PNG,.jpg,.png"
-                                    type="image"
-                                    :bindData="bindData"
-                                    @onSuccess="uploadSuccess"
+                                <el-input-number
+                                    v-model="form.increment"
+                                    :min="1"
+                                    :placeholder="$t('请填写增量')"
+                                />
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="24">
+                            <el-form-item :label="$t('备注：')" prop="remark">
+                                <el-input
+                                    type="textarea"
+                                    v-model="form.remark"
+                                    :placeholder="$t('请填写备注')"
+                                ></el-input>
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="20">
+                            <el-form-item :label="$t('物料图：')">
+                                <div
+                                    class="flex-align-center"
+                                    style="flex-wrap: wrap"
                                 >
-                                </uploadFile>
-                                <template v-if="title_btn == '编辑'">
-                                    <previewImage
-                                        style="
-                                            margin-left: 10px;
-                                            margin-top: 10px;
-                                        "
-                                        v-for="image in form.attinfos"
-                                        :key="image.index"
-                                        :image="image"
-                                        :deletebtn="true"
-                                        @onSuccess="clearCover"
-                                    ></previewImage>
-                                </template>
-                            </div>
+                                    <uploadFile
+                                        ref="upload"
+                                        style="margin: 10px 10px 10px 0"
+                                        :folderid="folderid"
+                                        accept=".JPG,.PNG,.jpg,.png"
+                                        type="image"
+                                        :bindData="bindData"
+                                        @onSuccess="uploadSuccess"
+                                    >
+                                    </uploadFile>
+                                    <template v-if="title_btn == '编辑'">
+                                        <previewImage
+                                            style="
+                                                margin: 10px 10px 10px 0;
+                                            "
+                                            v-for="image in form.attinfos"
+                                            :key="image.index"
+                                            :image="image"
+                                            :deletebtn="true"
+                                            @onSuccess="clearCover"
+                                        ></previewImage>
+                                    </template>
+                                </div>
 
-                            <small
-                                style="
-                                    display: block;
-                                    margin-top: 20px;
-                                    margin-bottom: 80px;
-                                "
-                                class="info"
-                                >{{ $t(`注:建议上传图片大小`) }}1024x1024px，{{
-                                    $t("大小不超过")
-                                }}2M，{{ $t("格式为") }}JPG/PNG</small
-                            >
-                        </el-form-item>
-                    </el-col>
-                </el-form>
+                                <small
+                                    style="display: block; margin-top: 18px"
+                                    class="info"
+                                    >{{
+                                        $t(`注:建议上传图片大小`)
+                                    }}1024x1024px，{{ $t("大小不超过") }}2M，{{
+                                        $t("格式为")
+                                    }}JPG/PNG</small
+                                >
+                            </el-form-item>
+                        </el-col>
+                    </el-form>
+                </el-row>
             </div>
             <div class="fixed__btn__panel">
                 <el-button
@@ -461,11 +466,16 @@ export default {
                 });
                 if (res.code === 0) {
                     this.loading = false;
-                    this.$message.error(res.msg || "新建失败");
+                    this.$message.error(
+                        res.msg ||
+                            (this.title_btn == "编辑" ? "编辑失败" : "新建失败")
+                    );
                     return;
                 }
                 this.loading = false;
-                this.$message.success("新建成功");
+                this.$message.success(
+                    this.title_btn == "编辑" ? "编辑成功" : "新建成功"
+                );
                 this.bindData = {
                     ownertable: "sc_item",
                     ownerid: res.data.sc_itemid,

src/Form/ourServiceMaterial/add.vue

@@ -208,7 +208,7 @@
                             >
                                 <uploadFile
                                     ref="upload"
-                                    style="margin-top: 10px"
+                                    style="margin: 10px 10px 10px 0"
                                     :folderid="folderid"
                                     accept=".JPG,.PNG,.jpg,.png"
                                     type="image"
@@ -219,8 +219,7 @@
                                 <template v-if="title_btn == '编辑'">
                                     <previewImage
                                         style="
-                                            margin-left: 10px;
-                                            margin-top: 10px;
+                                            margin: 10px 10px 10px 0;
                                         "
                                         v-for="image in form.attinfos"
                                         :key="image.index"
@@ -453,11 +452,16 @@ export default {
                 });
                 if (res.code === 0) {
                     this.loading = false;
-                    this.$message.error(res.msg || "新建失败");
+                    this.$message.error(
+                        res.msg ||
+                            (this.title_btn == "编辑" ? "编辑失败" : "新建失败")
+                    );
                     return;
                 }
                 this.loading = false;
-                this.$message.success("新建成功");
+                this.$message.success(
+                    this.title_btn == "编辑" ? "编辑成功" : "新建成功"
+                );
                 this.bindData = {
                     ownertable: "sc_item_local",
                     ownerid: res.data.sc_item_localid,

src/Form/serviceWorkItem/add.vue

@@ -17,134 +17,160 @@
             @close="onCancel"
         >
             <div class="drawer__panel">
-                <el-form
-                    :model="form"
-                    :rules="rules"
-                    ref="form"
-                    :label-width="tool.onlyZh('180px')"
-                    label-position="right"
-                    size="mini"
-                >
-                    <el-col :span="24">
-                        <el-form-item :label="$t('工作名：')" prop="workname">
-                            <el-input
-                                v-model="form.workname"
-                                :placeholder="$t('请输入工作名')"
-                            ></el-input>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="24">
-                        <el-form-item :label="$t('操作说明：')" prop="remarks">
-                            <el-input
-                                type="textarea"
-                                v-model="form.remarks"
-                                :placeholder="$t('请输入操作说明')"
-                            ></el-input>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="24">
-                        <el-form-item
-                            :label="$t('上传附件：')"
-                            prop="fileupload"
-                        >
-                            <el-radio-group v-model="form.fileupload">
-                                <el-radio :label="11">{{
-                                    $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>
-                    <el-col :span="24">
-                        <el-form-item
-                            :label="$t('是否添加物料：')"
-                            prop="additem"
-                        >
-                            <el-radio-group v-model="form.additem">
-                                <el-radio :label="11">{{
-                                    $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>
-                    <el-col :span="24">
-                        <el-form-item
-                            :label="$t('上传全景影像：')"
-                            prop="panorama"
-                        >
-                            <el-radio-group v-model="form.panorama">
-                                <el-radio :label="11">{{
-                                    $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>
-                    <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-group>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="24">
-                        <el-form-item
-                            :label="$t('是否客户签名：')"
-                            prop="signature"
-                        >
-                            <el-radio-group v-model="form.signature">
-                                <el-radio :label="11">{{
-                                    $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>
-                    <el-col :span="24">
-                        <el-form-item
-                            :label="$t('内容是否需要验证表单：')"
-                            prop="formcheck"
-                        >
-                            <el-radio-group v-model="form.formcheck">
-                                <el-radio :label="1">{{ $t("是") }}</el-radio>
-                                <el-radio :label="0">{{ $t("否") }}</el-radio>
-                            </el-radio-group>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="24">
-                        <el-form-item
-                            :label="$t('是否必填服务节点：')"
-                            prop="servicenode"
-                        >
-                            <el-radio-group v-model="form.servicenode">
-                                <el-radio :label="1">{{ $t("是") }}</el-radio>
-                                <el-radio :label="0">{{ $t("否") }}</el-radio>
-                            </el-radio-group>
-                        </el-form-item>
-                    </el-col>
-                </el-form>
+                <el-row :gutter="20">
+                    <el-form
+                        :model="form"
+                        :rules="rules"
+                        ref="form"
+                        :label-width="tool.onlyZh('170px')"
+                        label-position="right"
+                        size="mini"
+                    >
+                        <el-col :span="24">
+                            <el-form-item
+                                :label="$t('工作名：')"
+                                prop="workname"
+                            >
+                                <el-input
+                                    v-model="form.workname"
+                                    :placeholder="$t('请输入工作名')"
+                                ></el-input>
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="24">
+                            <el-form-item
+                                :label="$t('操作说明：')"
+                                prop="remarks"
+                            >
+                                <el-input
+                                    type="textarea"
+                                    v-model="form.remarks"
+                                    :placeholder="$t('请输入操作说明')"
+                                ></el-input>
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="24">
+                            <el-form-item
+                                :label="$t('上传附件：')"
+                                prop="fileupload"
+                            >
+                                <el-radio-group v-model="form.fileupload">
+                                    <el-radio :label="11">{{
+                                        $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>
+                        <el-col :span="24">
+                            <el-form-item
+                                :label="$t('是否添加物料：')"
+                                prop="additem"
+                            >
+                                <el-radio-group v-model="form.additem">
+                                    <el-radio :label="11">{{
+                                        $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>
+                        <el-col :span="24">
+                            <el-form-item
+                                :label="$t('上传全景影像：')"
+                                prop="panorama"
+                            >
+                                <el-radio-group v-model="form.panorama">
+                                    <el-radio :label="11">{{
+                                        $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>
+                        <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-group>
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="24">
+                            <el-form-item
+                                :label="$t('是否客户签名：')"
+                                prop="signature"
+                            >
+                                <el-radio-group v-model="form.signature">
+                                    <el-radio :label="11">{{
+                                        $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>
+                        <el-col :span="24">
+                            <el-form-item
+                                :label="$t('内容是否需要验证表单：')"
+                                prop="formcheck"
+                            >
+                                <el-radio-group v-model="form.formcheck">
+                                    <el-radio :label="1">{{
+                                        $t("是")
+                                    }}</el-radio>
+                                    <el-radio :label="0">{{
+                                        $t("否")
+                                    }}</el-radio>
+                                </el-radio-group>
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="24">
+                            <el-form-item
+                                :label="$t('是否必填服务节点：')"
+                                prop="servicenode"
+                            >
+                                <el-radio-group v-model="form.servicenode">
+                                    <el-radio :label="1">{{
+                                        $t("是")
+                                    }}</el-radio>
+                                    <el-radio :label="0">{{
+                                        $t("否")
+                                    }}</el-radio>
+                                </el-radio-group>
+                            </el-form-item>
+                        </el-col>
+                    </el-form>
+                </el-row>
             </div>
             <div class="fixed__btn__panel">
                 <el-button

src/bgj/serviceAppointment/modules/detail.vue

@@ -43,7 +43,9 @@
                     :detailInfo="detailInfo"
                 ></base-info>
             </div>
-            <div slot="slot1"></div>
+            <div slot="slot1">
+                <linkedWork> </linkedWork>
+            </div>
         </basicDetails>
     </div>
 </template>
@@ -52,6 +54,7 @@
 import BaseInfo from "@/bgj/headquartersServiceMaterial/modules/baseInfo";
 import changeBill from "./changeBill";
 import assignAgent from "./assignAgent";
+import linkedWork from "./linkedWork";
 export default {
     name: "detail",
     data() {
@@ -62,7 +65,7 @@ export default {
             btnLoading: false,
         };
     },
-    components: { BaseInfo, changeBill, assignAgent },
+    components: { BaseInfo, changeBill, assignAgent, linkedWork },
     methods: {
         async queryMainData() {
             const res = await this.$api.requested({

src/bgj/serviceAppointment/modules/linkedWork.vue

@@ -0,0 +1,171 @@
+
+<template>
+    <div>
+        <div style="display: flex; align-items: center">
+            <el-input
+                :placeholder="$t('请输入搜索内容')"
+                suffix-icon="el-icon-search"
+                v-model="params.content.where.condition"
+                style="width: 200px"
+                size="mini"
+                class="input-with-select inline-16"
+                @keyup.native.enter="listData((params.content.pageNumber = 1))"
+                @clear="clearData"
+                clearable
+            >
+            </el-input>
+            <slot name="addProduct"></slot>
+        </div>
+        <div style="margin-top: 15px">
+            <tableLayout
+                :layout="tablecols"
+                :data="list"
+                :opwidth="200"
+                :custom="true"
+                :width="false"
+                :height="tableHieght"
+                fixedName="operation"
+            >
+                <template v-slot:customcol="scope">
+                    <div v-if="scope.column.columnname == 'billno'">
+                        <span
+                            style="color: #3874f6; cursor: pointer"
+                            @click="goWork(scope.column.data)"
+                        >
+                            {{ scope.column.data.billno }}
+                        </span>
+                    </div>
+                    <div v-else-if="scope.column.columnname == 'status'">
+                        <span
+                            :style="
+                                tool.getStatusColor(
+                                    scope.column.data[[scope.column.columnname]]
+                                )
+                            "
+                            >{{
+                                $t(scope.column.data[[scope.column.columnname]])
+                            }}</span
+                        >
+                    </div>
+                    <div v-else-if="scope.column.columnname == 'city'">
+                        <span>
+                            {{ $t(scope.column.data.province)
+                            }}{{ $t(scope.column.data.city)
+                            }}{{ $t(scope.column.data.county) }}
+                        </span>
+                    </div>
+                    <div v-else-if="scope.column.columnname == 'progress'">
+                        <div style="display: flex; align-items: center">
+                            <el-progress
+                                status="success"
+                                :percentage="
+                                    Math.round(
+                                        (scope.column.data.progress_now /
+                                            scope.column.data.progress_total) *
+                                            100
+                                    )
+                                "
+                                :show-text="false"
+                                style="flex: 1"
+                            >
+                            </el-progress>
+                            <span style="margin-left: 10px">
+                                {{ scope.column.data.progress_now }}/{{
+                                    scope.column.data.progress_total
+                                }}
+                            </span>
+                        </div>
+                    </div>
+                    <div v-else>
+                        {{
+                            scope.column.data[[scope.column.columnname]]
+                                ? $t(
+                                      scope.column.data[
+                                          [scope.column.columnname]
+                                      ]
+                                  )
+                                : "--"
+                        }}
+                    </div>
+                </template>
+            </tableLayout>
+        </div>
+        <div style="margin-top: 16px; text-align: right">
+            <el-pagination
+                background
+                small
+                @size-change="handleSizeChange"
+                @current-change="handleCurrentChange"
+                :current-page="params.content.pageNumber"
+                :page-size="params.content.pageSize"
+                layout="total, prev, pager, next, jumper"
+                :total="total"
+            >
+            </el-pagination>
+        </div>
+    </div>
+</template>
+
+<script>
+export default {
+    props: ["data"],
+    data() {
+        return {
+            tableHieght: "calc(100vh - 380px)",
+            tablecols: [],
+            list: [],
+            total: 0,
+            params: {
+                id: 2026052214171102,
+                version: 1,
+                content: {
+                    sc_serviceformid: "",
+                    pageNumber: 1,
+                    pageSize: 20,
+                    where: {
+                        condition: "",
+                    },
+                },
+            },
+            options: [],
+        };
+    },
+    methods: {
+        goWork(scope) {
+            console.log("可跳转至【服务工单】对应数据详情页", scope);
+        },
+        async listData() {
+            this.params.content.sc_serviceformid = this.$route.query.id;
+            const res = await this.$api.requested(this.params);
+            this.list = res.data;
+            this.total = res.total;
+            console.log(this.list);
+        },
+        handleSizeChange(val) {
+            // console.log(`每页 ${val} 条`);
+            this.params.content.pageSize = val;
+            this.listData();
+        },
+        handleCurrentChange(val) {
+            // console.log(`当前页: ${val}`);
+            this.params.content.pageNumber = val;
+            this.listData();
+        },
+        clearData() {
+            this.listData();
+        },
+        queryClick() {
+            this.listData();
+        },
+    },
+    created() {
+        this.listData();
+        console.log(this.$route.name);
+        this.tablecols = this.tool.tabelCol(
+            this.$route.name
+        ).linkedWorkOrderTable.tablecols;
+    },
+};
+</script>
+<style scoped>
+</style>