Merge branch 'master' of http://182.151.8.209:9010/eln_TD/eln_web

src/api/business/storageLocation/storageLocation.js

@@ -21,4 +21,20 @@ export function storageLocation_edit(data) {
     method: 'post',
     data: data
   })
+}
+
+export function storageLocation_info(query) {
+  return request({
+    url: '/system/business/storageLocation/info',
+    method: 'get',
+    params: query
+  })
+}
+
+export function jcgj_list(query) {
+  return request({
+    url: '/system/business/storageLocation/jcgj/list',
+    method: 'get',
+    params: query
+  })
 }

src/components/Template/StepComponents/qxwdx/qxjz.vue

@@ -66,7 +66,7 @@ export default {
                         compareTo: "yjhj",
                     },
                     text6: {
-                        label: this.sn==='qxqy'?"条件下暂存至":"条件下静置，即稳定性",
+                        label: this.sn==='qxqy'?"条件下暂存，作为":"条件下静置，即稳定性",
                         type: "text",
                     },
                 }
@@ -93,14 +93,6 @@ export default {
                     fillType: "actFill",
                     otherCode: "ccwzOther",
                 }
-                config[0].config.text8 = {
-                    type: "text",
-                    label: "作为",
-                }
-                config[0].config.yp = {
-                    type: "input",
-                    fillType: "actFill",
-                }
                 config[0].config.text9 = {
                     type: "text",
                     label: "样品。",

src/components/Template/StepComponents/ry/jd.vue

@@ -51,7 +51,8 @@ export default {
                     },
                     yjwd: {
                         type: "select",
-                        options: this.getDictOptions("business_wddw"),
+                        options: this.getDictOptions("business_cctj"),
+                        multiple: true,
                         fillType: "preFill",
                         otherCode: "yjwdOther",
                     },
@@ -67,7 +68,8 @@ export default {
                     },
                     sjwd: {
                         type: "select",
-                        options: this.getDictOptions("business_wddw"),
+                        options: this.getDictOptions("business_cctj"),
+                        multiple: true,
                         fillType: "actFill",
                         otherCode: "sjwdOther",
                         compareTo: "yjwd",
@@ -162,7 +164,8 @@ export default {
                     },
                     yjwd: {
                         type: "select",
-                        options: this.getDictOptions("business_wddw"),
+                        options: this.getDictOptions("business_cctj"),
+                        multiple: true,
                         fillType: "preFill",
                         otherCode: "yjwdOther",
                     },
@@ -178,7 +181,8 @@ export default {
                     },
                     sjwd: {
                         type: "select",
-                        options: this.getDictOptions("business_wddw"),
+                        options: this.getDictOptions("business_cctj"),
+                        multiple: true,
                         fillType: "actFill",
                         otherCode: "sjwdOther",
                         compareTo: "yjwd",

src/views/business/comps/template/comps/dl/DL023.vue

@@ -189,7 +189,7 @@ export default {
 							subKey: 'zskssj',
 							buttonName: 'template.dl.dl023.ksButton',
 							disabled: true,
-							subDisabled: false
+							subDisabled: this.fillType !== 'actFill'
 						},
 						zsjssj: {
 							label: 'template.dl.dl023.zsjssj',
@@ -200,7 +200,7 @@ export default {
 							subKey: 'zsjssj',
 							buttonName: 'template.dl.dl023.jsButton',
 							disabled: true,
-							subDisabled: false
+							subDisabled: this.fillType !== 'actFill'
 						},
 					}
 				}

src/views/business/comps/template/comps/yp/YP002.vue

@@ -143,7 +143,7 @@ export default {
 							subKey:"jssjButton",
 							buttonName:"template.yp.yp002.hqsj",
 							disabled:true,
-							subDisabled:false
+							subDisabled:this.fillType !== 'actFill'
 						},
 					}
 				},

src/views/business/comps/template/comps/yp/YP005.vue

@@ -178,7 +178,7 @@ export default {
 				bodyThirdFillType:"actFill",
 				width: 280,
 				bodyDisabled:true,
-				bodySubDisabled:false,
+				bodySubDisabled:this.fillType !== 'actFill',
 			}]
 		},
 	},
@@ -193,13 +193,37 @@ export default {
 	methods: {
 		// 点击按钮
 		handleClickButton(key,rowIndex,colIndex,e,data){
+			let content = this.getFilledFormData();
+			let tableList = content.stepTableFormData
+			let qxsj = tableList[rowIndex].qxsj
+			let timeArr = qxsj?qxsj.split('~'):['','']
 			if(key === "exportBtn"){
 				this.currentRowIndex = rowIndex;
 				this.$refs.ImportExcelDialog.show()
 			}
 			if(key === "startBtn"){
+				let startTime = moment().format("YYYY/MM/DD HH:mm")
+				timeArr[0] = startTime
 				this.$refs.tableRef.updateDataSourceByRowIndex(rowIndex,{
-					qxsj: moment().format("YYYY/MM/DD HH:mm"),
+					qxsj: timeArr.join('~'),
+				})
+
+				// this.$nextTick(() => {
+				// 	//通知后端保存数据
+				// 	const params = {
+				// 		type: "fieldChanged",
+				// 		newRecord: null,
+				// 		resourceList: null,
+				// 	}
+				// 	EventBus.$emit('onModifyRecord', params,)
+				// })
+			}
+			if(key === "endBtn"){
+				debugger
+				let endTime = moment().format("YYYY/MM/DD HH:mm")
+				timeArr[1] = endTime
+				this.$refs.tableRef.updateDataSourceByRowIndex(rowIndex,{
+					qxsj: timeArr.join('~'),
 				})
 
 				// this.$nextTick(() => {

src/views/business/resource/yq/list.vue

@@ -149,7 +149,8 @@
         <el-row>
           <el-col :span="12">
             <el-form-item :label="$t('form.signerPsw')" prop="qmrmm">
-              <el-input v-model="form.qmrmm" autocomplete="off" auto-complete="new-password" show-password
+              <div class="sbzdtcma"> <input type="text"></div>
+              <el-input v-model="form.qmrmm"  show-password
                 :placeholder="$t('form.placeholderInput')" type="password" maxlength="20" />
             </el-form-item>
           </el-col>
@@ -213,7 +214,8 @@ export default {
       },
       // 表单参数
       form: {
-        'qmyy': this.$t('page.form.add')
+        'qmyy': this.$t('page.form.add'),
+        qmrmm: null,
       },
       // 表单校验
       rules: {
@@ -290,6 +292,7 @@ export default {
         wc: null,
         ccwz: null,
         fzdd: null,
+        qmrmm: null,
         qmyy: this.$t('page.business.resource.yq.xzyq'),
       }
       this.resetForm('form')

src/views/business/storageLocation/comps/detail.vue

@@ -0,0 +1,126 @@
+<template>
+  <div class="app-container">
+    <!-- 详情弹窗 -->
+    <el-dialog :title="$t('form.detail')" :visible.sync="open" width="800px" append-to-body
+      :close-on-click-modal="false">
+      <el-form ref="form" :model="form"  label-width="120px">
+        <el-row>
+          <el-col :span="12">
+            <el-form-item :label="$t('page.system.storageLocation.fzdd')" prop="location">
+              <el-input v-model="form.location" disabled :placeholder="$t('form.placeholderInput')" maxlength="50" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item :label="$t('page.system.storageLocation.sbmc')" prop="name">
+              <el-input v-model="form.name" disabled :placeholder="$t('form.placeholderInput')" maxlength="50" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item :label="$t('page.system.storageLocation.fzhj')" prop="shelfPlacement">
+              <el-input v-model="form.shelfPlacement" disabled :placeholder="$t('form.placeholderInput')" maxlength="50" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item :label="$t('page.system.storageLocation.wc')" prop="compartment">
+              <el-input v-model="form.compartment" disabled :placeholder="$t('form.placeholderInput')" maxlength="50" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item :label="$t('page.system.storageLocation.ssbm')" prop="deptId">
+              <el-input v-model="form.deptName" disabled :placeholder="$t('form.placeholderInput')" maxlength="50" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item :label="$t('page.system.storageLocation.zt')" prop="status">
+              <el-select v-model="form.status" :placeholder="$t('form.placeholderSelect')" disabled style="width: 100%;">
+                <el-option key="1" :label="$t('page.system.storageLocation.no')" :value="1" />
+                <el-option key="10" :label="$t('page.system.storageLocation.yes')" :value="10" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+
+      </el-form>
+      <el-table v-loading="loading" :data="qmList">
+        <el-table-column :label="$t('form.signer')" align="center" prop="qmrMc" />
+        <el-table-column :label="$t('form.qmyy')" align="center" prop="jcmc" />
+        <el-table-column :label="$t('form.signTime')" align="center" prop="createTime" />
+        <el-table-column :label="$t('page.business.resource.yq.xgnr')" align="center">
+          <template slot-scope="scope">
+            <div v-for="(pitem, pindex) in scope.row.jcnrList" :key="pindex">
+              {{ pitem.name }}：{{ pitem.value }}
+            </div>
+          </template>
+        </el-table-column>
+      </el-table>
+      <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+        @pagination="getList" />
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="cancel">{{ $t('form.cancel') }}</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { storageLocation_info, jcgj_list } from '@/api/business/storageLocation/storageLocation'
+
+export default {
+  name: "StorageLocationDetail",
+  components: {
+
+  },
+  data() {
+    return {
+      loading: true,
+      open: false,
+      form: {},
+      // 签名列表
+      qmList: [],
+      // 总条数
+      total: 0,
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        id: '',
+      },
+    }
+  },
+  created() {
+  },
+  methods: {
+    cancel() {
+      this.open = false
+    },
+    show(row) {
+      storageLocation_info({ id: row.id }).then((response) => {
+        this.form = response.data
+        this.open = true
+      })
+      this.saveSimpleLog({name:row.bh,nameEn:row.bh,jcmc:'存储位置详情',jcmcEn:'Storage Location Detail'})
+      this.queryParams.id = row.id
+      jcgj_list(this.queryParams).then((response) => {
+        this.qmList = response.rows
+        this.qmList.forEach(item => {
+          if (item.jcnr) {
+            item.jcnrList = JSON.parse(item.jcnr)
+            //item.jcnr = Object.entries(JSON.parse(item.jcnr)).map(([key, value]) => `${key}:${value}`).join('\r\n');
+          } else {
+            item.jcnrList = []
+          }
+        })
+        this.total = response.total
+        this.loading = false
+      })
+    },
+    getList() {
+
+    }
+  }
+}
+</script>

src/views/business/storageLocation/list.vue

@@ -114,7 +114,8 @@
         <el-row>
           <el-col :span="12">
             <el-form-item :label="$t('form.signerPsw')" prop="qmrmm">
-              <el-input v-model="form.qmrmm" autocomplete="off" auto-complete="new-password" show-password
+              <div class="sbzdtcma"> <input type="text"></div>
+              <el-input v-model="form.qmrmm"  show-password
                 :placeholder="$t('form.placeholderInput')" type="password" maxlength="20" />
             </el-form-item>
           </el-col>
@@ -126,19 +127,21 @@
       </div>
     </el-dialog>
 
+    <StorageLocationDetail ref="storageLocationDetail"/>
   </div>
 </template>
 
 <script>
-import { storageLocation_list, storageLocation_add } from '@/api/business/storageLocation/storageLocation'
+import { storageLocation_list, storageLocation_add, storageLocation_edit } from '@/api/business/storageLocation/storageLocation'
 
 import BusinessSelect from '@/views/business/comps/select/BusinessSelect';
 import SelectDept from '@/views/business/comps/select/SelectDept';
 import { mapGetters } from 'vuex'
 import SelectStorageLocation from '@/views/business/comps/select/SelectStorageLocation'
+import StorageLocationDetail from './comps/detail'
 export default {
   name: 'StorageLocation',
-  components: { BusinessSelect, SelectDept, SelectStorageLocation },
+  components: { BusinessSelect, SelectDept, SelectStorageLocation, StorageLocationDetail },
 
   data() {
     return {
@@ -170,7 +173,8 @@ export default {
       },
       // 表单参数
       form: {
-        'qmyy': this.$t('page.form.add')
+        'qmyy': this.$t('page.form.add'),
+        qmrmm: null,
       },
       // 表单校验
       rules: {
@@ -238,6 +242,7 @@ export default {
         wc: null,
         ccwz: null,
         fzdd: null,
+        qmrmm: null,
         qmyy: this.$t('page.system.storageLocation.addStroageLocation'),
       }
       this.resetForm('form')
@@ -269,7 +274,7 @@ export default {
       this.title = this.$t('form.edit')
     },
     handleDetail(row) {
-      this.$refs.YqDetail.show(row)
+      this.$refs.storageLocationDetail.show(row)
     },
     /** 提交按钮 */
     submitForm() {