Merge branch 'dev' of http://110.41.163.243:9980/kd-aiot/kd-aiot-frontend-mes into dengfei

src/api/main/index.js

@@ -59,7 +59,6 @@ export async function getIndicatorRootNodeList() {
   return Promise.reject(new Error(res.data.message));
 }
 
-
 // 获取指标类型列表 /main/indicatorManage/getIndicatorTypeList
 export async function getIndicatorUseLevel() {
   const res = await request.post(`/main/indicator/getIndicatorUseLevel`);
@@ -68,3 +67,12 @@ export async function getIndicatorUseLevel() {
   }
   return Promise.reject(new Error(res.data.message));
 }
+
+// /main/category/getByCode/{code}
+export async function getCategoryByCode(code) {
+  const res = await request.get(`/main/category/getByCode/${code}`);
+  if (res.data.code == 0) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}

src/api/recordRules/index.js

@@ -26,3 +26,15 @@ export async function recordrulesPage(body) {
   }
   return Promise.reject(new Error(res.data.message));
 }
+
+// 规则记录分页查询 过程监测 /main/recordrules/notProduceTaskConfigRecordRulesPage
+export async function recordrulesNotProduceTaskConfigRecordRulesPage(body) {
+  const res = await request.post(
+    `/main/recordrules/notProduceTaskConfigRecordRulesPage`,
+    body
+  );
+  if (res.data.code == 0) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}

src/components/selectReleaseRules/select-release-rules.vue

@@ -29,7 +29,10 @@
 
 <script>
   import search from './search.vue';
-  import { recordrulesPage } from '@/api/recordRules/index';
+  import {
+    recordrulesPage,
+    recordrulesNotProduceTaskConfigRecordRulesPage
+  } from '@/api/recordRules/index';
   import tabMixins from '@/mixins/tableColumnsMixin';
   import dictMixins from '@/mixins/dictMixins';
 
@@ -41,6 +44,11 @@
       multiple: {
         type: Boolean,
         default: false
+      },
+      // NotProduceTaskConfig bool 是否排除已配置的记录规则 过程监测传true
+      notProduceTaskConfig: {
+        type: Boolean,
+        default: false
       }
     },
     computed: {
@@ -196,7 +204,11 @@
       },
       /* 表格数据源 */
       datasource({ page, limit, where }) {
-        return recordrulesPage({
+        const API = this.notProduceTaskConfig
+          ? recordrulesNotProduceTaskConfigRecordRulesPage
+          : recordrulesPage;
+
+        return API({
           pageNum: page,
           size: limit,
           // 已发布

src/views/batchRecord/components/editModal.vue

@@ -242,8 +242,11 @@
             </el-table-column>
             <el-table-column label="检查内容">
               <template slot-scope="scope">
-                <div>
-                  {{ scope.row.paramValue || scope.row.productName }}
+                <div v-if="form.recordRulesClassify == 4">
+                  {{ scope.row.productName || scope.row.name }}
+                </div>
+                <div v-else>
+                  {{ scope.row.paramValue }}
                 </div>
               </template>
             </el-table-column>
@@ -409,6 +412,7 @@
     <selectReleaseRules
       ref="selectReleaseRulesRef"
       @chooseRules="chooseReleaseRules"
+      :notProduceTaskConfig="reportWorkType == 2"
     ></selectReleaseRules>
 
     <programRulesDialog

src/views/batchRecord/index.vue

@@ -32,6 +32,19 @@
                       placeholder="选择日期"
                       format="yyyy-MM-dd HH:mm:ss"
                       value-format="yyyy-MM-dd HH:mm:ss"
+                      :picker-options="{
+                        disabledDate: (date) => {
+                          const end = productBody.createTimeEnd
+                            ? new Date(productBody.createTimeEnd)
+                            : new Date();
+                          const start = new Date(end);
+                          start.setMonth(start.getMonth() - 3);
+                          return (
+                            date.getTime() < start.getTime() ||
+                            date.getTime() > end.getTime()
+                          );
+                        }
+                      }"
                     >
                     </el-date-picker>
                     <div style="margin-top: 10px">
@@ -43,6 +56,17 @@
                         format="yyyy-MM-dd HH:mm:ss"
                         value-format="yyyy-MM-dd HH:mm:ss"
                         @change="createTimeEndDateChange"
+                        :picker-options="{
+                          disabledDate: (date) => {
+                            const now = new Date();
+                            const start = new Date(now);
+                            start.setMonth(start.getMonth() - 3);
+                            return (
+                              date.getTime() < start.getTime() ||
+                              date.getTime() > now.getTime()
+                            );
+                          }
+                        }"
                       >
                       </el-date-picker>
                     </div>
@@ -260,6 +284,21 @@
     },
     computed: {},
     created() {
+      // 设置 productBody.createTimeStart 和 productBody.createTimeEnd 为前一个月时间包含今天
+      const endDate = new Date();
+      const startDate = new Date();
+      startDate.setMonth(startDate.getMonth() - 1);
+      // 设置时间为 00:00:00
+      startDate.setHours(0, 0, 0, 0);
+      this.productBody.createTimeStart = this.$util.toDateString(
+        startDate,
+        'yyyy-MM-dd HH:mm:ss'
+      );
+      this.productBody.createTimeEnd = this.$util.toDateString(
+        endDate,
+        'yyyy-MM-dd HH:mm:ss'
+      );
+
       this.getAllProductInWorkOrder();
     },
     methods: {

src/views/checklistManagement/checklist.vue

@@ -71,6 +71,7 @@
   import checkAdd from './components/checkAdd.vue';
   import checkDetails from './components/checkDetails.vue';
   import processSubmitDialog from '@/components/processSubmitDialog/processSubmitDialog.vue';
+  import { getCategoryByCode } from '@/api/main/index';
 
   export default {
     mixins: [dictMixins, tableColumnsMixin],
@@ -242,6 +243,9 @@
             ]
           }
         ];
+      },
+      clientEnvironmentId() {
+        return this.$store.state.user.info.clientEnvironmentId;
       }
     },
     methods: {
@@ -288,8 +292,8 @@
       // 提交审批
       openApproval(row) {
         console.log('row', row);
-        this.processSubmitDialogFlag = true;
-        this.$nextTick(() => {
+        // this.processSubmitDialogFlag = true;
+        this.$nextTick(async () => {
           let params = {
             businessId: row.id,
             businessKey: 'work_order_checklist_approval',
@@ -298,7 +302,22 @@
               businessCode: row.code
             }
           };
-          console.log('1', 1);
+
+          if (this.clientEnvironmentId == 5) {
+            // 嘉实环境
+            const data = await getCategoryByCode(row.orders[0]?.productCode);
+
+            // 判断品类
+            if (data && data.categoryLevelCodePath?.includes('W3-209')) {
+              // 药品
+              params.businessKey = 'work_order_checklist_approval1';
+            } else {
+              // 器械
+              params.businessKey = 'work_order_checklist_approval';
+            }
+          }
+
+          console.log('params', params);
           this.$refs.processSubmitDialogRef.init(params);
         });
       }

src/views/produce/components/prenatalExamination/releaseRulesDialog.vue

@@ -113,8 +113,11 @@
       <el-table-column type="index" label="序号" width="50"> </el-table-column>
       <el-table-column label="检查内容">
         <template slot-scope="scope">
-          <div>
-            {{ scope.row.paramValue || scope.row.productName }}
+          <div v-if="addForm.recordRulesClassify == 4">
+            {{ scope.row.productName || scope.row.name }}
+          </div>
+          <div v-else>
+            {{ scope.row.paramValue }}
           </div>
         </template>
       </el-table-column>

vue.config.js

@@ -34,11 +34,11 @@ module.exports = {
       '/api': {
         // target: 'http://124.71.68.31:50001',
         // target: 'http://192.168.1.116:18086',
-        target: 'http://192.168.1.251:18086',
+        // target: 'http://192.168.1.251:18086',
         // target: 'http://192.168.1.125:18086',
         // target: 'http://192.168.1.116:18086', // 赵沙金
         // target: 'http://192.168.1.251:18086',
-        // target: 'http://192.168.1.251:18086', // 开发环境
+        target: 'http://192.168.1.251:18086', // 开发环境
         // target: 'http://192.168.1.103:18086',192.168.1.116
         // target: 'http://192.168.1.144:18086',
         // target: 'http://192.168.1.30:18086',