11111

controllers/final/final.go

@@ -217,7 +217,8 @@ func SelectWorkList(c *gin.Context) {
 		"room_type":                "`zy_mat_pick_work`.`room_type`",
 		"standard":                 "`quality`.`photograph`",
 		"cycle":                    "`quality`.`days`",
-		"pick_name":                "`quality`.`content`",
+		"pick_name":                "`quality`.`name`",
+		"pick_content":             "`quality`.`content`",
 		"worker_id":                "`zy_mat_pick_work`.`worker_id`",
 		"name":                     "`worker`.`name`",
 		"worker_start_at":          "`zy_mat_pick_work`.`worker_start_at`",
@@ -229,7 +230,7 @@ func SelectWorkList(c *gin.Context) {
 		"item_status":              "`zy_mat_pick_work`.`item_status`",
 		"order_status":             "`zy_mat_pick_work`.`order_status`",
 		"pictures":                 "`zy_mat_pick_work`.`pictures`",
-		"content":                  "`zy_mat_pick_work`.`content`",
+		"msg":                      "`zy_mat_pick_work`.`msg`",
 		"acceptance_failed_remark": "`zy_mat_pick_work`.`acceptance_failed_remark`",
 		"order_acceptance_at":      "`zy_mat_pick_work`.`order_acceptance_at`",
 	}

models/final/final_mat_pick_work.go

@@ -24,7 +24,9 @@ type MatPickWork struct {
 	ManagerStatus     int64  `json:"manager_status"`                                        //经理确认状态
 	WorkerStatus      int64  `json:"worker_status"`                                         //工人确认状态
 	Village           string `json:"village" prop:"select:site.village"`
-	PickName          string `json:"pick_name" prop:"select:qualityItem.content"`     //项目名称
+	PickName          string `json:"pick_name" prop:"select:qualityItem.name"`        //项目名称
+	PickContent       string `json:"pick_content" prop:"select:qualityItem.content"`  //项目内容
+	Msg               string `json:"msg"`                                             //留言
 	Photograph        string `json:"photograph" prop:"select:qualityItem.photograph"` //验收标准
 	Pictures          string `json:"pictures" `                                       //验收样图
 	//ConfirmType       string `json:"confirm_type" prop:"select:qualityItem.confirm_type"`  //确认人

models/final/final_site.go

@@ -157,17 +157,22 @@ func (FinalSite) AddAfter(c *gin.Context, id int64, post map[string]interface{},
 
 	var siteCompletionTime string
 
-	sql := "INSERT INTO zy_mat_pick_work(site_id,pick_id,`name`,pictures,photograph,room_type,`cycle`,example_at) VALUES "
+	sql := "INSERT INTO zy_mat_pick_work(site_id,pick_id,`name`,content,pictures,photograph,room_type,`cycle`,example_at) VALUES "
 	for _, item := range checkList {
 		//fmt.Println(item)
 		domain := "https://image.nczyzs.com/"
 		result := strings.ReplaceAll(utils.ToStr(item["pictures"]), domain, "")
+		// 去除首尾的中括号
+		trimmed := strings.Trim(result, "[]")
+		// 去除所有引号
+		withoutQuotes := strings.ReplaceAll(trimmed, "\"", "")
 
 		sql += "("
 		sql += utils.ToStr(id) + ","
 		sql += utils.ToStr(item["id"]) + ","                //accept_item_id
-		sql += "'" + utils.ToStr(item["content"]) + "',"    //施工名称
-		sql += "'" + result + "',"                          //图片
+		sql += "'" + utils.ToStr(item["name"]) + "',"       //施工名称
+		sql += "'" + utils.ToStr(item["content"]) + "',"    //施工内容
+		sql += "'" + withoutQuotes + "',"                   //图片
 		sql += "'" + utils.ToStr(item["photograph"]) + "'," //施工标准
 		sql += utils.ToStr(item["quality_accept_id"]) + ","
 		sql += utils.ToStr(item["days"]) + ","
@@ -182,8 +187,8 @@ func (FinalSite) AddAfter(c *gin.Context, id int64, post map[string]interface{},
 	if len(sql) > 0 {
 		sql = sql[:len(sql)-1]
 	}
-	_, err = db.InsertRaw(sql, nil)
 	fmt.Println("添加工地", sql)
+	_, err = db.InsertRaw(sql, nil)
 	if err == nil {
 		MatPickWork{}.AddAfter(c, id, data, data)
 	}

models/work_quality_accept_item.go

@@ -9,6 +9,7 @@ import (
 type WorkQualityAcceptItem struct {
 	ID              int64  `json:"id" prop:"add:false"`
 	QualityAcceptId int64  `json:"quality_accept_id" type:"int" prop:"" search:"="`
+	Name            string `json:"name" label:"内容" type:"string" prop:"add edit" search:"like"`
 	Content         string `json:"content" label:"内容" type:"string" prop:"add edit" search:"like"`
 	Photograph      string `json:"photograph" label:"拍照标准" type:"string" prop:"edit" search:"like"`
 	Pictures        string `json:"pictures" label:"拍照标准" type:"string" prop:"edit"`

public/dispatch/index.html

@@ -1 +1 @@
-<!DOCTYPE html><html><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"><meta name="renderer" content="webkit"><meta name="viewport" content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=no"><link rel="icon" href="/dispatch/favicon.ico"><title>无同</title><link href="/dispatch/static/css/app.bfa9bd9b.css" rel="preload" as="style"><link href="/dispatch/static/css/chunk-vendors.288d438d.css" rel="preload" as="style"><link href="/dispatch/static/js/app.02139e59.js" rel="preload" as="script"><link href="/dispatch/static/js/chunk-vendors.97f694a5.js" rel="preload" as="script"><link href="/dispatch/static/css/chunk-vendors.288d438d.css" rel="stylesheet"><link href="/dispatch/static/css/app.bfa9bd9b.css" rel="stylesheet"></head><body><div id="app"></div><script src="/dispatch/static/js/chunk-vendors.97f694a5.js"></script><script src="/dispatch/static/js/app.02139e59.js"></script></body></html>
+<!DOCTYPE html><html><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"><meta name="renderer" content="webkit"><meta name="viewport" content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=no"><link rel="icon" href="/dispatch/favicon.ico"><title>无同</title><link href="/dispatch/static/css/app.bfa9bd9b.css" rel="preload" as="style"><link href="/dispatch/static/css/chunk-vendors.288d438d.css" rel="preload" as="style"><link href="/dispatch/static/js/app.55341cc8.js" rel="preload" as="script"><link href="/dispatch/static/js/chunk-vendors.97f694a5.js" rel="preload" as="script"><link href="/dispatch/static/css/chunk-vendors.288d438d.css" rel="stylesheet"><link href="/dispatch/static/css/app.bfa9bd9b.css" rel="stylesheet"></head><body><div id="app"></div><script src="/dispatch/static/js/chunk-vendors.97f694a5.js"></script><script src="/dispatch/static/js/app.55341cc8.js"></script></body></html>

public/final/index.html

@@ -1 +1 @@
-<!DOCTYPE html><html><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"><meta name="renderer" content="webkit"><meta name="viewport" content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=no"><link rel="icon" href="/final/favicon.ico"><title>无同</title><link href="/final/static/css/app.bfa9bd9b.css" rel="preload" as="style"><link href="/final/static/css/chunk-vendors.987c260b.css" rel="preload" as="style"><link href="/final/static/js/app.6ac93b89.js" rel="preload" as="script"><link href="/final/static/js/chunk-vendors.d5bf7737.js" rel="preload" as="script"><link href="/final/static/css/chunk-vendors.987c260b.css" rel="stylesheet"><link href="/final/static/css/app.bfa9bd9b.css" rel="stylesheet"></head><body><div id="app"></div><script src="/final/static/js/chunk-vendors.d5bf7737.js"></script><script src="/final/static/js/app.6ac93b89.js"></script></body></html>
+<!DOCTYPE html><html><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"><meta name="renderer" content="webkit"><meta name="viewport" content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=no"><link rel="icon" href="/final/favicon.ico"><title>无同</title><link href="/final/static/css/app.bfa9bd9b.css" rel="preload" as="style"><link href="/final/static/css/chunk-vendors.987c260b.css" rel="preload" as="style"><link href="/final/static/js/app.295ad3b0.js" rel="preload" as="script"><link href="/final/static/js/chunk-vendors.d5bf7737.js" rel="preload" as="script"><link href="/final/static/css/chunk-vendors.987c260b.css" rel="stylesheet"><link href="/final/static/css/app.bfa9bd9b.css" rel="stylesheet"></head><body><div id="app"></div><script src="/final/static/js/chunk-vendors.d5bf7737.js"></script><script src="/final/static/js/app.295ad3b0.js"></script></body></html>

views/admin/src/components/Upload/SingleImage.vue

@@ -71,8 +71,8 @@ export default {
       this.emitInput(this.$store.getters.setting.img_host + res.key)
     },
     beforeUpload(file) {
-      if (file.size / 1024 / 1024 > 5) {
-        this.$message.error('上传图片大小不能超过 5MB!')
+      if (file.size / 1024 / 1024 > 30) {
+        this.$message.error('上传图片大小不能超过 30MB!')
         return false
       }
       let fileType = ''

views/admin/src/components/Upload/upImageWall.vue

@@ -90,8 +90,8 @@ export default {
   },
   methods: {
     beforeUpload(file) {
-      if (file.size / 1024 / 1024 > 5) {
-        this.$message.error('上传图片大小不能超过 5MB!')
+      if (file.size / 1024 / 1024 > 30) {
+        this.$message.error('上传图片大小不能超过 30MB!')
         return false
       }
       let fileType = ''

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

@@ -8,6 +8,11 @@ export default {
     del: '/work/workqualityacceptitem/del',
     order: '/work/workqualityacceptitem/order',
     fields: [{
+        name: 'name',
+        type: 'textarea',
+        label: '名称',
+        required: true
+    },{
         name: 'content',
         type: 'textarea',
         label: '内容',
@@ -18,15 +23,16 @@ export default {
         label: '拍照标准'
     }, {
       name: "pictures",
-      label: "图片",
-      type: "image",
+      label: "参考图片",
+      type: "images",
+      accept: ".jpg,.jpeg,.png,.gif,.bmp,.webp",
       table: {
         width: "50px",
         height: "50px",
       }
-    },, {
+    }, {
         name: 'days',
-        label: '整改天数',
+        label: '施工天数',
         type: 'number'
     }, {
         name: 'state',

views/home/src/projects/dispatch/views/worksite/Detail.vue

@@ -104,7 +104,7 @@
                     <!-- 这里是分类 -->
                     <div class="px-4 bg-white py-2 text-sm">
                       <div class="pb-2 flex items-center justify-between border-b mb-2" style="font-weight: bold">
-                        <span class="font-bold" style="width: 85%;">{{ Key2+1 }}. {{ item.pick_name }}</span>
+                        <span class="font-bold" style="width: 85%;">{{ Key2+1 }}. {{ item.pick_name }} - {{ item.pick_content }}</span>
                         <van-tag mark :color="getTagType(item.item_status)">{{ itemStatusMenu[item.item_status] }}</van-tag>
                       </div>
                       <div class="pb-1"><span class="font-semibold">标准：</span>{{ item.standard }}</div>

views/home/src/projects/final/views/worksite/Detail.vue

@@ -104,7 +104,7 @@
                     <!-- 这里是分类 -->
                     <div class="px-4 bg-white py-2 text-sm">
                       <div class="pb-2 flex items-center justify-between border-b mb-2" style="font-weight: bold">
-                        <span class="font-bold" style="width: 85%;">{{ Key2+1 }}. {{ item.pick_name }}</span>
+                        <span class="font-bold" style="width: 85%;">{{ Key2+1 }}. {{ item.pick_name }} - {{ item.pick_content }}</span>
                         <van-tag mark :color="getTagType(item.item_status)">{{ itemStatusMenu[item.item_status] }}</van-tag>
                       </div>
                       <div class="pb-1"><span class="font-semibold">标准：</span>{{ item.standard }}</div>

views/home/src/projects/worker/components/UploadList.vue

@@ -144,10 +144,10 @@ export default {
           return false;
         }
       } else {
-        if (file.size / 1024 / 1024 > 5) {
+        if (file.size / 1024 / 1024 > 30) {
           Notify({
             type: "danger",
-            message: "上传图片大小不能超过 5MB!",
+            message: "上传图片大小不能超过 30MB!",
           });
           return false;
         }