فهرست منبع

fix: 数据来源问题兼容-6640 应急预案演练计划,查询往期无数据

johnsen 5 ماه پیش
والد
کامیت
2fca648cc1

+ 8 - 2
src/business/platform/data/templaterender/link-data/index.vue

@@ -121,6 +121,10 @@ export default {
       // 动态参数
       type: Object
     },
+    searchParams: {
+      // 手动传参
+      type: Object
+    },
     data: {
       type: Array
     },
@@ -584,8 +588,10 @@ export default {
       responseData.datasetKey = this.dataTemplate.datasetKey
       responseData.unique = this.pkKey
       responseData['key'] = this.templateKey
-      if (this.$utils.isNotEmpty(this.dynamicParams)) {
-        formParams = this.getSearcFormData(this.dynamicParams)
+      responseData['dynamic_params'] = this.dynamicParams
+      console.log('this.dynamicParams=>', this.dynamicParams)
+      if (this.$utils.isNotEmpty(this.searchParams)) {
+        formParams = this.getSearcFormData(this.searchParams)
       }
       formParams['response_data'] = JSON.stringify(responseData)
       formParams['filter_condition_key'] = this.filterConditionKey || ''

+ 8 - 5
src/views/component/sjzlpjjhx/sjzlpjjhx.vue

@@ -164,16 +164,19 @@
             </el-table-column>
             <el-table-column label="计划时间" prop="jiHuaShiJian">
               <template slot-scope="{ row }">
-                <el-input
+                <el-date-picker
                   v-if="!isRead && !(row.shiFouYiDengJi === '1')"
                   v-model="row.jiHuaShiJian"
-                  size="mini"
-                  placeholder="请输入"
-                />
+                  type="date"
+                  format="yyyy-MM-dd"
+                  placeholder="选择日期"
+                  value-format="yyyy-MM-dd"
+                >
+                </el-date-picker>
                 <span v-else>{{ row.jiHuaShiJian }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="参与人员" prop="jiHuaShiJian">
+            <el-table-column label="参与人员" prop="canYuRenYuan">
               <template slot-scope="{ row }">
                 <ibps-user-selector
                   v-model="row.canYuRenYuan"

+ 0 - 1
src/views/platform/examination/exam/list.vue

@@ -776,7 +776,6 @@ export default {
         {
           confirmButtonText: '确定',
           cancelButtonText: '取消',
-          type: 'info',
           showClose: false,
           closeOnClickModal: false,
           dangerouslyUseHTMLString: true

+ 2 - 4
src/views/system/fasc/fecDialog.vue

@@ -86,7 +86,7 @@
                   :temp-search="true"
                   label-key="fang_jian_ming_ha"
                   value-key="fang_jian_ming_ha"
-                  :dynamicParams="{ qu_yu_: form.qu_yu_ || '' }"
+                  :search-params="{ qu_yu_: form.qu_yu_ || '' }"
                   :allow-create="false"
                   :filterable="false"
                   @change-link-data="fangJianChange1"
@@ -884,9 +884,7 @@ export default {
       ) {
         throw new Error('请先选择设备或试剂耗材!')
       }
-      if (
-        this.lei_xing_ == '12-紫外灯消毒'&&this.form.devicename1_ === ''
-      ) {
+      if (this.lei_xing_ == '12-紫外灯消毒' && this.form.devicename1_ === '') {
         throw new Error('紫外灯/设备名缺失!')
       }
       if (this.shouldRequired('fang_jian_') && this.form.fang_jian_ === '') {