Merge branch 'master' of http://gitea.zianxin.com/zianxin-tec/biz-pc-cloud

src/views/canteen/canteenSpu/form.vue

@@ -48,7 +48,14 @@
 						<el-input-number v-model="form.marketPrice" :min="0" :precision="2" placeholder="请输入市场价" />
 					</el-form-item>
 				</el-col>
-
+        <el-col :span="12" class="mb20">
+          <el-form-item label="是否显示" prop="status">
+            <el-radio-group v-model="form.isShow">
+              <el-radio :label="item.value" v-for="(item, index) in is_show" border :key="index">{{ item.label }}
+              </el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
 <!--				<el-col :span="14" class="mb20">-->
 <!--					<el-form-item label="库存" prop="stock">-->
 <!--						<el-input-number v-model="form.stock" :min="0" :precision="0" />-->
@@ -97,7 +104,7 @@ const dataFormRef = ref()
 const visible = ref(false)
 const loading = ref(false)
 // 定义字典
-const { spu_status } = useDict("spu_status")
+const { spu_status,is_show } = useDict("spu_status","is_show")
 
 // 提交表单数据
 const form = reactive({
@@ -120,6 +127,7 @@ const form = reactive({
 	virtualSalesCount: "",
 	browseCount: "",
 	deptId: "",
+  isShow: "0",
 })
 
 // 定义校验规则

src/views/canteen/canteenSpu/index.vue

@@ -69,6 +69,11 @@
 						<dict-tag :options="spu_status" :value="scope.row.status" />
 					</template>
 				</el-table-column>
+        <el-table-column prop="isShow" label="是否在移动端显示" show-overflow-tooltip>
+          <template #default="scope">
+            <dict-tag :options="is_show" :value="scope.row.isShow"></dict-tag>
+          </template>
+        </el-table-column>
 				<el-table-column prop="price" label="商品价格" show-overflow-tooltip>
 					<template #default="scope">
 						{{ displayPrice(scope.row.price) }}
@@ -121,7 +126,7 @@ import { getAllSimple as getCanteenCategory } from "/@/api/canteen/canteenCatego
 // 引入组件
 const FormDialog = defineAsyncComponent(() => import("./form.vue"))
 
-const { spu_status } = useDict("spu_status")
+const { spu_status,is_show } = useDict("spu_status","is_show")
 // 定义变量内容
 const formDialogRef = ref()
 // 搜索变量

src/views/flow/create/all.vue

@@ -139,7 +139,7 @@ onMounted(() => {
 			store.step1.remark = data.remark
 			store.step1.groupId = data.groupId
 			store.step1.businessKey = data.businessKey
-      // store.step1.formDetail = data.formDetail
+      store.step1.formDetail = data.formDetail
 			store.setStep2(JSON.parse(data.formItems))
 			step3NodeConfig = JSON.parse(data.process)
 		})

src/views/flow/create/step1.vue

@@ -19,9 +19,9 @@
           <el-form-item :label="$t('flow.businessKey')" prop="businessKey">
             <el-input v-model="form.businessKey" />
           </el-form-item>
-<!--          <el-form-item :label="$t('flow.formDetail')" prop="formDetail">-->
-<!--            <el-input v-model="form.formDetail" :placeholder="$t('flow.formDetailTips')" />-->
-<!--          </el-form-item>-->
+          <el-form-item :label="$t('flow.formDetail')" prop="formDetail">
+            <el-input v-model="form.formDetail" :placeholder="$t('flow.formDetailTips')" />
+          </el-form-item>
 					<el-form-item :label="$t('flow.remark')" prop="remark">
 						<el-input v-model="form.remark" />
 					</el-form-item>

src/views/flow/group/index.vue

@@ -51,11 +51,11 @@
                 {{ row.businessKey }}
               </template>
             </el-table-column>
-<!--            <el-table-column prop="formDetail" :label="$t('flow.formDetail')" show-overflow-tooltip>-->
-<!--              <template #default="{ row }">-->
-<!--                {{ row.formDetail }}-->
-<!--              </template>-->
-<!--            </el-table-column>-->
+            <el-table-column prop="formDetail" :label="$t('flow.formDetail')" show-overflow-tooltip>
+              <template #default="{ row }">
+                {{ row.formDetail }}
+              </template>
+            </el-table-column>
             <el-table-column prop="createTime" :label="$t('flow.createTime')" show-overflow-tooltip></el-table-column>
             <el-table-column prop="rangeShow" :label="$t('flow.scopeOfUse')" show-overflow-tooltip>
               <template #default="{ row }">