4 днів тому · 81804a47fe
--- a/deploy.sh
+++ b/deploy.sh
@@ -5,8 +5,8 @@ CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -ldflags="-s -w" main.go
 
				 
			
 
				 echo "Step 2: Uploading ..."
			
 
				 # scp main root@ovenx.cn:/www/gin-blog/main
			
 
				-rsync -zp --progress main  root@106.52.207.148:/www/wwwroot/pm/main
			
 
				+rsync -zp --progress main  root@159.75.113.190:/www/wwwroot/pm/main
			
 
				 
			
 
				 echo "Step 3: Restarting ..."
			
 
				-ssh root@106.52.207.148 "systemctl restart pm"
			
 
				+ssh root@159.75.113.190 "systemctl restart pm"
			
 
				 echo "succesde  ..."
			
--- a/models/final/final_site.go
+++ b/models/final/final_site.go
@@ -74,7 +74,7 @@ func (model FinalSite) ListPrivilege(c *gin.Context, data map[string]interface{}
 
				 		adminID := s.Param(c.GetInt("adminID"))
			
 
				 		where := fmt.Sprintf("`%s`.`manager_id` = %s OR `%s`.`project_leader_id` = %s OR `%s`.`created_id` = %s", model.TableName(), adminID, model.TableName(), adminID, model.TableName(), adminID)
			
 
				 
			
 
				-		if admin.CheckAuth([]string{"final:verify"}, c.GetInt("adminID")) {
			
 
				+		if admin.CheckAuth([]string{"work:worksite:view"}, c.GetInt("adminID")) {
			
 
				 			where = fmt.Sprintf("%s OR FIND_IN_SET(`%s`.`shop_id`, %s)", where, model.TableName(), "0")
			
 
				 		}
			
 
				 		s.Where = append(s.Where, fmt.Sprintf("(%s)", where))
			
@@ -335,9 +335,8 @@ func (model FinalSiteMobile) ListPrivilege(c *gin.Context, data map[string]inter
 
				 	}
			
 
				 	if admin.CheckAuth([]string{"work:worksite:view"}, c.GetInt("adminID")) {
			
 
				 		s.Where = append(s.Where, fmt.Sprintf("(`manager`.`audit_id` = %s OR `manager`.`audit_id` = %s)", s.Param(c.GetInt("adminID")), s.Param(0)))
			
 
				+		fmt.Println(":", c.GetInt("adminID"))
			
 
				 		fmt.Println("我有权限")
			
 
				-	} else {
			
 
				-		s.Where = append(s.Where, fmt.Sprintf("(`zy_final_site`.`manager_id` = %s)", s.Param(c.GetInt("adminID"))))
			
 
				 	}
			
 
				 	return model.FinalSite.ListPrivilege(c, data, s)
			
 
				 }
			
--- a/public/admin/index.html
+++ b/public/admin/index.html
--- a/public/admin/static/js/chunk-09887dd6.6902151a.js
+++ b/public/admin/static/js/chunk-09887dd6.6902151a.js
--- a/public/admin/static/js/chunk-09887dd6.b1814331.js
+++ b/public/admin/static/js/chunk-09887dd6.b1814331.js
--- a/public/admin/static/js/chunk-09c5235e.520ad29d.js
+++ b/public/admin/static/js/chunk-09c5235e.520ad29d.js
--- a/public/admin/static/js/chunk-09c5235e.d76b54bc.js
+++ b/public/admin/static/js/chunk-09c5235e.d76b54bc.js
--- a/public/admin/static/js/chunk-1eb0bf4c.92c55f26.js
+++ b/public/admin/static/js/chunk-1eb0bf4c.92c55f26.js
--- a/public/admin/static/js/chunk-1eb0bf4c.9f98e849.js
+++ b/public/admin/static/js/chunk-1eb0bf4c.9f98e849.js
--- a/public/admin/static/js/chunk-5b9fcef3.125ebba7.js
+++ b/public/admin/static/js/chunk-5b9fcef3.125ebba7.js
--- a/public/admin/static/js/chunk-5b9fcef3.1d7b6a25.js
+++ b/public/admin/static/js/chunk-5b9fcef3.1d7b6a25.js
--- a/public/admin/static/js/chunk-6e3c02ab.1f7bdc7d.js
+++ b/public/admin/static/js/chunk-6e3c02ab.1f7bdc7d.js
--- a/public/admin/static/js/chunk-6e3c02ab.63d6bfe9.js
+++ b/public/admin/static/js/chunk-6e3c02ab.63d6bfe9.js
--- a/public/admin/static/js/chunk-b40600b6.5ff421c2.js
+++ b/public/admin/static/js/chunk-b40600b6.5ff421c2.js
--- a/public/admin/static/js/chunk-b40600b6.e50dcdb0.js
+++ b/public/admin/static/js/chunk-b40600b6.e50dcdb0.js
--- a/public/admin/static/js/chunk-fd2a6af6.ab2279d3.js
+++ b/public/admin/static/js/chunk-fd2a6af6.ab2279d3.js
--- a/public/admin/static/js/chunk-fd2a6af6.be7049c3.js
+++ b/public/admin/static/js/chunk-fd2a6af6.be7049c3.js
--- a/public/final/index.html
+++ b/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.5882cd7e.css" rel="preload" as="style"><link href="/final/static/js/app.7a577d57.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.5882cd7e.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.7a577d57.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.e022cfde.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.e022cfde.js"></script></body></html>
			
--- a/public/final/static/css/chunk-2b08471c.5555713c.css
+++ b/public/final/static/css/chunk-2b08471c.5555713c.css
--- a/public/final/static/css/chunk-vendors.5882cd7e.css
+++ b/public/final/static/css/chunk-vendors.5882cd7e.css
--- a/public/final/static/css/chunk-vendors.987c260b.css
+++ b/public/final/static/css/chunk-vendors.987c260b.css
--- a/public/final/static/js/app.e022cfde.js
+++ b/public/final/static/js/app.e022cfde.js
--- a/public/final/static/js/chunk-017b5308.0b1be784.js
+++ b/public/final/static/js/chunk-017b5308.0b1be784.js
--- a/public/final/static/js/chunk-0eee12ff.bc69b463.js
+++ b/public/final/static/js/chunk-0eee12ff.bc69b463.js
--- a/public/final/static/js/chunk-10fc7546.9b6b77b9.js
+++ b/public/final/static/js/chunk-10fc7546.9b6b77b9.js
--- a/public/final/static/js/chunk-18d65f86.a7b6d90b.js
+++ b/public/final/static/js/chunk-18d65f86.a7b6d90b.js
--- a/public/final/static/js/chunk-1d2a19b0.033f27fc.js
+++ b/public/final/static/js/chunk-1d2a19b0.033f27fc.js
--- a/public/final/static/js/chunk-210ed456.adb9dd49.js
+++ b/public/final/static/js/chunk-210ed456.adb9dd49.js
--- a/public/final/static/js/chunk-25b8fa37.0491ed80.js
+++ b/public/final/static/js/chunk-25b8fa37.0491ed80.js
--- a/public/final/static/js/chunk-2750f497.94063e66.js
+++ b/public/final/static/js/chunk-2750f497.94063e66.js
--- a/public/final/static/js/chunk-2b08471c.787f5133.js
+++ b/public/final/static/js/chunk-2b08471c.787f5133.js
--- a/public/final/static/js/chunk-2d0c190b.e26c5ff0.js
+++ b/public/final/static/js/chunk-2d0c190b.e26c5ff0.js
--- a/public/final/static/js/chunk-2d0cb684.2471d9fe.js
+++ b/public/final/static/js/chunk-2d0cb684.2471d9fe.js
--- a/public/final/static/js/chunk-2d222948.1eef153a.js
+++ b/public/final/static/js/chunk-2d222948.1eef153a.js
--- a/public/final/static/js/chunk-2d229882.2b5f40c6.js
+++ b/public/final/static/js/chunk-2d229882.2b5f40c6.js
--- a/public/final/static/js/chunk-2d22c700.63d4a821.js
+++ b/public/final/static/js/chunk-2d22c700.63d4a821.js
--- a/public/final/static/js/chunk-370226ef.a328b8b9.js
+++ b/public/final/static/js/chunk-370226ef.a328b8b9.js
--- a/public/final/static/js/chunk-385c1232.a2c13692.js
+++ b/public/final/static/js/chunk-385c1232.a2c13692.js
--- a/public/final/static/js/chunk-3b409886.bdee8403.js
+++ b/public/final/static/js/chunk-3b409886.bdee8403.js
--- a/public/final/static/js/chunk-3d0adc22.6a73ee3c.js
+++ b/public/final/static/js/chunk-3d0adc22.6a73ee3c.js
--- a/public/final/static/js/chunk-4795ad6a.6c8d1b38.js
+++ b/public/final/static/js/chunk-4795ad6a.6c8d1b38.js
--- a/public/final/static/js/chunk-5051ebbe.f51a1c27.js
+++ b/public/final/static/js/chunk-5051ebbe.f51a1c27.js
--- a/public/final/static/js/chunk-52ca2540.985806d0.js
+++ b/public/final/static/js/chunk-52ca2540.985806d0.js
--- a/public/final/static/js/chunk-65449529.1d30143e.js
+++ b/public/final/static/js/chunk-65449529.1d30143e.js
--- a/public/final/static/js/chunk-70b9cbbe.b00f3f53.js
+++ b/public/final/static/js/chunk-70b9cbbe.b00f3f53.js
--- a/public/final/static/js/chunk-7709c110.5baeefbe.js
+++ b/public/final/static/js/chunk-7709c110.5baeefbe.js
--- a/public/final/static/js/chunk-958e7c32.c1165b09.js
+++ b/public/final/static/js/chunk-958e7c32.c1165b09.js
--- a/public/final/static/js/chunk-ab7ccd9c.fe121e46.js
+++ b/public/final/static/js/chunk-ab7ccd9c.fe121e46.js
--- a/public/final/static/js/chunk-acb44fe2.3c5ed07b.js
+++ b/public/final/static/js/chunk-acb44fe2.3c5ed07b.js
--- a/public/final/static/js/chunk-b3b16a94.33a297ab.js
+++ b/public/final/static/js/chunk-b3b16a94.33a297ab.js
--- a/public/final/static/js/chunk-caab5d34.d361da52.js
+++ b/public/final/static/js/chunk-caab5d34.d361da52.js
--- a/public/final/static/js/chunk-ce808440.434e924b.js
+++ b/public/final/static/js/chunk-ce808440.434e924b.js
--- a/public/final/static/js/chunk-e104970a.714a1ac7.js
+++ b/public/final/static/js/chunk-e104970a.714a1ac7.js
--- a/public/final/static/js/chunk-e8851a3e.bea2d539.js
+++ b/public/final/static/js/chunk-e8851a3e.bea2d539.js
--- a/public/final/static/js/chunk-ef630e42.3093cfb7.js
+++ b/public/final/static/js/chunk-ef630e42.3093cfb7.js
--- a/public/final/static/js/chunk-f75d4388.611e5124.js
+++ b/public/final/static/js/chunk-f75d4388.611e5124.js
--- a/public/final/static/js/chunk-f78198a6.b55e0aab.js
+++ b/public/final/static/js/chunk-f78198a6.b55e0aab.js
--- a/public/final/static/js/chunk-f8e08c60.61ccbaf8.js
+++ b/public/final/static/js/chunk-f8e08c60.61ccbaf8.js
--- a/routers/final.go
+++ b/routers/final.go
@@ -192,5 +192,8 @@ func InitFinalRouters(r *gin.Engine, router *gin.RouterGroup) {
 
				 
			
 
				 		//延期申请
			
 
				 		router.PUT("/matpickwork/extensionRequest/:work_id", worker.ExtensionRequest)
			
 
				+
			
 
				+		//留言
			
 
				+		router.PUT("/matpickwork/addMsg/:work_id", worker.AddMsg)
			
 
				 	}
			
 
				 }
			
--- a/views/admin/src/data/final/finalsite.js
+++ b/views/admin/src/data/final/finalsite.js
@@ -349,7 +349,7 @@ export default {
 
				     },
			
 
				     {
			
 
				       name: "施工节点",
			
 
				-      require: (data) => checkPermission(["final:verify:audit"]),
			
 
				+      require: (data) => checkPermission(["work:worknode:view"]),
			
 
				       handle(data, context) {
			
 
				         router.push({ path: "/final/picks", query: { site_id: data?.id } });
			
 
				       },
			
--- a/views/admin/src/layout/components/AppMain.vue
+++ b/views/admin/src/layout/components/AppMain.vue
@@ -5,7 +5,7 @@
 
				         <router-view :key="key" />
			
 
				       </keep-alive>
			
 
				     </transition>
			
 
				-    <footer v-show="!('footer' in $route.meta) || $route.meta.footer" class="text-gray-400 text-center py-4 text-sm">志远后台管理系统@2021</footer>
			
 
				+    <footer v-show="!('footer' in $route.meta) || $route.meta.footer" class="text-gray-400 text-center py-4 text-sm">無同后台管理系统@2021</footer>
			
 
				   </section>
			
 
				 </template>
			
 
				 
			
--- a/views/admin/src/layout/components/Sidebar/Logo.vue
+++ b/views/admin/src/layout/components/Sidebar/Logo.vue
@@ -25,7 +25,7 @@ export default {
 
				   data() {
			
 
				     return {
			
 
				       title: '项目管理',
			
 
				-      titleShort: '志远',
			
 
				+      titleShort: '無同',
			
 
				       logo: ''
			
 
				     }
			
 
				   }
			
--- a/views/admin/src/router/index.js
+++ b/views/admin/src/router/index.js
@@ -130,7 +130,7 @@ export const asyncRoutes = [
 
				     meta: {
			
 
				       title: "项目管理",
			
 
				       icon: "el-icon-menu",
			
 
				-      auth: ["final"],
			
 
				+      auth: ["project:manager"],
			
 
				     },
			
 
				     children: [
			
 
				       // {
			
@@ -171,7 +171,7 @@ export const asyncRoutes = [
 
				         name: "FinalSite",
			
 
				         meta: {
			
 
				           title: "工地列表",
			
 
				-          auth: ["final:finalsite:view"],
			
 
				+          auth: ["work:worksite:view"],
			
 
				           footer: false,
			
 
				         },
			
 
				         noCache: true,
			
@@ -182,7 +182,7 @@ export const asyncRoutes = [
 
				         name: "finalstatist",
			
 
				         meta: {
			
 
				           title: "工地统计",
			
 
				-          auth: ["final:finalsite:view"],
			
 
				+          auth: ["work:worksite:view"],
			
 
				           footer: false,
			
 
				         },
			
 
				       },
			
--- a/views/admin/src/views/budget2/pkg2023/agreement.vue
+++ b/views/admin/src/views/budget2/pkg2023/agreement.vue
@@ -19,7 +19,7 @@
 
				         <tr height="51" style='height:38.25pt;mso-height-source:userset;mso-height-alt:765;'>
			
 
				             <td class="xl74" height="51" width="1084.47" colspan="16"
			
 
				                 style='height:38.25pt;width:813.35pt;border-right:.5pt solid windowtext;border-bottom:.5pt solid windowtext;'>
			
 
				-                2024年志远{{ types[value.result.room_data.pkg.type] }}工程预算书（南昌）
			
 
				+                2024年無同{{ types[value.result.room_data.pkg.type] }}工程预算书（南昌）
			
 
				             </td>
			
 
				         </tr>
			
 
				         <tr height="51" style='height:38.25pt;mso-height-source:userset;mso-height-alt:765;'>
			
@@ -137,7 +137,7 @@
 
				             <td class="xl79">{{ value.result.build_budget.contract.pkg_price }}</td>
			
 
				             <td class="xl122" colspan="2" style='border-right:none;border-bottom:.5pt solid windowtext;'>{{ value.result.build_budget.contract.pkg_price }}</td>
			
 
				             <td class="xl89" colspan="6"
			
 
				-                style='border-right:.5pt solid windowtext;border-bottom:.5pt solid windowtext;'>内容详见《2024年志远{{ types[value.result.room_data.pkg.type] }}产品说明表》</td>
			
 
				+                style='border-right:.5pt solid windowtext;border-bottom:.5pt solid windowtext;'>内容详见《2024年無同{{ types[value.result.room_data.pkg.type] }}产品说明表》</td>
			
 
				         </tr>
			
 
				         <tr height="49.33" style='height:37.00pt;mso-height-source:userset;mso-height-alt:740;'>
			
 
				             <td class="xl82" height="49.33" colspan="2"
			
@@ -533,7 +533,7 @@
 
				         <tr height="51" style='height:38.25pt;mso-height-source:userset;mso-height-alt:765;'>
			
 
				             <td class="xl78" height="51" colspan="16"
			
 
				                 style='height:38.25pt;border-right:.5pt solid windowtext;border-bottom:.5pt solid windowtext;' x:str>
			
 
				-                2024年志远{{ types[value.result.room_data.pkg.type] }}主材减项</td>
			
 
				+                2024年無同{{ types[value.result.room_data.pkg.type] }}主材减项</td>
			
 
				         </tr>
			
 
				         <tr height="51" style='height:38.25pt;mso-height-source:userset;mso-height-alt:765;'>
			
 
				             <td class="xl78" height="51" style='height:38.25pt;' x:str>序号</td>
			
@@ -1785,7 +1785,7 @@ br {
 
				     mso-font-charset: 134;
			
 
				     border: none;
			
 
				     mso-protection: locked visible;
			
 
				-    mso-style-name: "常规_2011年志远装饰四房预算范本1";
			
 
				+    mso-style-name: "常规_2011年無同装饰四房预算范本1";
			
 
				 }
			
 
				 
			
 
				 td {
			
--- a/views/admin/src/views/budget2/pkg2023/contract.vue
+++ b/views/admin/src/views/budget2/pkg2023/contract.vue
@@ -181,7 +181,7 @@ export default {
 
				                 number: 1,
			
 
				                 price: v.build_budget.contract.pkg_price,
			
 
				                 total: v.build_budget.contract.pkg_price,
			
 
				-                remark: "内容详见《2024年志远" + pkgname + "产品说明表》",
			
 
				+                remark: "内容详见《2024年無同" + pkgname + "产品说明表》",
			
 
				             })
			
 
				             v.build_budget.contract.toilet_price.forEach(price => {
			
 
				                 tableData.push({
			
@@ -373,7 +373,7 @@ export default {
 
				             })
			
 
				             mergeCells.push({ row: tableData.length, col: 0, rowspan: 1, colspan: 7 })
			
 
				             tableData.push({
			
 
				-                name: "2024年志远" + pkgname + "主材减项",
			
 
				+                name: "2024年無同" + pkgname + "主材减项",
			
 
				                 type_: 'deduction_item_title',
			
 
				             })
			
 
				             v.build_budget.material_deduction_items.forEach(item => {
			
--- a/views/admin/src/views/budget2/pkg2023/quote.vue
+++ b/views/admin/src/views/budget2/pkg2023/quote.vue
--- a/views/admin/src/views/screen/index.vue
+++ b/views/admin/src/views/screen/index.vue
@@ -70,7 +70,7 @@
 
				         </div>
			
 
				       </el-col>
			
 
				       <el-col :span="8" style="height: 100%">
			
 
				-        <div class="big-title">志远工程管控系统</div>
			
 
				+        <div class="big-title">無同工程管控系统</div>
			
 
				         <OlderMapChart :value="statistMap" style="height: 85%" />
			
 
				       </el-col>
			
 
				       <el-col :span="7" style="height: 100%">
			
--- a/views/admin/src/views/screen/index2.vue
+++ b/views/admin/src/views/screen/index2.vue
@@ -3,7 +3,7 @@
 
				     <div class="flex flex-col" style="height: 100%">
			
 
				       <div class="h-16 shadow-lg flex items-center px-10 justify-between"
			
 
				         style="background-color: rgba(51, 65, 85, 0.5)">
			
 
				-        <div class="big-title">志远装饰集团售后管理系统</div>
			
 
				+        <div class="big-title">無同装饰集团售后管理系统</div>
			
 
				         <div class="time-title">
			
 
				           {{ time.getFullYear() }}年{{ time.getMonth() + 1 }}月{{
			
 
				             time.getDate()
			
--- a/views/home/package.json
+++ b/views/home/package.json
@@ -7,16 +7,14 @@
 
				     "build": "vue-cli-service build",
			
 
				     "lint": "vue-cli-service lint",
			
 
				 
			
 
				-    
			
 
				     "serve:final": "cross-env PROJECT=final vue-cli-service serve src/projects/final/main.js",
			
 
				     "build:final": "cross-env PROJECT=final vue-cli-service build src/projects/final/main.js",
			
 
				 
			
 
				-    "serve:worker": "cross-env PROJECT=worker vue-cli-service serve src/projects/worker/main.js",
			
 
				-    "build:worker": "cross-env PROJECT=worker vue-cli-service build src/projects/worker/main.js",
			
 
				-
			
 
				     "serve:dispatch": "cross-env PROJECT=dispatch vue-cli-service serve src/projects/dispatch/main.js",
			
 
				     "build:dispatch": "cross-env PROJECT=dispatch vue-cli-service build src/projects/dispatch/main.js",
			
 
				 
			
 
				+    "serve:worker": "cross-env PROJECT=worker vue-cli-service serve src/projects/worker/main.js",
			
 
				+    "build:worker": "cross-env PROJECT=worker vue-cli-service build src/projects/worker/main.js",
			
 
				 
			
 
				     "serve:servicer": "cross-env PROJECT=aftersale/servicer vue-cli-service serve src/projects/aftersale/servicer/main.js",
			
 
				     "build:servicer": "cross-env PROJECT=aftersale/servicer vue-cli-service build src/projects/aftersale/servicer/main.js",
			
--- a/views/home/src/projects/deliver/views/login/index.vue
+++ b/views/home/src/projects/deliver/views/login/index.vue
@@ -2,7 +2,7 @@
 
				   <div class="pt-28 p-4">
			
 
				     <div class="text-center">
			
 
				       <van-image width="6rem" height="6rem" :src="this.$settings.logo" />
			
 
				-      <p class="mt-5 mb-12 text-2xl">志远交付平台</p>
			
 
				+      <p class="mt-5 mb-12 text-2xl">無同交付平台</p>
			
 
				     </div>
			
 
				     <div v-if="showLoginType" class="text-center">
			
 
				       <van-button
			
--- a/views/home/src/projects/dispatch/settings.js
+++ b/views/home/src/projects/dispatch/settings.js
@@ -1,7 +1,7 @@
 
				 module.exports = {
			
 
				-  title: '志远派单',
			
 
				-  footer: '@2022 志远派单系统',
			
 
				-  logo: 'https://image.nczyzs.com/zhiyuan-logo.png',
			
 
				+  title: '无同',
			
 
				+  footer: '@2022 工人标准化系统',
			
 
				+  logo: 'https://image.nczyzs.com/17537730014078257006196893495.png',
			
 
				   imageDomain: 'https://image.nczyzs.com/',
			
 
				   validCss: [
			
 
				     'bg-gray-500',
			
--- a/views/home/src/projects/final/api/admin.js
+++ b/views/home/src/projects/final/api/admin.js
@@ -808,4 +808,11 @@ export function saveExtensionRequestHandle(id, data) {
 
				     method: 'put',
			
 
				     data
			
 
				   })
			
 
				+}
			
 
				+export function addMsg(id,data) {
			
 
				+  return request({
			
 
				+    url: `matpickwork/addMsg/${id}`,
			
 
				+    method: 'put',
			
 
				+    data
			
 
				+  })
			
 
				 }
			
--- a/views/home/src/projects/final/settings.js
+++ b/views/home/src/projects/final/settings.js
@@ -1,7 +1,7 @@
 
				 module.exports = {
			
 
				-  title: '志远',
			
 
				-  footer: '@2021 志远工人标准化系统',
			
 
				-  logo: 'https://image.nczyzs.com/zhiyuan-logo.png',
			
 
				+  title: '无同',
			
 
				+  footer: '@2021 工人标准化系统',
			
 
				+  logo: 'https://image.nczyzs.com/17537730014078257006196893495.png',
			
 
				   imageDomain: 'https://image.nczyzs.com/',
			
 
				   validCss: [
			
 
				     'bg-gray-500',
			
--- a/views/home/src/projects/final/views/login/index.vue
+++ b/views/home/src/projects/final/views/login/index.vue
@@ -2,7 +2,7 @@
 
				   <div class="pt-28 p-4">
			
 
				     <div class="text-center">
			
 
				       <van-image width="6rem" height="6rem" :src="this.$settings.logo" />
			
 
				-      <p class="mt-5 mb-12 text-2xl">志远工人标准化平台</p>
			
 
				+      <p class="mt-5 mb-12 text-2xl">無同工人标准化平台</p>
			
 
				     </div>
			
 
				     <div v-if="showLoginType" class="text-center">
			
 
				       <van-button
			
--- a/views/home/src/projects/final/views/worksite/Detail.vue
+++ b/views/home/src/projects/final/views/worksite/Detail.vue
@@ -258,6 +258,7 @@
 
				                         <van-button class="ml-2" type="primary" size="small" v-if="item.item_status == 0" @click="confirmSite(item.pick_name,item.id)">完工提交</van-button>
			
 
				                         <van-button class="ml-2" type="primary" size="small" v-if="item.item_status == 3" @click="confirmSite(item.pick_name,item.id)">重新提交</van-button>
			
 
				                         <van-button class="ml-2" size="small" type="danger"  v-if="item.worker_id == 0"  :to="`/table/${worksite.id}/worker?work_id=${item.id}`">立即派单</van-button>
			
 
				+                        <van-button class="ml-2" type="primary" size="small"  @click="confirmMsg(item.pick_name,item.id)">留言</van-button>
			
 
				                         <!-- <van-button class="ml-2" type="danger" size="small" v-if="item.manager_status == 0" @click="extensionRequest(item.pick_name,item.id)">延期申请</van-button> -->
			
 
				                       </div>
			
 
				                     </div>
			
@@ -303,6 +304,19 @@
 
				       >
			
 
				     </van-popup>
			
 
				 
			
 
				+    <van-popup v-model="msgShow" closeable round position="bottom">
			
 
				+      <div class="mt-2 text-center leading-10 text-lg">留言</div>
			
 
				+      <van-field
			
 
				+        v-model="tableForm.content"
			
 
				+        autosize
			
 
				+        type="textarea"
			
 
				+        placeholder="请输入留言内容"
			
 
				+      />
			
 
				+      <van-button size="large" type="info" @click="checkMsg"
			
 
				+        >提交</van-button
			
 
				+      >
			
 
				+    </van-popup>
			
 
				+
			
 
				  <!-- 延期申请弹窗 -->
			
 
				     <van-popup v-model="addextensionRequestShow" closeable position="bottom">
			
 
				       <div class="text-center leading-10 text-lg">{{ extensionRequestTitle }}</div>
			
@@ -355,6 +369,7 @@ import {
 
				   getFinalSiteTable,
			
 
				   complateMatPickWorker,
			
 
				   checkTable,
			
 
				+  addMsg,
			
 
				   checkTableFailed,
			
 
				   saveExtensionRequestHandle
			
 
				 } from "@/api/admin.js";
			
@@ -387,6 +402,7 @@ export default {
 
				       addCheckShow: false,
			
 
				       addextensionRequestShow:false,
			
 
				       selectTable: {},
			
 
				+      msgShow:false,
			
 
				       siteStartTime:0,//开工时间
			
 
				       confirmSiteTitle:'确认',
			
 
				       extensionRequestTitle:'确认',
			
@@ -547,6 +563,11 @@ export default {
 
				       this.pick_id = pickId
			
 
				       this.extensionRequestTitle = item + "确认延期吗"
			
 
				     },
			
 
				+    confirmMsg(item,workId){
			
 
				+      this.msgShow = true
			
 
				+      this.work_id = workId
			
 
				+      this.confirmSiteTitle = item + "留言"
			
 
				+    },
			
 
				     savecComplateMatPickWorker() {
			
 
				       this.$store.commit("loading/showLoading");
			
 
				       complateMatPickWorker(this.work_id,{
			
@@ -636,6 +657,17 @@ export default {
 
				           this.loading = false;
			
 
				         });
			
 
				     },
			
 
				+    checkMsg() {
			
 
				+      addMsg(this.work_id, this.tableForm)
			
 
				+        .then((response) => {
			
 
				+          this.loading = false;
			
 
				+          this.loadWorksite();
			
 
				+          this.msgShow = false;
			
 
				+        })
			
 
				+        .catch(() => {
			
 
				+          this.loading = false;
			
 
				+        });
			
 
				+    },
			
 
				     saveExtensionRequest() {
			
 
				       saveExtensionRequestHandle(this.pick_id,{
			
 
				         pick_id: parseInt(this.pick_id),
			
--- a/views/home/src/projects/worker/views/login/index.vue
+++ b/views/home/src/projects/worker/views/login/index.vue
@@ -2,7 +2,7 @@
 
				   <div class="pt-28 p-4">
			
 
				     <div class="text-center">
			
 
				       <van-image width="6rem" height="6rem" :src="this.$settings.logo" />
			
 
				-      <p class="mt-5 mb-12 text-2xl">志远派单工人端</p>
			
 
				+      <p class="mt-5 mb-12 text-2xl">無同派单工人端</p>
			
 
				     </div>
			
 
				     <div v-if="showLoginType" class="text-center">
			
 
				       <van-button