Merge branch 'qa2' into dev

.env.production

@@ -14,8 +14,5 @@ VITE_APP_REDIRECT_URL = 'https://sfa.wxl66.cn/link/'
 # 积木报表服务地址
 VITE_APP_REPORT_URL = 'https://sfa.wxl66.cn'
 
-
-
-
 # 模板表格
 VITE_APP_PLAN_TEMPLATE_EXCEL = 'https://link-promotion.oss-cn-shanghai.aliyuncs.com/file/%E6%96%B0%E5%A2%9E%E6%88%96%E4%BF%AE%E6%94%B9%E8%AE%A1%E5%88%92-%E6%A8%A1%E6%9D%BF3.0.xlsx'
\ No newline at end of file

src/mobile/views/examine/index.vue

@@ -82,6 +82,16 @@
             <van-radio name="未达标">未达标</van-radio>
           </van-radio-group>
         </div>
+        <!-- 话术未达标备注输入 -->
+        <div class="form-item"
+          v-if="form.temHs === '未达标'">
+          <label>话术未达标备注：</label>
+          <van-field v-model="form.temHsRemark"
+            type="textarea"
+            placeholder="请输入话术未达标备注"
+            style="margin-top: 10px;"
+            @blur="changeForm('temHsRemark')" />
+        </div>
         <div class="form-item">
           <label>物料是否齐全：</label>
           <van-radio-group v-model="form.temWl"
@@ -90,6 +100,33 @@
             <van-radio name="缺少">缺少</van-radio>
           </van-radio-group>
         </div>
+        <!-- 试吃品是否齐全 -->
+        <div class="form-item">
+          <label>试吃品是否齐全：</label>
+          <van-radio-group v-model="form.temWlScp"
+            @change="changeForm('temWlScp')">
+            <van-radio name="齐全">齐全</van-radio>
+            <van-radio name="缺少">缺少</van-radio>
+          </van-radio-group>
+        </div>
+        <!-- 是否有试吃台 -->
+        <div class="form-item">
+          <label>是否有试吃台：</label>
+          <van-radio-group v-model="form.temWlSct"
+            @change="changeForm('temWlSct')">
+            <van-radio name="有">有</van-radio>
+            <van-radio name="无">无</van-radio>
+          </van-radio-group>
+        </div>
+        <!-- 是否有试吃托盘 -->
+        <div class="form-item">
+          <label>是否有试吃托盘：</label>
+          <van-radio-group v-model="form.temWlSctp"
+            @change="changeForm('temWlSctp')">
+            <van-radio name="有">有</van-radio>
+            <van-radio name="无">无</van-radio>
+          </van-radio-group>
+        </div>
         <div class="form-item">
           <label>着装是否达标：</label>
           <van-radio-group v-model="form.temZz"
@@ -169,7 +206,25 @@
 
           </van-uploader>
         </div>
-
+        <!-- 促销员工资 -->
+        <div class="form-item">
+          <label>促销员工资：</label>
+          <van-field v-model="form.temSalary"
+            type="number"
+            :controls="true"
+            placeholder="请输入促销员工资"
+            style="margin-top: 10px;"
+            @change="changeForm('temSalary')" />
+        </div>
+        <!-- 备注 -->
+        <div class="form-item">
+          <label>备注：</label>
+          <van-field v-model="form.remark"
+            type="textarea"
+            placeholder="请输入备注"
+            style="margin-top: 10px;"
+            @change="changeForm('remark')" />
+        </div>
       </div>
     </div>
   </div>
@@ -197,6 +252,11 @@ const form = ref({
   temHs: '未达标', // 话述
   temWl: '缺少', // 物料
   temZz: '未达标', // 着装
+  temWlScp: '缺少', // 试吃品
+  temWlSct: '无', // 试吃台
+  temWlSctp: '无', // 试吃托盘
+  temSalary: 0, // 促销员工资
+  remark: '', // 备注
   temWorkPhotos: [], // 在/离岗取证照片
   storeTcPhoto: [], // 特陈照
   storeZhjPhoto: [], // 主货架照
@@ -270,12 +330,20 @@ const getDetail = async () => {
     form.value.temHs = res.data.temHs === null ? '达标' : res.data.temHs
     form.value.temWl = res.data.temWl === null ? '齐全' : res.data.temWl
     form.value.temZz = res.data.temZz === null ? '达标' : res.data.temZz
+    form.value.temWlScp = res.data.temWlScp === null ? '齐全' : res.data.temWlScp
+    form.value.temWlSct = res.data.temWlSct === null ? '有' : res.data.temWlSct
+    form.value.temWlSctp = res.data.temWlSctp === null ? '有' : res.data.temWlSctp
+    form.value.temSalary = res.data.temSalary || 0
   } else {
     form.value.storeDd = res.data.storeDd === null ? '否' : res.data.storeDd
     form.value.temOnWork = res.data.temOnWork === null ? '离岗' : res.data.temOnWork
     form.value.temHs = res.data.temHs === null ? '未达标' : res.data.temHs
     form.value.temWl = res.data.temWl === null ? '缺少' : res.data.temWl
     form.value.temZz = res.data.temZz === null ? '未达标' : res.data.temZz
+    form.value.temWlScp = res.data.temWlScp === null ? '缺少' : res.data.temWlScp
+    form.value.temWlSct = res.data.temWlSct === null ? '无' : res.data.temWlSct
+    form.value.temWlSctp = res.data.temWlSctp === null ? '无' : res.data.temWlSctp
+    form.value.temSalary = res.data.temSalary || 0
   }
 
   form.value.temWorkPhotos = res.data?.temWorkPhotos ? (res.data.temWorkPhotos.map(o => {
@@ -402,6 +470,18 @@ const changeTemZz = async () => {
   })
 }
 
+// 选项值改变调用接口
+const changeForm = async (arg) => {
+  await createExamine({
+    id: form.value.id,
+    [arg]: form.value[arg],
+    // temHsRemark: form.value.temHsRemark,
+    employeeId: userStore().userInfo.userId, // 稽查人id
+    employeeName: userStore().userInfo.nickName, // 稽查人名字
+    employeeNo: employeeNo, // 稽查人工号
+  })
+}
+
 // 在/离岗照片上传
 const temWorkPhotosRead = async (file) => {
   // 处理上传的文件

vite.config.js

@@ -23,12 +23,13 @@ export default defineConfig(({ mode, command }) => {
       open: true,
       proxy: {
         '/dev-api': {
-          target: 'http://192.168.100.55:8080',
+          // target: 'http://192.168.100.55:8080',
+          target: 'https://sfa-qa.wxl66.cn/api',
           changeOrigin: true,
           rewrite: (p) => p.replace(/^\/dev-api/, '')
         },
         '/promotion-api': {
-          target: 'http://192.168.100.55:8010',
+          target: 'https://sfa-qa.wxl66.cn/promotion-api',
           changeOrigin: true,
           rewrite: (p) => p.replace(/^\/promotion-api/, '')
         },