1111

controllers/admin/material/pick/pick.go

@@ -142,16 +142,17 @@ func PickList(c *gin.Context) {
 
 		for _, sub := range v.Items {
 			pkgItemList = append(pkgItemList, map[string]interface{}{
-				"id":          sub.ID,
-				"room_type":   sub.RoomType,
-				"pick_name":   sub.PickName,
-				"photograph":  sub.Photograph,
-				"cycle":       sub.Cycle,
-				"worker_id":   sub.WorkerId,
-				"worker_name": sub.WorkerName,
-				"pictures":    sub.Pictures,
-				"rowspan":     0,
-				"colspan":     0,
+				"id":           sub.ID,
+				"room_type":    sub.RoomType,
+				"pick_name":    sub.PickName,
+				"pick_content": sub.PickContent,
+				"photograph":   sub.Photograph,
+				"cycle":        sub.Cycle,
+				"worker_id":    sub.WorkerId,
+				"worker_name":  sub.WorkerName,
+				"pictures":     sub.Pictures,
+				"rowspan":      0,
+				"colspan":      0,
 				//"item_type":      sub.ItemType,
 				//"item_type_name": sub.ItemTypeName,
 			})

models/final/final_site.go

@@ -146,7 +146,13 @@ func (FinalSite) AddAfter(c *gin.Context, id int64, post map[string]interface{},
 	//	"pkg_id": post["pkg_id"],
 	//}, map[string]interface{}{}, &checkList)
 
-	checkList, err := db.GetModelMap(db.Type(models.WorkQualityAcceptItem{}), map[string]interface{}{"state": 1}, nil)
+	qualityAccept, err := db.GetModelMap(db.Type(models.WorkQualityAccept{}), map[string]interface{}{"state": 1}, nil)
+	qualityAcceptIds := []int{}
+	for _, m := range qualityAccept {
+		qualityAcceptIds = append(qualityAcceptIds, gconv.Int(m["id"]))
+	}
+
+	checkList, err := db.GetModelMap(db.Type(models.WorkQualityAcceptItem{}), map[string]interface{}{"quality_accept_id in": qualityAcceptIds, "state": 1}, nil)
 	if err != nil {
 		errors.New("施工节点未找到")
 		return

services/form/form.go

@@ -311,13 +311,14 @@ type MaterialPickAdd struct {
 }
 
 type WorkItemAdd struct {
-	SitId      int    `json:"site_id" label:"名称" binding:"required"`
-	PickName   string `json:"pick_name" label:"名称" binding:"required"`
-	RoomType   int    `json:"room_type" label:"房间类型" binding:"gte=0"`
-	Photograph string `json:"photograph" label:"标准"`
-	Cycle      int    `json:"cycle" label:"工期"`
-	WorkerId   int    `json:"worker_id"`
-	Pictures   string `json:"pictures" label:"请上传图片" binding:"required"`
+	SitId       int    `json:"site_id" label:"id" binding:"required"`
+	PickName    string `json:"pick_name" label:"名称" binding:"required"`
+	PickContent string `json:"pick_content" label:"内容" binding:"required"`
+	RoomType    int    `json:"room_type" label:"房间类型" binding:"gte=0"`
+	Photograph  string `json:"photograph" label:"标准"`
+	Cycle       int    `json:"cycle" label:"工期"`
+	WorkerId    int    `json:"worker_id"`
+	Pictures    string `json:"pictures" label:"请上传图片" binding:"required"`
 	//ConfirmType string `json:"confirm_type" label:"确认人"`
 	//Level       int    `json:"level" label:"属性"`
 }

views/admin/src/data/work/workqualityacceptitem.js

@@ -30,7 +30,8 @@ export default {
         width: "50px",
         height: "50px",
       }
-    }, {
+    }
+    , {
         name: 'days',
         label: '施工天数',
         type: 'number'

views/admin/src/views/material/pick/Pick.vue

@@ -18,7 +18,9 @@
             <span v-else class="text-red-600">{{ scope.row.pick_name }}</span>
           </template>
         </el-table-column>
-        <el-table-column prop="photograph" label="标准" align="center" min-width="10%" />
+        <el-table-column prop="pick_content" label="内容" align="center" min-width="10%" />
+
+         <el-table-column prop="photograph" label="标准" align="center" min-width="10%" />
 
         <el-table-column prop="pictures" label="样图" align="center" min-width="10%" > 
             <template slot-scope="scope">
@@ -53,8 +55,11 @@
             <el-option v-for="(item, index) in workQualityaccepts" :key="index" :label="item.name" :value="item.id" />
           </el-select>
         </el-form-item>
-        <el-form-item label="二级目录" prop="pick_name" >
-          <el-input v-model="pickForm.pick_name" disabled placeholder="项目名称" />
+        <el-form-item label="名称" prop="pick_name" >
+          <el-input v-model="pickForm.pick_name" disabled placeholder="名称" />
+        </el-form-item>
+        <el-form-item label="内容" prop="pick_content" >
+          <el-input v-model="pickForm.pick_content" disabled placeholder="内容" />
         </el-form-item>
         <!-- <el-form-item label="确认人">
           <el-radio-group v-model="pickForm.confirm_type">