Merge branch 'feature_20250903_金牌店联络簿增加工地资源信息' into uat(dev)

# Conflicts:
#	src/views/storeManagement/JPattributeEditor.vue

src/views/storeManagement/JPattributeEditor.vue

@@ -79,6 +79,30 @@
           type="number"
           @blur="emergencyContactBlur(detail.emergencyContactMobile)"
           label="紧急联系人电话" />
+        <van-field label="是否有工地资源（支持工地配送，承接工地双包等）">
+          <template #input>
+            <van-radio-group
+              v-model="detail.constructionResource"
+              direction="horizontal"
+              @change="changeResource">
+              <van-radio name="是">是</van-radio>
+              <van-radio name="否">否</van-radio>
+            </van-radio-group>
+          </template>
+        </van-field>
+        <van-field
+          v-if="detail.constructionResource == '是'"
+          v-model="detail.constructionYearNum"
+          type="number"
+          label="年工地数量" />
+        <van-field label="是否有双包能力">
+          <template #input>
+            <van-radio-group v-model="detail.doubleContracting" direction="horizontal">
+              <van-radio name="是">是</van-radio>
+              <van-radio name="否">否</van-radio>
+            </van-radio-group>
+          </template>
+        </van-field>
       </van-form>
     </div>
     <div class="footer-btn">
@@ -291,6 +315,11 @@ export default {
     changeFn() {
       this.checkRadioFlag = true;
     },
+    changeResource(val) {
+      if (val == '否') {
+        this.detail.constructionYearNum = '';
+      }
+    },
     onClickLeft() {
       this.$router.go(-1);
     },

src/views/storeManagement/storeDetail.vue

@@ -382,6 +382,19 @@
                 readonly
                 v-model="list.storeArchives.emergencyContactMobile"
                 label="紧急联系人电话" />
+              <van-field
+                readonly
+                v-model="list.storeArchives.constructionResource"
+                label="是否有工地资源（支持工地配送，承接工地双包等）" />
+              <van-field
+                v-if="list.storeArchives.constructionResource == '是'"
+                readonly
+                v-model="list.storeArchives.constructionYearNum"
+                label="年工地数量" />
+              <van-field
+                readonly
+                v-model="list.storeArchives.doubleContracting"
+                label="是否有双包能力" />
             </div>
           </template>
           <template v-for="(item, index) in TCFXList" v-if="dictTypeFormShow" v-else>