Merge branch 'master' of http://119.23.210.103:3000/wy/mj_firm_former

.vscode/settings.json

@@ -1,7 +1,3 @@
 {
-    "workbench.colorCustomizations": {
-        "activityBar.background": "#58102D",
-        "titleBar.activeBackground": "#7C173F",
-        "titleBar.activeForeground": "#FEFCFD"
-    }
+    "workbench.colorCustomizations": {}
 }

src/business/platform/file/attachment/editFile/editor.vue

@@ -89,7 +89,7 @@ export default {
         },
         documentType: this.doctype,
         editorConfig: {
-          callbackUrl: option.editUrl,
+          callbackUrl: option.editUrl + '&access_token=' + getToken(),
           lang: 'zh',
           canHistoryRestore:true,
           canUseHistory:true,

src/business/platform/form/formrender/dynamic-form/dynamic-form-table.vue

@@ -3,31 +3,19 @@
     <template v-if="columns && columns.length > 0">
       <!--================表内和弹窗模式=================================-->
       <div v-if="mode === 'inner' || mode === 'dialog'" class="dynamic-form-table__inner panel panel-info">
-        <div class="panel-heading ibps-clearfix" >
-          <div v-if="!formDialogVisible" class="ibps-fl dynamic-form-table__label  table-tetle-style">{{ field.label }}</div>
+        <div class="panel-heading ibps-clearfix">
+          <div v-if="!formDialogVisible" class="ibps-fl dynamic-form-table__label  table-tetle-style">{{ field.label }}
+          </div>
           <!--弹窗模式对话框-->
-          <formrender-dialog
-            ref="jyxtEdit"
-            v-if="formDialogVisible"
-            :title="field.label"
-            :form-def="dialogFormDef"
-            :data="dialogFormData"
-            :mode="mode"
-            :editFromType="editFromType"
-            @close="deleteEdit()"
-            @action-event="handleFormDialogActionEvent"
-          />
-          <div v-if=" toolbarButtons && toolbarButtons.length >0" class="ibps-fr hidden-print">
-          <!-- :visible="formDialogVisible"-->
+          <formrender-dialog ref="jyxtEdit" v-if="formDialogVisible" :title="field.label" :form-def="dialogFormDef"
+            :data="dialogFormData" :mode="mode" :editFromType="editFromType" @close="deleteEdit()"
+            @action-event="handleFormDialogActionEvent" />
+          <div v-if="toolbarButtons && toolbarButtons.length > 0" class="ibps-fr hidden-print">
+            <!-- :visible="formDialogVisible"-->
 
             <el-button-group>
-              <el-button
-                v-for="(button,index) in toolbarButtons"
-                :key="index"
-                :type="button.type"
-                :icon="button.icon"
-                @click="handleActionEvent(button,index)"
-              >
+              <el-button v-for="(button, index) in toolbarButtons" :key="index" :type="button.type" :icon="button.icon"
+                @click="handleActionEvent(button, index)">
                 {{ button.label }}
               </el-button>
             </el-button-group>
@@ -35,138 +23,90 @@
           </div>
         </div>
         <div class="panel-body">
-          <el-table
-            :data="copDataModel"
-            ref="elTable"
-            :header-cell-style="{color:'#000','font-size':'14px',padding:'4px 0'}"
-            :row-class-name="tableRowClassName"
-            :show-summary="showSummary"
-            :sum-text="sumText"
-            :summary-method="hasSummaryMethod?summaryMethod:null"
-            border
-            @selection-change="handleSelectionChange"
-          >
-            <el-table-column
-              v-if="!tableReadonly"
-              type="selection"
-              width="50"
-            />
-            <el-table-column
-              v-if="field.field_options.index"
-              type="index"
-              :label="field.field_options.index_name?field.field_options.index_name:'序号'"
-              :width="field.field_options.index_width?field.field_options.index_width:50"
-            />
-            <template v-for="(column,j) in displayColumns">
-              <el-table-column
-                show-overflow-tooltip
-                v-if="!columnHidden(column) && column.field_type!='desc' && column.label!=''"
-                :key="j"
-                :prop="column.name"
-                :width="column.field_options.custom_class || null"
-              >
-              <!--  :width="column.field_options.is_label_width ?column.field_options.label_width + (column.field_options.label_width_unit || 'px') :null"-->
+          <el-table :data="copDataModel" ref="elTable"
+            :header-cell-style="{ color: '#000', 'font-size': '14px', padding: '4px 0' }"
+            :row-class-name="tableRowClassName" :show-summary="showSummary" :sum-text="sumText"
+            :summary-method="hasSummaryMethod ? summaryMethod : null" border @selection-change="handleSelectionChange">
+            <el-table-column v-if="!tableReadonly" type="selection" width="50" />
+            <el-table-column v-if="field.field_options.index" type="index"
+              :label="field.field_options.index_name ? field.field_options.index_name : '序号'"
+              :width="field.field_options.index_width ? field.field_options.index_width : 50" />
+            <template v-for="(column, j) in displayColumns">
+              <el-table-column show-overflow-tooltip
+                v-if="!columnHidden(column) && column.field_type != 'desc' && column.label != ''" :key="j"
+                :prop="column.name" :width="column.field_options.custom_class || null">
+                <!--  :width="column.field_options.is_label_width ?column.field_options.label_width + (column.field_options.label_width_unit || 'px') :null"-->
                 <template slot="header">
-                  {{ $utils.isNotEmpty(column.field_options.units) ? column.label + '(' + column.field_options.units + ')' : column.label }}
-                  <ibps-help v-if="column && column.desc && descPosition==='lableIcon'" type="tooltip" :content="$utils.formatText(column.desc)" />
+                  {{ $utils.isNotEmpty(column.field_options.units) ? column.label + '(' + column.field_options.units +
+                      ')' : column.label
+                  }}
+                  <ibps-help v-if="column && column.desc && descPosition === 'lableIcon'" type="tooltip"
+                    :content="$utils.formatText(column.desc)" />
                 </template>
                 <template slot-scope="scope">
-                  <template v-if="copDataModelCont&& copDataModelCont.length >0 && dynamicShow">
-                    <ibps-dynamic-form-table-item
-                      :ref="'formItem'+column.name"
-                      :key="scope.$index+j"
-                       :models.sync="copDataModelCont[scope.$index+(currentPage * 10 -10)]"
-                      :rights.sync="columnsRights"
-                      :form-data="models"
-                      :field="column"
-                      :main-code="mainCode"
-                      :code="code"
-                      :row="scope.$index"
-                      :mode="mode"
-                      :params="params"
-                      :currPage="currentPage"
-                      @updateModel="updateModel"
-                      v-on="listeners"
-                    />
+                  <template v-if="copDataModelCont && copDataModelCont.length > 0 && dynamicShow">
+                    <ibps-dynamic-form-table-item :ref="'formItem' + column.name" :key="scope.$index + j"
+                      :models.sync="copDataModelCont[scope.$index + (currentPage * 10 - 10)]"
+                      :rights.sync="columnsRights" :form-data="models" :field="column" :main-code="mainCode"
+                      :code="code" :row="scope.$index" :mode="mode" :params="params" :currPage="currentPage"
+                      @updateModel="updateModel" v-on="listeners" />
                   </template>
                 </template>
               </el-table-column>
             </template>
-            <el-table-column
-              v-if="manageButtons && manageButtons.length >0"
-              align="center"
-              fixed="right"
-              class-name="hidden-print"
-              label="操作栏目"
-              width="160"
-            >
+            <el-table-column v-if="manageButtons && manageButtons.length > 0" align="center" fixed="right"
+              class-name="hidden-print" label="操作栏目" width="160">
 
               <template slot-scope="scope">
-                <el-dropdown v-if="manageButtons.length>3">
-                  <ibps-icon name="chevron-circle-down" size="28" class="hidden-print"/>
+                <el-dropdown v-if="manageButtons.length > 3">
+                  <ibps-icon name="chevron-circle-down" size="28" class="hidden-print" />
                   <el-dropdown-menu slot="dropdown" class="ibps-table-dropdown-menu" style="margin-top: 0.02rem">
-                    <ibps-toolbar
-                      :actions="manageButtons"
-                      :socpe="thatSocpe"
-                      :data="scope.row"
-                      position="manage"
-                      class="hidden-print"
-                      @action-event="(action)=>handleActionEvent(action, scope.$index)"
-                    />
+                    <ibps-toolbar :actions="manageButtons" :socpe="thatSocpe" :data="scope.row" position="manage"
+                      class="hidden-print" @action-event="(action) => handleActionEvent(action, scope.$index)" />
                   </el-dropdown-menu>
                 </el-dropdown>
                 <template v-else>
-                  <template v-for="(button,index) in manageButtons">
-                    <el-button
-                      plain
-                      size="mini"
-                      :key="index"
-                      :type="button.type"
-                      @click="handleActionEvent(button,scope.$index)"
-                    >
+                  <template v-for="(button, index) in manageButtons">
+                    <el-button plain size="mini" :key="index" :type="button.type"
+                      @click="handleActionEvent(button, scope.$index)">
                       {{ button.label }}
                     </el-button>
-                    <el-divider v-if="manageButtons.length===3 && index===0 || index===1" :key="index" direction="vertical" />
+                    <el-divider v-if="manageButtons.length === 3 && index === 0 || index === 1" :key="index"
+                      direction="vertical" />
 
                   </template>
                 </template>
               </template>
             </el-table-column>
           </el-table>
-                    <!-- 分页 -->
-                    <el-pagination
-          		         v-if="mode === 'dialog' || mode === 'inner'"
-          		         @current-change="handleCurrentChange"
-          		         :page-size="10"
-          		         layout="total, prev, pager, next"
-          		         :total="pageSize">
-          		       </el-pagination>
+          <!-- 分页 -->
+          <el-pagination v-if="mode === 'dialog' || mode === 'inner'" @current-change="handleCurrentChange"
+            :page-size="10" layout="total, prev, pager, next" :total="pageSize">
+          </el-pagination>
         </div>
       </div>
       <!--================表内和弹窗模式end=================================-->
       <!--================块模式=================================-->
       <template v-else-if="mode === 'block'">
-        <template v-if="dataModel && dataModel.length >0">
-          <template v-for="(data,index) in dataModel ">
+        <template v-if="dataModel && dataModel.length > 0">
+          <template v-for="(data, index) in dataModel ">
 
             <div :key="index" class="dynamic-form-table__block panel panel-info">
 
               <div class="panel-heading ibps-clearfix">
                 <!--块模式：工具栏-->
                 <div class="ibps-fl dynamic-form-table__label">
-                  <el-badge v-if="field.field_options.index" :value="index+1 " type="primary" style="top: 0.3em;" />{{ field.label }}
+                  <el-badge v-if="field.field_options.index" :value="index + 1" type="primary" style="top: 0.3em;" />{{
+                      field.label
+                  }}
                 </div>
-                <div v-if="toolbarButtons && toolbarButtons.length >0" class="ibps-fr">
+                <div v-if="toolbarButtons && toolbarButtons.length > 0" class="ibps-fr">
 
                   <el-button-group>
-                    <template v-for="(button,b) in toolbarButtons ">
-                      <template v-if="!(button.key === 'remove' && dataModel.length===1) ">
-                        <el-button
-                          :key="b"
-                          :type="button.type"
-                          :icon="button.icon"
-                          @click="handleActionEvent(button,b)"
-                        >
+                    <template v-for="(button, b) in toolbarButtons ">
+                      <template v-if="!(button.key === 'remove' && dataModel.length === 1)">
+                        <el-button :key="b" :type="button.type" :icon="button.icon"
+                          @click="handleActionEvent(button, b)">
                           {{ button.label }}
                         </el-button>
                       </template>
@@ -177,20 +117,9 @@
 
               <!--块模式：表单-->
               <div class="panel-body">
-                <ibps-dynamic-form-table-block
-                  v-for="(column,j) in columns"
-                  :ref="'formItem'+column.name"
-                  :key="index+j"
-                  :models.sync="dataModel[index]"
-                  :rights.sync="columnsRights"
-                  :form-data="models"
-                  :field="column"
-                  :main-code="mainCode"
-                  :code="code"
-                  :row="index"
-                  :params="params"
-                  v-on="listeners"
-                />
+                <ibps-dynamic-form-table-block v-for="(column, j) in columns" :ref="'formItem' + column.name"
+                  :key="index + j" :models.sync="dataModel[index]" :rights.sync="columnsRights" :form-data="models"
+                  :field="column" :main-code="mainCode" :code="code" :row="index" :params="params" v-on="listeners" />
               </div>
             </div>
 
@@ -199,34 +128,15 @@
       </template>
     </template>
 
-    <el-table
-      v-else
-      :data="[]"
-      empty-text="您尚未创建任何字段。请在表单中添加字段。"
-      border
-    />
+    <el-table v-else :data="[]" empty-text="您尚未创建任何字段。请在表单中添加字段。" border />
     <!--按钮支持自定义对话框-->
-    <custom-dialog
-      :visible="customDialogVisible"
-      :value="[]"
-      :template-key="customDialogKey"
-      :dynamic-params="customDialogDynamicParams"
-      @close="visible=>customDialogVisible =visible"
-      @action-event="handleCustomDialogActionEvent"
-    />
+    <custom-dialog :visible="customDialogVisible" :value="[]" :template-key="customDialogKey"
+      :dynamic-params="customDialogDynamicParams" @close="visible => customDialogVisible = visible"
+      @action-event="handleCustomDialogActionEvent" />
 
-    <import-table
-      :visible="importTableDialogVisible"
-      :title="field.label"
-      @close="visible=>importTableDialogVisible = visible"
-      @action-event="handleImportTableActionEvent"
-    />
-    <component
-      :is="dialogTemplate"
-      v-if="dialogTemplate"
-      ref="dialogTemplate"
-      v-bind="dialogTemplateAtts"
-    />
+    <import-table :visible="importTableDialogVisible" :title="field.label"
+      @close="visible => importTableDialogVisible = visible" @action-event="handleImportTableActionEvent" />
+    <component :is="dialogTemplate" v-if="dialogTemplate" ref="dialogTemplate" v-bind="dialogTemplateAtts" />
   </div>
 </template>
 <script>
@@ -280,39 +190,39 @@ export default {
     }
   },
   data() {
-    let val = [] , tableType = '',copVal = []
+    let val = [], tableType = '', copVal = []
     if (this.$utils.isNotEmpty(this.value)) {
       val = this.value || []
-      copVal = tableType === 'dialog' || 'inner'? JSON.parse(JSON.stringify(val)).slice(0,10): val
+      copVal = tableType === 'dialog' || 'inner' ? JSON.parse(JSON.stringify(val)).slice(0, 10) : val
     }
-    tableType =  this.field.field_options.mode || 'inner'
+    tableType = this.field.field_options.mode || 'inner'
     /* 由于内容遍历卡顿问题，需再建个中间对象进行渲染.*/
     return {
       editFromType: 'add', //列表编辑弹出框类型
       npmDialogFormVisible: false, // 弹窗
       defId: '', // 编辑dialog需要使用
-      currentPage:1,
-      dataPage:0,//当前条数
-      pageSize:val.length,
+      currentPage: 1,
+      dataPage: 0,//当前条数
+      pageSize: val.length,
       dataModel: val,
-      copDataModel:copVal,
+      copDataModel: copVal,
       multipleSelection: '',
-      countNumber:0,
+      countNumber: 0,
       fieldRights: {}, // 子表配置权限
       tableRights: FormOptions.t.PERMISSIONS.EDIT, // 子表权限
       columnsRights: {}, // 子表字段权限
       buttonsRights: {}, // 子表按钮权限
       actionCode: '',
       actionPosition: 'toolbar',
-      handleCout:'',
-      dynamicShow:true,
+      handleCout: '',
+      dynamicShow: true,
 
       customDialogVisible: false,
       customDialogKey: '',
       customDialogDynamicParams: {},
       customDialogCustom: {},
 
-      formEditVisible:false,
+      formEditVisible: false,
       formDialogVisible: false,
       dialogFormDef: {},
       dialogFormData: {},
@@ -422,8 +332,8 @@ export default {
     linkages() {
       return this.params.responseLinkages
     },
-    copDataModelCont(){/* 进行参数替换，提高子表性能 */
-        return JSON.parse(JSON.stringify(this.dataModel))
+    copDataModelCont() {/* 进行参数替换，提高子表性能 */
+      return JSON.parse(JSON.stringify(this.dataModel))
     },
     listeners() {
       return {
@@ -447,24 +357,24 @@ export default {
     this.dialogTemplate = null
     this.dialogTemplateAtts = null
     this.handleCout = null */
-   this.dynamicShow = false
+    this.dynamicShow = false
     // 注销当前表格保存在window[this.mainCode+'TableRefs']的this
     this.destoryTable()
   },
   watch: {
-   value: {
+    value: {
       handler(val, oldVal) {
-        if(!val) return
+        if (!val) return
         this.dataModel = val
-     /*  if (!valueEquals(val, oldVal)) {
-            this.dispatch('ElFormItem', 'el.form.change', val)
-          } */
+        /*  if (!valueEquals(val, oldVal)) {
+               this.dispatch('ElFormItem', 'el.form.change', val)
+             } */
       }
     },
-  dataModel: {
+    dataModel: {
       handler(val, oldVal) {
         //进行分页操作
-        this.pageOperation(val,oldVal)
+        this.pageOperation(val, oldVal)
       }
     },
     rights: {
@@ -502,32 +412,32 @@ export default {
   },
   methods: {
     /* 更新后的参数*/ // 定义删除、增加 不做操作。修改时才做更新 ，分页修改时，根据页表修改。
-    updateModel(key,val,index,page){
-        this.dataModel[page * 10 - 10+ index][key] =val
-        this.$emit('change-data', key, val)
-      },
+    updateModel(key, val, index, page) {
+      this.dataModel[page * 10 - 10 + index][key] = val
+      this.$emit('change-data', key, val)
+    },
     /* 分页操作及数据操作内容*/
-    pageOperation(val,oldVal){
+    pageOperation(val, oldVal) {
       let page = this.currentPage * 10 - 10
       let size = val.length
-     if(size>=10 && (this.pageSize%10)==1 ){ //删除了一个参数 ，如果当前总条数小于页数，则退一页。
-        if(this.currentPage >1)  this.currentPage = this.currentPage -1
+      if (size >= 10 && (this.pageSize % 10) == 1) { //删除了一个参数 ，如果当前总条数小于页数，则退一页。
+        if (this.currentPage > 1) this.currentPage = this.currentPage - 1
         page = this.currentPage * 10 - 10
-        if( page != 0)  page -10
+        if (page != 0) page - 10
+      }
+      this.pageSize = size
+      //具体操作
+      if (this.mode === 'dialog' || this.mode === 'inner') {
+        this.copDataModel = JSON.parse(JSON.stringify(val)).slice(page, page + 10)
       }
-        this.pageSize = size
-        //具体操作
-        if(this.mode === 'dialog' ||this.mode === 'inner'){
-          this.copDataModel =JSON.parse(JSON.stringify(val)).slice(page,page+10)
-        }
       this.$emit('update:value', val)
     },
 
-  //简单的分页 usnin
+    //简单的分页 usnin
     handleCurrentChange(val) {
       this.dataPage = val * 10 - 10
       //深度克隆主要数据
-      this.copDataModel = JSON.parse(JSON.stringify(this.dataModel)).slice(this.dataPage,this.dataPage+10)
+      this.copDataModel = JSON.parse(JSON.stringify(this.dataModel)).slice(this.dataPage, this.dataPage + 10)
       this.currentPage = val
     },
 
@@ -586,8 +496,8 @@ export default {
       const bs = []
       this.buttons.forEach(button => {
         if (hasPermission(button.key, position) && // 有位置权限
-        (!button.position || button.position === 'all' || button.position === position) &&// 有位置权限
-        (this.$utils.isEmpty(this.buttonsRights[button.key]) || this.buttonsRights[button.key] !== FormOptions.t.PERMISSIONS.HIDE) // 有按钮权限
+          (!button.position || button.position === 'all' || button.position === position) &&// 有位置权限
+          (this.$utils.isEmpty(this.buttonsRights[button.key]) || this.buttonsRights[button.key] !== FormOptions.t.PERMISSIONS.HIDE) // 有按钮权限
         ) {
           const b = JSON.parse(JSON.stringify(button))
           b.position = position
@@ -600,9 +510,9 @@ export default {
       const bs = []
       this.buttons.forEach(button => {
         if (hasPermission(button.key, position) && // 有位置权限
-        (!button.position || button.position === 'all' || button.position === position) &&// 有位置权限
-        (this.$utils.isEmpty(this.buttonsRights[button.key]) || this.buttonsRights[button.key] !== FormOptions.t.PERMISSIONS.HIDE) && // 有按钮权限
-         this.$utils.toBoolean(button.enabledDetail)
+          (!button.position || button.position === 'all' || button.position === position) &&// 有位置权限
+          (this.$utils.isEmpty(this.buttonsRights[button.key]) || this.buttonsRights[button.key] !== FormOptions.t.PERMISSIONS.HIDE) && // 有按钮权限
+          this.$utils.toBoolean(button.enabledDetail)
         ) {
           const b = JSON.parse(JSON.stringify(button))
           b.position = position
@@ -612,7 +522,7 @@ export default {
       return bs
     },
     handleActionEvent(button, buttonIndex) {
-        // 起始下标
+      // 起始下标
       let index = this.currentPage * 10 - 10 + buttonIndex
       this.actionCode = button.key === 'custom' ? (button.code || button.key + index) : button.key
       this.actionPosition = button.position || 'toolbar'
@@ -658,7 +568,7 @@ export default {
         }
       })
     },
- destoryTable() {
+    destoryTable() {
       if (this.$utils.isNotEmpty(window[this.mainCode + 'TableRefs']) && this.$utils.isNotEmpty(window[this.mainCode + 'TableRefs'][this.code])) {
         window[this.mainCode + 'TableRefs'][this.code] = null
         delete window[this.mainCode + 'TableRefs'][this.code]
@@ -681,12 +591,12 @@ export default {
     addData(data) {
       this.dataModel.unshift(data)
       // 初始化运行公式计算 unshift
-     this.initRunCalFormula(this.dataModel.length - 1)
+      this.initRunCalFormula(this.dataModel.length - 1)
       // 后置事件
       this.afterScript(this.actionCode, this.actionPosition)
-    /*  if (this.$refs.elTable) {
-        this.$refs.elTable.doLayout()
-      } */
+      /*  if (this.$refs.elTable) {
+          this.$refs.elTable.doLayout()
+        } */
     },
     /**
      * 获取选择的记录
@@ -695,7 +605,7 @@ export default {
       const selection = []
       if (position === 'toolbar' && this.mode !== 'block') {
         if (this.multipleSelection && this.multipleSelection.length > 0) {
-            let startIndex = this.currentPage * 10 - 10
+          let startIndex = this.currentPage * 10 - 10
           this.multipleSelection.forEach(row => {
             selection.push(row.$index + startIndex)
           })
@@ -719,7 +629,7 @@ export default {
           selection: selection,
           index: index
         })
-      }).catch(() => {})
+      }).catch(() => { })
     },
     // 初始化运行公式计算
     initRunCalFormula(row) {
@@ -758,12 +668,12 @@ export default {
     handleExport(button, index) {
       const position = button.position
       const selection = this.getSelection(position, index)
-      if(selection.length>1){
+      if (selection.length > 1) {
         ActionUtils.selectedMultiRecord(selection).then((ids) => {
           this.exportData(ids)
-        }).catch(() => {})
-      }else{
-       this.exportData()
+        }).catch(() => { })
+      } else {
+        this.exportData()
       }
     },
     /**
@@ -780,9 +690,10 @@ export default {
       })
       const exportData = JSON.parse(JSON.stringify(this.dataModel))
 
-      const data =ids? exportData.filter((d, i) => {
+      const data = ids ? exportData.filter((d, i) => {
         return ids.includes(i)
-      }) : ''
+      }) : exportData
+
       // TODO: 需要格式化展示的数据
       this.convertExportData(data, columnMap).then((data) => {
         IbpsExport.excel({
@@ -799,7 +710,7 @@ export default {
     async convertExportData(data, columnMap) {
       return new Promise((resolve, reject) => {
         const result = []
-      data?  data.forEach(d => {
+        data ? data.forEach(d => {
           const o = d
           for (const name in d) {
             const column = columnMap[name]
@@ -891,7 +802,7 @@ export default {
       })
       return res.join(',')
     },
-    deleteEdit(){
+    deleteEdit() {
       this.formDialogVisible = false
       this.handleCout = null
     },
@@ -936,8 +847,8 @@ export default {
         fields: this.columns
       }
       // 表单
-     this.formDialogVisible = true
-     this.judgeData(index)
+      this.formDialogVisible = true
+      this.judgeData(index)
     },
     /* 第一次进入时，不做更新判断。
       并记录当前进入时的操作， index>=0 则为修改。否则为新增。
@@ -945,69 +856,69 @@ export default {
       如果上次为修改，则刷新重置添加。
       如果上次为新增，则不做变化。
     */
-   judgeData(index){
-     if(index>=0 &&  this.handleCout){//第一次进入时，不做更新判断。
+    judgeData(index) {
+      if (index >= 0 && this.handleCout) {//第一次进入时，不做更新判断。
         this.$refs.jyxtEdit.loadFormData();
-     }else if(index == undefined  &&  this.handleCout =='编辑'){
+      } else if (index == undefined && this.handleCout == '编辑') {
         this.$refs.jyxtEdit.loadFormData();
-       }
-     this.handleCout = index >=0 ? '编辑' : '新增' //记录
-   },
+      }
+      this.handleCout = index >= 0 ? '编辑' : '新增' //记录
+    },
 
     // =====================对话框模式数据处理=  原====================
 
     handleEditMode(index) {
-    const data = this.$utils.isNotEmpty(index) ? this.dataModel[index] : {}
-    this.dialogFormData = {
-      responses: JSON.parse(JSON.stringify(data)),
-      // 表单字段权限
-      permissions: {
-        fields: this.columnsRights
+      const data = this.$utils.isNotEmpty(index) ? this.dataModel[index] : {}
+      this.dialogFormData = {
+        responses: JSON.parse(JSON.stringify(data)),
+        // 表单字段权限
+        permissions: {
+          fields: this.columnsRights
+        }
       }
-    }
-    const attrs = {
-      hide_name: true
-    }
-    if (this.params.formAttrs) {
-      const formAttrs = this.params.formAttrs
-      const allowAttrs = ['inline',
-        'labelPosition',
-        'labelWidth',
-        'labelWidthUnit',
-        'size',
-        'statusIcon',
-        'descPosition',
-        'read_style',
-        'colon',
-        'labelSuffix'
-      ]
-      for (const key in formAttrs) {
-        if (allowAttrs.indexOf(key) > -1) {
-          const val = formAttrs[key]
-          attrs[key] = val
+      const attrs = {
+        hide_name: true
+      }
+      if (this.params.formAttrs) {
+        const formAttrs = this.params.formAttrs
+        const allowAttrs = ['inline',
+          'labelPosition',
+          'labelWidth',
+          'labelWidthUnit',
+          'size',
+          'statusIcon',
+          'descPosition',
+          'read_style',
+          'colon',
+          'labelSuffix'
+        ]
+        for (const key in formAttrs) {
+          if (allowAttrs.indexOf(key) > -1) {
+            const val = formAttrs[key]
+            attrs[key] = val
+          }
         }
       }
-    }
 
-    this.dialogFormIndex = this.$utils.isNotEmpty(index) ? index : -1
-    this.dialogFormDef = {
-      code: this.field.name,
-      attrs: attrs,
-      fields: this.columns
-    }
-    // 表单
-    this.formEditVisible = true
+      this.dialogFormIndex = this.$utils.isNotEmpty(index) ? index : -1
+      this.dialogFormDef = {
+        code: this.field.name,
+        attrs: attrs,
+        fields: this.columns
+      }
+      // 表单
+      this.formEditVisible = true
     },
 
     /**
      * 对话框模式表单返回值
      */
     handleFormDialogActionEvent(key, data) {
-       this.$message({
-                  showClose: true,
-                  message: '操作成功！',
-                  type: 'success'
-                });
+      this.$message({
+        showClose: true,
+        message: '操作成功！',
+        type: 'success'
+      });
       if (this.dialogFormIndex > -1) {
         this.dataModel.splice(this.dialogFormIndex, 1, data)
         // 后置事件
@@ -1071,7 +982,7 @@ export default {
         index: index
       }
       if (!callback) {
-        callback = () => {}
+        callback = () => { }
       }
       JForm._beforeSubButton(this, this.actionCode, button.position, params, callback)
     },
@@ -1089,7 +1000,7 @@ export default {
       }
       params.button = this.getButtonByKey(action)
       if (!callback) {
-        callback = () => {}
+        callback = () => { }
       }
       JForm._afterSubButton(this, action, position, params, callback)
     },
@@ -1128,68 +1039,76 @@ export default {
 }
 </script>
 <style lang="scss">
-
-.dynamic-form-table{
-  .panel-heading{
+.dynamic-form-table {
+  .panel-heading {
     color: #000;
-    border-bottom:0;
-    padding:0px 0px 0px 15px;
+    border-bottom: 0;
+    padding: 0px 0px 0px 15px;
     background: #F0FFFF;
   }
-  .dynamic-form-table__inner{
-    .panel-body{
-       padding: 0;
+
+  .dynamic-form-table__inner {
+    .panel-body {
+      padding: 0;
     }
   }
-  .dynamic-form-table__block{
-    padding-bottom:10px;
-    .panel-body{
+
+  .dynamic-form-table__block {
+    padding-bottom: 10px;
+
+    .panel-body {
       border: 0px;
     }
   }
-  .el-rate{
+
+  .el-rate {
     position: relative;
     display: inline-block;
   }
 }
-.is-error{
-  .dynamic-form-table{
+
+.is-error {
+  .dynamic-form-table {
     border: 1px solid #F56C6C;
   }
 }
-.is-required:not(.is-no-asterisk){
-   .dynamic-form-table__label:before {
-        content: '*';
-        color: #F56C6C;
-        margin-right: 4px;
-    }
+
+.is-required:not(.is-no-asterisk) {
+  .dynamic-form-table__label:before {
+    content: '*';
+    color: #F56C6C;
+    margin-right: 4px;
+  }
 }
-.table-tetle-style{
+
+.table-tetle-style {
   font-weight: bold;
   font-size: 12px;
   color: #999999;
 }
-  .dynamic-form-table .el-table th{
-      background-color:#A7D6F8 !important;
-      font-size: 12px;
-      font-weight: bold;
-      border: 0px;
-    }
-    .dynamic-form-table .el-table td{
-		font-size:12px;
-		padding: 0px 0 !important;
-     }
 
-    .dynamic-form-table .el-table .warning-row {
-        background: #D3EBFC;
-        color: #000000;
-      }
+.dynamic-form-table .el-table th {
+  background-color: #A7D6F8 !important;
+  font-size: 12px;
+  font-weight: bold;
+  border: 0px;
+}
 
-     .dynamic-form-table  .el-table .success-row {
-        background: #F9FFFF;
-        color: #000000;
-      }
-  </style>
+.dynamic-form-table .el-table td {
+  font-size: 12px;
+  padding: 0px 0 !important;
+}
+
+.dynamic-form-table .el-table .warning-row {
+  background: #D3EBFC;
+  color: #000000;
+}
+
+.dynamic-form-table .el-table .success-row {
+  background: #F9FFFF;
+  color: #000000;
+}
+</style>
 
 
 </style>

src/business/platform/form/utils/custom/joinCURD.js

@@ -49,8 +49,8 @@ const post = (method, data, type = 'post') => {
         method: type,
         data: requestData,
         params: requestParams,
-        // 开启表单提交加载
-        isLoading: true,
+        // 开启表单提交加载，查询接口除外（sql,select）
+        isLoading: !['sql', 'select'].includes(method),
         retainData
     })
 }

src/business/platform/form/utils/custom/requestType.js

@@ -8,6 +8,8 @@ export const requestType = {
     update: 'updateDataContextTable',
     // 批量修改
     updates: 'updateDatasContextTable',
+    // 批量修改 修改多条数据各自对应的值
+    updatesByWhere: 'updatesBatchContextTable',
     batchDelete: 'batchDelete',
     // 主管提醒（第一滴血）
     str: 'crudZhuGuan',

src/layout/header-aside/components/header-message/index.vue

@@ -1,51 +1,21 @@
 <template>
   <div class="ibps-mr-5">
-    <el-tooltip
-      v-if="messageCount === 0"
-      :content="tooltipContent"
-      effect="dark"
-      placement="bottom"
-    >
-      <el-button
-        class="ibps-ml-0 ibps-mr btn-text can-hover"
-        type="text"
-      >
-        <el-badge
-          :max="99"
-          :value="messageCount"
-        >
-          <ibps-icon
-            name="bell-o"
-            size="16"
-          />
+    <el-tooltip v-if="messageCount === 0" :content="tooltipContent" effect="dark" placement="bottom">
+      <el-button class="ibps-ml-0 ibps-mr btn-text can-hover" type="text">
+        <el-badge :max="99" :value="messageCount">
+          <ibps-icon name="bell-o" size="16" />
         </el-badge>
       </el-button>
     </el-tooltip>
-    <el-popover
-      v-else
-      placement="bottom-end"
-      width="350"
-      trigger="click"
-      popper-class="header-message-popper"
-    >
+    <el-popover v-else placement="bottom-end" width="350" trigger="click" popper-class="header-message-popper">
 
-      <el-button
-        slot="reference"
-        class="ibps-ml-0 ibps-mr btn-text can-hover"
-        type="text"
-      >
-        <el-badge
-          :max="99"
-          :value="messageCount"
-        >
-          <ibps-icon
-            name="bell-o"
-            size="16"
-          />
+      <el-button slot="reference" class="ibps-ml-0 ibps-mr btn-text can-hover" type="text">
+        <el-badge :max="99" :value="messageCount">
+          <ibps-icon name="bell-o" size="16" />
         </el-badge>
       </el-button>
 
-      <el-card body-style="padding:0;">
+      <!-- <el-card body-style="padding:0;">
         <div slot="header" style="font-size: 20px; font-weight: 600;">
           {{ $t('layout.header-aside.header-message.message-count',{messageCount:messageCount}) }}
         </div>
@@ -81,24 +51,18 @@
         <div class="message-more">
           <el-link type="primary" @click="clickMore">{{ $t('layout.header-aside.header-message.viewmore') }}</el-link>
         </div>
-      </el-card>
+      </el-card> -->
     </el-popover>
 
     <!-- 消息明细 -->
-    <inner-detail-dialog
-      :id="editId"
-      :visible="dialogFormVisible"
-      :title="$t('layout.header-aside.header-message.details')"
-      inside
-      readonly
-      @callback="loadData"
-      @close="visible => dialogFormVisible = visible"
-    />
+    <inner-detail-dialog :id="editId" :visible="dialogFormVisible"
+      :title="$t('layout.header-aside.header-message.details')" inside readonly @callback="loadData"
+      @close="visible => dialogFormVisible = visible" />
   </div>
 </template>
 
 <script>
-import { getMsgList,queryReceivePageList } from '@/api/platform/message/innerMessage'
+import { getMsgList, queryReceivePageList } from '@/api/platform/message/innerMessage'
 import InnerDetailDialog from '@/views/platform/message/inner/detail/dialog'
 import Watermark from './watermark/watermark-cont.js'
 export default {
@@ -109,12 +73,12 @@ export default {
     return {
       editId: '',
       dialogFormVisible: false,
-      isControl:true,
+      isControl: true,
       messageList: [],
       messageCount: 0,
-      infoMessage:'',
+      infoMessage: '',
 
-      countNumber:0,
+      countNumber: 0,
     }
   },
   computed: {
@@ -131,88 +95,89 @@ export default {
     this.loadData()
     // Watermark.set('线上试用版本','深圳市金源信通')
   },
-  beforeDestroy () {
+  beforeDestroy() {
     Watermark.set('', '')
   },
   methods: {
     // 加载数据
-   loadData() {
+    loadData() {
       queryReceivePageList(
-               { parameters:[/* {key: "Q^subject^SL", value: "提醒"},
+        {
+          parameters: [/* {key: "Q^subject^SL", value: "提醒"},
                              {key: "Q^messageType^SL", value: "system"} */],
-                requestPage:{limit:5,pageNo: 1,totalCount: 0},
-                sorts: [],
-                }).then(response => {
-                  const data = response.data
-                  this.messageList = data.dataResult
-                  this.messageCount = data.pageResult ? data.pageResult.totalCount : 0
-        if(this.countNumber == 0){
+          requestPage: { limit: 5, pageNo: 1, totalCount: 0 },
+          sorts: [],
+        }).then(response => {
+          const data = response.data
+          this.messageList = data.dataResult
+          this.messageCount = data.pageResult ? data.pageResult.totalCount : 0
+          if (this.countNumber == 0) {
             /*
             if(response.data.pageResult.totalCount>0){
                 this.$message.warning('您有'+response.data.pageResult.totalCount+'条未处理的 [ 待审批 / 被驳回任务消息 ]，请及时处理！！！')
             } */
 
-        }else if(this.countNumber < data.pageResult.totalCount){ //如果上次记录数量低于本次  进行提醒，准备待办
+          } else if (this.countNumber < data.pageResult.totalCount) { //如果上次记录数量低于本次  进行提醒，准备待办
             let _this = this
             let h = this.$createElement
             let num = data.pageResult.totalCount - this.countNumber
-                     this.infoMessage =  this.$notify({
-                                 title: '您有新的待办任务产生！',
-                                 message:  h('p', null, [
-                                   h('span', null, '任务内容: '+data.dataResult[0].subject),
-                                   h('br'),
-                                   h('span',null, '生成时间: '),
-                                   h('span', {style:'color: #FF8C00;font-size:12px;'},data.dataResult[0].createTime),
-                                   h('br'),
-                                   h('el-button', {
-                                            attrs: {
-                                              size: 'mini',
-                                              type: 'primary',
-                                              plain:true,
-                                            },
-                                            on: {
-                                              click:()=>{
-                                                _this.cancelInfo()
-                                                }
-                                            }
-                                          }, '进入办理'),
-                                    h('el-button', {
-                                             attrs: {
-                                               size: 'mini',
-                                               plain:true,
-                                             },
-                                             on: {
-                                               click:()=>{
-                                                _this.$notify.closeAll()
-                                                 }// 路由加载之后，调用关闭消息弹窗的方法
-                                             }
-                                           }, '忽略全部')
-                                 ]),
-                                 type: 'warning',
-                                 duration: 0,
-                               });
+            this.infoMessage = this.$notify({
+              title: '您有新的待办任务产生！',
+              message: h('p', null, [
+                h('span', null, '任务内容: ' + data.dataResult[0].subject),
+                h('br'),
+                h('span', null, '生成时间: '),
+                h('span', { style: 'color: #FF8C00;font-size:12px;' }, data.dataResult[0].createTime),
+                h('br'),
+                h('el-button', {
+                  attrs: {
+                    size: 'mini',
+                    type: 'primary',
+                    plain: true,
+                  },
+                  on: {
+                    click: () => {
+                      _this.cancelInfo()
+                    }
+                  }
+                }, '进入办理'),
+                h('el-button', {
+                  attrs: {
+                    size: 'mini',
+                    plain: true,
+                  },
+                  on: {
+                    click: () => {
+                      _this.$notify.closeAll()
+                    }// 路由加载之后，调用关闭消息弹窗的方法
+                  }
+                }, '忽略全部')
+              ]),
+              type: 'warning',
+              duration: 0,
+            });
 
-        }
-        if(this.countNumber == 0){
-              this.countNumber = data.pageResult.totalCount
+          }
+          if (this.countNumber == 0) {
+            this.countNumber = data.pageResult.totalCount
             /*  setInterval(() => {
                    if(this.isControl &&  response.message == "获取收到的内部消息列表成功！"){
                      this.loadData()
                      }
                 }, 60000)
  */
-            }else{
-              this.countNumber = data.pageResult.totalCount
-            }
+          } else {
+            this.countNumber = data.pageResult.totalCount
+          }
 
-      }).catch(() => {
-		  this.isControl = false
-      })
+        }).catch(() => {
+          this.isControl = false
+        })
+    },
+    cancelInfo() {
+      this.$router.push('/officeDesk/pendingItems')
+      this.$notify.closeAll()
     },
-    cancelInfo(){
-        this.$router.push('/officeDesk/pendingItems')
-        this.$notify.closeAll()
-      },
     handelInteriorClick(message) {
       this.editId = message.id
       this.dialogFormVisible = true
@@ -224,18 +189,19 @@ export default {
   },
   /* 销毁事件*/
   beforeDestroy() {
-   this.isControl = false
+    this.isControl = false
   },
 
 }
 </script>
 <style lang="scss" >
-  .header-message-popper{
-    padding: 0 !important;
-    .message-more{
-      padding: 15px 0;
-      text-align: center;
-      border-top: 1px solid #EBEEF5;
-    }
+.header-message-popper {
+  padding: 0 !important;
+
+  .message-more {
+    padding: 15px 0;
+    text-align: center;
+    border-top: 1px solid #EBEEF5;
   }
+}
 </style>

src/locales/en.json

@@ -35,7 +35,7 @@
 			"toUp": "Move first",
 			"up": "Upper"
 		},
-		"company": "Guangzhou Liuchen Information Technology Co., Ltd.",
+		"company": "MingJian Cell Detection LIMS",
 		"copyright": "All Rights Reserved",
 		"dialog": {
 			"multipleSelected": "Multiple items have been selected, please choose one to operate!",
@@ -441,7 +441,7 @@
 			"usage": "RAND()"
 		},
 		"replace": {
-			"example": "REPLACE('深圳市金源信通科技有限公司',4,6,'实验室数据管理')返回'实验室数据管理平台'",
+			"example": "REPLACE('明鉴细胞检测实验室信息管理系统',4,6,'实验室数据管理')返回'实验室数据管理平台'",
 			"intro": "REPLACE函数可以根据指定的字符数，将部分文本替换为不同的文本",
 			"usage": "REPLACE(文本,开始位置,替换长度,新文本)"
 		},

src/locales/ja.json

@@ -35,7 +35,7 @@
 			"toUp": "第1条",
 			"up": "へ"
 		},
-		"company": "深圳市金源信通科技有限公司",
+		"company": "明鉴细胞检测实验室信息管理系统",
 		"copyright": "無断複写・転載を禁じます",
 		"dialog": {
 			"multipleSelected": "複数のアイテムが選択されています。操作するアイテムを選択してください！",

src/locales/zh-CN.json

@@ -35,7 +35,7 @@
 			"toUp": "移至第一条",
 			"up": "上移"
 		},
-		"company": "深圳市金源信通科技有限公司",
+		"company": "明鉴细胞检测实验室信息管理系统",
 		"copyright": "版权所有",
 		"dialog": {
 			"multipleSelected": "已经选择了多项,请选择一项进行操作!",

src/views/component/qrcodeed.vue

@@ -1,53 +1,53 @@
 <template>
- <div id="qrcode" ref="qrcode"></div>
+  <div id="qrcode" ref="qrcode"></div>
 </template>
 
 <script>
-  import QRCode from 'qrcodejs2' // 引入qrcode
-  export default {
-    name: "qrcode",
-    props: {
-      field: Object,
-      formData: {
-        type: Object,
-        default () {
-          return {}
-        }
-      },
-      readonly: {
-        type: Boolean,
-        default: false,
+import QRCode from 'qrcodejs2' // 引入qrcode
+export default {
+  name: "qrcode",
+  props: {
+    field: Object,
+    formData: {
+      type: Object,
+      default() {
+        return {}
       }
     },
+    readonly: {
+      type: Boolean,
+      default: false,
+    }
+  },
 
-    methods: {
-      qrcode() {
-        let qrcode = new QRCode('qrcode', {
-          width: 132,
-          height: 132,
-         text:`https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxf0aecf99696061a3&redirect_uri=https%3A%2F%2Fwww.mingjianlims.com%2F%23%2Fziliao&response_type=code&scope=snsapi_base&state=${this.formData.id}#wechat_redirect`,
-          colorDark: "#000000", //前景色
-          colorLight: "#FFFFFF", //背景色
+  methods: {
+    qrcode() {
+      let qrcode = new QRCode('qrcode', {
+        width: 132,
+        height: 132,
+        text: `https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxea2c214ca5d25739&redirect_uri=https%3A%2F%2Fwww.mingjianlims.com%2F%23%2Fziliao&response_type=code&scope=snsapi_base&state=${this.formData.id}#wechat_redirect`,
+        colorDark: "#000000", //前景色
+        colorLight: "#FFFFFF", //背景色
 
-          correctLevel:QRCode.CorrectLevel.L,
+        correctLevel: QRCode.CorrectLevel.L,
 
 
-        })
-      },
-    },
-    mounted() {
-      this.$nextTick(() => {
-        setTimeout(() => {
-          this.qrcode();
-        }, 0)
       })
     },
-  }
+  },
+  mounted() {
+    this.$nextTick(() => {
+      setTimeout(() => {
+        this.qrcode();
+      }, 0)
+    })
+  },
+}
 </script>
 
 <style scoped>
-  #qrcode {
-    width: 100px;
-    height: 100px;
-  }
+#qrcode {
+  width: 100px;
+  height: 100px;
+}
 </style>

src/views/component/qrcodeeds.vue

@@ -3,62 +3,62 @@
 </template>
 
 <script>
-  import QRCode from 'qrcodejs2' // 引入qrcode
-  export default {
-    name: "qrcode",
-    props: {
-      field: Object,
-      formData: {
-        type: Object,
-        default () {
-          return {}
-        }
-
-      },
-      readonly: {
-        type: Boolean,
-        default: false,
-      }
-    },
-    data() {
-      return {
-        flag: false, //标记二维码是否已经生成
+import QRCode from 'qrcodejs2' // 引入qrcode
+export default {
+  name: "qrcode",
+  props: {
+    field: Object,
+    formData: {
+      type: Object,
+      default() {
+        return {}
       }
+
     },
-    watch: {
-      formData(val) {
-        if (val.zongWaiJian != '') {
-          if (!this.flag) {
-            this.qrcode(val.zongWaiJian)
-            this.flag = true;
-          }
+    readonly: {
+      type: Boolean,
+      default: false,
+    }
+  },
+  data() {
+    return {
+      flag: false, //标记二维码是否已经生成
+    }
+  },
+  watch: {
+    formData(val) {
+      if (val.zongWaiJian != '') {
+        if (!this.flag) {
+          this.qrcode(val.zongWaiJian)
+          this.flag = true;
         }
       }
-    },
+    }
+  },
 
-    methods: {
+  methods: {
 
-      qrcode(zongWaiJian) {
-        console.log('执行生成二维码');
-        let qrcode = new QRCode('qrcode', {
-          width: 132,
-          height: 132,
-          text:`https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxf0aecf99696061a3&redirect_uri=https%3A%2F%2Fwww.mingjianlims.com%2F%23%2Fziliao&response_type=code&scope=snsapi_base&state=${zongWaiJian}#wechat_redirect`,
-          colorDark: "#000000", //前景色
-          colorLight: "#FFFFFF", //背景色
-          correctLevel: QRCode.CorrectLevel.L,
+    qrcode(zongWaiJian) {
+      console.log('执行生成二维码');
+      let qrcode = new QRCode('qrcode', {
+        width: 132,
+        height: 132,
+        text: `https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxea2c214ca5d25739&redirect_uri=https%3A%2F%2Fwww.mingjianlims.com%2F%23%2Fziliao&response_type=code&scope=snsapi_base&state=${zongWaiJian}#wechat_redirect`,
+        colorDark: "#000000", //前景色
+        colorLight: "#FFFFFF", //背景色
+        correctLevel: QRCode.CorrectLevel.L,
 
 
-        })
-      },
+      })
     },
+  },
 
-  }
+}
 </script>
 
 <style scoped>
-  #qrcode {
-    width: 100px;
-    height: 100px;
-  }
+#qrcode {
+  width: 100px;
+  height: 100px;
+}
 </style>

src/views/huanjingjiankong/huanjingjiankong.vue

@@ -58,9 +58,16 @@
               :class="[item.ifshow == 'false' ? 'contentshow' : 'content']"
               v-show="item.run == 1"
             >
-            <!-- <div class="contentshow"> -->
-              <div class="envir-conditoin" v-show="item.temp?true:false">温度:{{ item.temp }}</div>
-              <div class="envir-conditoin" v-show="item.humidness?true:false">湿度:{{ item.humidness }}</div>
+              <!-- <div class="contentshow"> -->
+              <div class="envir-conditoin" v-show="item.temp ? true : false">
+                温度:{{ item.temp }}
+              </div>
+              <div
+                class="envir-conditoin"
+                v-show="item.humidness ? true : false"
+              >
+                湿度:{{ item.humidness }}
+              </div>
               <div class="envir-conditoin">气压:{{ item.airPressure }}</div>
             </div>
           </div>
@@ -199,16 +206,15 @@ export default {
           x: 584,
           y: 480,
         },
-        {
-          x: 640,
-          y: 465,
-        },
+        // {
+        //   x: 640,
+        //   y: 465,
+        // },
         {
           x: 710,
           y: 480,
         },
         {
-          
           x: 710,
           y: 420,
         },
@@ -229,12 +235,12 @@ export default {
           x: 1495,
           y: 570,
         },
-        {//支原体检测->更
+        {
+          //支原体检测->更
           x: 850,
           y: 250,
         },
         {
-          
           x: 780,
           y: 290,
         },
@@ -252,16 +258,16 @@ export default {
           x: 850,
           y: 70,
         },
-        { //产物分析室->更
+        {
+          //产物分析室->更
           x: 1098,
           y: 270,
         },
-        { 
+        {
           x: 1355,
           y: 270,
         },
         {
-         
           x: 965,
           y: 220,
         },
@@ -300,7 +306,6 @@ export default {
           x: 250,
           y: 280,
         },
-
       ],
       domsize: [
         {
@@ -453,17 +458,17 @@ export default {
         this_.timeData();
       }, 300000); /// 300000
     },
-    returnifShow(t, h, p,qiya) {
-       let ifshow = "";
-       if(t==999&&h===999){
+    returnifShow(t, h, p, qiya) {
+      let ifshow = "";
+      if (t == 999 && h === 999) {
         ifshow = "true";
         return ifshow;
-       }
+      }
       let temp = t.toFixed(2);
       let humidness = h.toFixed(2);
       let airPressure = p.toFixed(2);
       // let ifshow = "";
-     
+
       if (temp > 999 || temp <= 0) {
         //不给予赋值
       } else if (temp >= 18 && temp <= 26) {
@@ -538,30 +543,54 @@ export default {
           data[0].p9,
           5
         );
-        this_.newweizhi[14].airPressure = data[0].p1;
-        this_.newweizhi[14].ifshow = this_.returnifShow(999,999,data[0].p1,10);
+        this_.newweizhi[14].airPressure = data[0].p1; //; 1更
+        this_.newweizhi[14].ifshow = this_.returnifShow(
+          999,
+          999,
+          data[0].p1,
+          10
+        );
         this_.newweizhi[14].run = data[0].run;
 
-        this_.newweizhi[15].airPressure = data[0].p2;
-        this_.newweizhi[15].ifshow = this_.returnifShow(999,999,data[0].p2,10);
+        this_.newweizhi[15].airPressure = data[0].p3; //2更
+        this_.newweizhi[15].ifshow = this_.returnifShow(
+          999,
+          999,
+          data[0].p2,
+          10
+        );
         this_.newweizhi[15].run = data[0].run;
 
-        this_.newweizhi[16].airPressure = data[0].p3;
-        this_.newweizhi[16].ifshow = this_.returnifShow(999,999,data[0].p3,5);
-        this_.newweizhi[16].run = data[0].run;
+        // this_.newweizhi[16].airPressure =2323 //data[0].p3;
+        // this_.newweizhi[16].ifshow = this_.returnifShow(999,999,data[0].p3,5);
+        // this_.newweizhi[16].run =1 //data[0].run;
 
-        this_.newweizhi[17].airPressure =data[0].p4;
-        this_.newweizhi[17].ifshow = this_.returnifShow(999,999,data[0].p4,5);
+        this_.newweizhi[17].airPressure = data[0].p4; //缓冲出
+        this_.newweizhi[17].ifshow = this_.returnifShow(
+          999,
+          999,
+          data[0].p4,
+          5
+        );
         this_.newweizhi[17].run = data[0].run;
 
-        this_.newweizhi[18].airPressure = data[0].p5;
-        this_.newweizhi[18].ifshow = this_.returnifShow(999,999,data[0].p5,10);
+        this_.newweizhi[18].airPressure = data[0].p5; //退更
+        this_.newweizhi[18].ifshow = this_.returnifShow(
+          999,
+          999,
+          data[0].p5,
+          10
+        );
         this_.newweizhi[18].run = data[0].run;
 
-        this_.newweizhi[19].airPressure = 6666;
-        this_.newweizhi[19].ifshow = this_.returnifShow(999,999,data[0].p10,10);
+        this_.newweizhi[19].airPressure = data[0].p1; //p1; //p1 万
+        this_.newweizhi[19].ifshow = this_.returnifShow(
+          999,
+          999,
+          data[0].p10,
+          10
+        );
         this_.newweizhi[19].run = data[0].run;
-
       });
       let sql1 =
         "select * FROM DATA WHERE deviceName ='HAU02'  ORDER BY saveTime ASC LIMIT 1";
@@ -587,24 +616,36 @@ export default {
           data[0].p5,
           5
         );
-        
+
         this_.newweizhi[20].airPressure = data[0].p1;
-        this_.newweizhi[20].ifshow = this_.returnifShow(999,999,data[0].p1,10);
+        this_.newweizhi[20].ifshow = this_.returnifShow(
+          999,
+          999,
+          data[0].p1,
+          10
+        );
         this_.newweizhi[20].run = data[0].run;
 
         this_.newweizhi[21].airPressure = data[0].p2;
-        this_.newweizhi[21].ifshow = this_.returnifShow(999,999,data[0].p2,10);
+        this_.newweizhi[21].ifshow = this_.returnifShow(
+          999,
+          999,
+          data[0].p2,
+          10
+        );
         this_.newweizhi[21].run = data[0].run;
 
         this_.newweizhi[22].airPressure = data[0].p3;
-        this_.newweizhi[22].ifshow = this_.returnifShow(999,999,data[0].p3,5);
+        this_.newweizhi[22].ifshow = this_.returnifShow(
+          999,
+          999,
+          data[0].p3,
+          5
+        );
         this_.newweizhi[22].run = data[0].run;
-
-
-
       });
       let sql2 =
-        "select * FROM DATA WHERE deviceName ='HAU03' ORDER BY saveTime DESC LIMIT 1";//支原体室
+        "select * FROM DATA WHERE deviceName ='HAU03' ORDER BY saveTime DESC LIMIT 1"; //支原体室
       curdPost("sql", sql2).then((res) => {
         let data = res.variables.data;
         this_.newweizhi[6].temp = data[0].t1;
@@ -617,19 +658,32 @@ export default {
           data[0].p4,
           5
         );
-        this_.newweizhi[23].airPressure = data[0].p1
-        this_.newweizhi[23].ifshow = this_.returnifShow(999,999,data[0].p1,10);
+        this_.newweizhi[23].airPressure = data[0].p1;
+        this_.newweizhi[23].ifshow = this_.returnifShow(
+          999,
+          999,
+          data[0].p1,
+          10
+        );
         this_.newweizhi[23].run = data[0].run;
 
-        this_.newweizhi[24].airPressure = data[0].p2
-        this_.newweizhi[24].ifshow = this_.returnifShow(999,999,data[0].p2,10);
+        this_.newweizhi[24].airPressure = data[0].p2;
+        this_.newweizhi[24].ifshow = this_.returnifShow(
+          999,
+          999,
+          data[0].p2,
+          10
+        );
         this_.newweizhi[24].run = data[0].run;
 
         this_.newweizhi[25].airPressure = data[0].p3;
-        this_.newweizhi[25].ifshow = this_.returnifShow(999,999,data[0].p3,5);
+        this_.newweizhi[25].ifshow = this_.returnifShow(
+          999,
+          999,
+          data[0].p3,
+          5
+        );
         this_.newweizhi[25].run = data[0].run;
-
-
       });
       let sql3 =
         "select * FROM DATA WHERE deviceName ='HAU04'  ORDER BY saveTime DESC LIMIT 1";
@@ -645,17 +699,23 @@ export default {
           data[0].p3,
           5
         );
-        this_.newweizhi[26].airPressure = data[0].p1
-        this_.newweizhi[26].ifshow = this_.returnifShow(999,999,data[0].p1,10);
+        this_.newweizhi[26].airPressure = data[0].p1;
+        this_.newweizhi[26].ifshow = this_.returnifShow(
+          999,
+          999,
+          data[0].p1,
+          10
+        );
         this_.newweizhi[26].run = data[0].run;
 
         this_.newweizhi[27].airPressure = data[0].p2;
-        this_.newweizhi[27].ifshow = this_.returnifShow(999,999,data[0].p2,5);
+        this_.newweizhi[27].ifshow = this_.returnifShow(
+          999,
+          999,
+          data[0].p2,
+          5
+        );
         this_.newweizhi[27].run = data[0].run;
-
-
-
-
       });
       let sql4 =
         "select * FROM DATA WHERE deviceName ='PAU01'  ORDER BY saveTime DESC LIMIT 1";
@@ -663,7 +723,7 @@ export default {
         let data = res.variables.data;
         this_.newweizhi[8].temp = data[0].t1;
         this_.newweizhi[8].humidness = data[0].h1;
-        this_.newweizhi[8].airPressure = data[0].p9;//产物
+        this_.newweizhi[8].airPressure = data[0].p9; //产物
         this_.newweizhi[8].run = data[0].run;
         this_.newweizhi[8].ifshow = this_.returnifShow(
           data[0].t1,
@@ -673,7 +733,7 @@ export default {
         );
         this_.newweizhi[9].temp = data[0].t2;
         this_.newweizhi[9].humidness = data[0].h2;
-        this_.newweizhi[9].airPressure = data[0].p7;//扩增
+        this_.newweizhi[9].airPressure = data[0].p7; //扩增
         this_.newweizhi[9].run = data[0].run;
         this_.newweizhi[9].ifshow = this_.returnifShow(
           data[0].t2,
@@ -683,7 +743,7 @@ export default {
         );
         this_.newweizhi[10].temp = data[0].t3;
         this_.newweizhi[10].humidness = data[0].h3;
-        this_.newweizhi[10].airPressure = data[0].p5;//样本制备
+        this_.newweizhi[10].airPressure = data[0].p5; //样本制备
         this_.newweizhi[10].run = data[0].run;
         this_.newweizhi[10].ifshow = this_.returnifShow(
           data[0].t3,
@@ -693,7 +753,7 @@ export default {
         );
         this_.newweizhi[11].temp = data[0].t4;
         this_.newweizhi[11].humidness = data[0].h4;
-        this_.newweizhi[11].airPressure = data[0].p3;//试剂准备
+        this_.newweizhi[11].airPressure = data[0].p3; //试剂准备
         this_.newweizhi[11].run = data[0].run;
         this_.newweizhi[11].ifshow = this_.returnifShow(
           data[0].t4,
@@ -702,26 +762,49 @@ export default {
           15
         );
         this_.newweizhi[28].airPressure = data[0].p1; //pcr
-        this_.newweizhi[28].ifshow = this_.returnifShow(999,999,data[0].p1,5);
+        this_.newweizhi[28].ifshow = this_.returnifShow(
+          999,
+          999,
+          data[0].p1,
+          5
+        );
         this_.newweizhi[28].run = data[0].run;
 
-        this_.newweizhi[29].airPressure = data[0].p2;//试剂准备缓冲
-        this_.newweizhi[29].ifshow = this_.returnifShow(999,999,data[0].p2,5);
+        this_.newweizhi[29].airPressure = data[0].p2; //试剂准备缓冲
+        this_.newweizhi[29].ifshow = this_.returnifShow(
+          999,
+          999,
+          data[0].p2,
+          5
+        );
         this_.newweizhi[29].run = data[0].run;
 
-        this_.newweizhi[30].airPressure = data[0].p8//产物缓冲
-        this_.newweizhi[30].ifshow = this_.returnifShow(999,999,data[0].p8,5);
+        this_.newweizhi[30].airPressure = data[0].p8; //产物缓冲
+        this_.newweizhi[30].ifshow = this_.returnifShow(
+          999,
+          999,
+          data[0].p8,
+          5
+        );
         this_.newweizhi[30].run = data[0].run;
 
-        this_.newweizhi[31].airPressure = data[0].p6;//扩增缓冲
-        this_.newweizhi[31].ifshow = this_.returnifShow(999,999,data[0].p6,5);
+        this_.newweizhi[31].airPressure = data[0].p6; //扩增缓冲
+        this_.newweizhi[31].ifshow = this_.returnifShow(
+          999,
+          999,
+          data[0].p6,
+          5
+        );
         this_.newweizhi[31].run = data[0].run;
 
-        this_.newweizhi[32].airPressure = data[0].p4//样本制备缓冲
-        this_.newweizhi[32].ifshow = this_.returnifShow(999,999,data[0].p4s,5);
+        this_.newweizhi[32].airPressure = data[0].p4; //样本制备缓冲
+        this_.newweizhi[32].ifshow = this_.returnifShow(
+          999,
+          999,
+          data[0].p4s,
+          5
+        );
         this_.newweizhi[32].run = data[0].run;
-
-
       });
       let sql5 =
         "select * FROM DATA WHERE deviceName ='PAU02'  ORDER BY saveTime DESC LIMIT 1";
@@ -747,23 +830,23 @@ export default {
         );
 
         this_.newweizhi[33].airPressure = data[0].p1;
-        this_.newweizhi[33].ifshow = this_.returnifShow(999,999,data[0].p5);
+        this_.newweizhi[33].ifshow = this_.returnifShow(999, 999, data[0].p5);
         this_.newweizhi[33].run = data[0].run;
 
         this_.newweizhi[34].airPressure = data[0].p2;
-        this_.newweizhi[34].ifshow = this_.returnifShow(999,999,data[0].p5);
+        this_.newweizhi[34].ifshow = this_.returnifShow(999, 999, data[0].p5);
         this_.newweizhi[34].run = data[0].run;
 
         this_.newweizhi[35].airPressure = data[0].p3;
-        this_.newweizhi[35].ifshow = this_.returnifShow(999,999,data[0].p5);
+        this_.newweizhi[35].ifshow = this_.returnifShow(999, 999, data[0].p5);
         this_.newweizhi[36].run = data[0].run;
 
         this_.newweizhi[37].airPressure = data[0].p5;
-        this_.newweizhi[37].ifshow = this_.returnifShow(999,999,data[0].p5);
+        this_.newweizhi[37].ifshow = this_.returnifShow(999, 999, data[0].p5);
         this_.newweizhi[37].run = data[0].run;
 
         this_.newweizhi[38].airPressure = data[0].p6;
-        this_.newweizhi[38].ifshow = this_.returnifShow(999,999,data[0].p5);
+        this_.newweizhi[38].ifshow = this_.returnifShow(999, 999, data[0].p5);
         this_.newweizhi[38].run = data[0].run;
 
         // this_.newweizhi[37].airPressure = data[0].p1;
@@ -1045,10 +1128,11 @@ li {
         position: absolute;
         z-index: 99;
         width: 90px;
-        left: 30px;
+        left: 0px;
         top: 0px;
         color: black;
         opacity: 0;
+        padding-left: 20px;
       }
       .content:hover {
         opacity: 1;

src/views/infosManage/externalFiles/externalFiles.vue

@@ -76,12 +76,12 @@ export default {
                     forms: [
                         { prop: 'fileCode', label: '文件编号' },
                         { prop: 'fileName', label: '文件名称' },
-                        { prop: 'deptName', label: '部门' },
+                        // { prop: 'deptName', label: '部门' },
                     ]
                 },
                 // 表格字段配置
                 columns: [
-                    { prop: 'zi_duan_yi_', label: '部门' },
+                    // { prop: 'zi_duan_yi_', label: '部门' },
                     { prop: 'wen_jian_bian_hao', label: '文件编号' },
                     { prop: 'wen_jian_ming_che', label: '文件名称' },
                     { prop: 'ban_ben_hao_', label: '版本号' },

src/views/infosManage/internalFiles/internalFiles.vue

@@ -86,12 +86,12 @@ export default {
                     forms: [
                         { prop: 'fileCode', label: '文件编号' },
                         { prop: 'fileName', label: '文件名称' },
-                        { prop: 'deptName', label: '部门' },
+                        // { prop: 'deptName', label: '部门' },
                     ]
                 },
                 // 表格字段配置
                 columns: [
-                    { prop: 'zi_duan_yi_', label: '部门' },
+                    // { prop: 'zi_duan_yi_', label: '部门' },
                     { prop: 'wen_jian_bian_hao', label: '文件编号' },
                     { prop: 'wen_jian_ming_che', label: '文件名称' },
                     { prop: 'ban_ben_hao_', label: '版本号' },

src/views/platform/bpmn/bpmInstHis/list.vue

@@ -2,106 +2,57 @@
   <div class="main-container">
 
     <div slot="west">
-      <ibps-type-tree
-        :width="width"
-        :height="height"
-        title="记录分类"
-        :location="location"
-        category-key="FLOW_TYPE"
-        @node-click="handleNodeClick"
-        @expand-collapse="handleExpandCollapse"
-      />
+      <ibps-type-tree :width="width" :height="height" title="记录分类" :location="location" category-key="FLOW_TYPE"
+        @node-click="handleNodeClick" @expand-collapse="handleExpandCollapse" />
     </div>
-    <ibps-crud
-      v-if="!listType"
-      ref="crud"
-      :style="{ marginLeft: width+'px' }"
-      :height="height"
-      :data="listData"
-      :toolbars="listConfig.toolbars"
-      :search-form="listConfig.searchForm"
-      :pk-key="pkKey"
-      :displayField = "tableTitle"
-      :columns="listConfig.columns"
-      :row-handle="listConfig.rowHandle"
-      :pagination="pagination"
-      :loading="loading"
-      :index-row="false"
-      :selection-row="selection"
-      @action-event="handleAction"
-      @sort-change="handleSortChange"
-      @column-link-click="handleLinkClick"
-      @pagination-change="handlePaginationChange"
-    >
+    <ibps-crud v-if="!listType" ref="crud" :style="{ marginLeft: width + 'px' }" :height="height" :data="listData"
+      :toolbars="listConfig.toolbars" :search-form="listConfig.searchForm" :pk-key="pkKey" :displayField="tableTitle"
+      :columns="listConfig.columns" :row-handle="listConfig.rowHandle" :pagination="pagination" :loading="loading"
+      :index-row="false" :selection-row="selection" @action-event="handleAction" @sort-change="handleSortChange"
+      @column-link-click="handleLinkClick" @pagination-change="handlePaginationChange">
 
-    <template slot="selectCont" slot-scope="scope">
-      <el-popover
-        :ref="'popover2-' + scope.row.id"
-        placement="bottom"
-        width="250"
-        popper-class="popverClass"
-        trigger="click"
-        @show="getReportAndFile(scope.row)"
-      >
-        <!-- 触发事件 --> <!-- @click="handleAction('detail',null,null,scope.row)"-->
-        <div class="div_test el-icon-s-order" slot="reference" >查阅记录</div>
-        <!-- 弹框内容 -->
-        <div class="div_content">
-          <!-- 获取所有输出报告-->
-          <div class="content_butts" v-if="currReportCont.report.length>0" v-for="(item, i) in currReportCont.report">
-            <span style="cursor: pointer;" @click="clickCont(currReportCont,i)">
-             <i class="el-icon-tickets" style="font-size: 18px;"/>
-            {{item.split('/')[1].split('.')[0].split(' ')[1]}}
-            </span>
-            <br>
-          </div>
+      <template slot="selectCont" slot-scope="scope">
+        <el-popover :ref="'popover2-' + scope.row.id" placement="bottom" width="250" popper-class="popverClass"
+          trigger="click" @show="getReportAndFile(scope.row)">
+          <!-- 触发事件 --> <!-- @click="handleAction('detail',null,null,scope.row)"-->
+          <div class="div_test el-icon-s-order" slot="reference">查阅记录</div>
+          <!-- 弹框内容 -->
+          <div class="div_content">
+            <!-- 获取所有输出报告-->
+            <div class="content_butts" v-if="currReportCont.report.length > 0"
+              v-for="(item, i) in currReportCont.report">
+              <span style="cursor: pointer;" @click="clickCont(currReportCont, i)">
+                <i class="el-icon-tickets" style="font-size: 18px;" />
+                {{ item.slice(-item.split("").reverse().join("").indexOf(' '),
+                    -item.split("").reverse().join("").indexOf('.') - 1)
+                }}
+                <!-- {{ item.split('/')[1].split('.')[0].split(' ')[1] }} -->
+              </span>
+              <br>
+            </div>
 
-          <div class="content_butts" v-if="currReportCont.file">
-           <ibps-attachment v-model="fileId" placeholder="请选择" :download="true"  :readonly="true"
-             accept="*" :multiple="true" upload-type="attachment" store="id" media-type=""
-             media="" style="width:100%;" />
-          </div>
+            <div class="content_butts" v-if="currReportCont.file">
+              <ibps-attachment v-model="fileId" placeholder="请选择" :download="true" :readonly="true" accept="*"
+                :multiple="true" upload-type="attachment" store="id" media-type="" media="" style="width:100%;" />
+            </div>
 
 
-        </div>
-      </el-popover>
-    </template>
+          </div>
+        </el-popover>
+      </template>
 
     </ibps-crud>
-     <typeList
-        v-else
-       :listType="listType"
-       :tableTitle ="tableTitle"
-       :reportAll = "reportAll"
-       :typeId = "typeId"
-       />
+    <typeList v-else :listType="listType" :tableTitle="tableTitle" :reportAll="reportAll" :typeId="typeId" />
 
-    <bpmn-formrender
-      :visible="dialogFormVisible"
-      :instance-id="instanceId"
-      @close="visible => dialogFormVisible = visible"
-    />
+    <bpmn-formrender :visible="dialogFormVisible" :instance-id="instanceId"
+      @close="visible => dialogFormVisible = visible" />
 
-        <el-dialog
-          :close-on-click-modal="false"
-          :close-on-press-escape="false"
-          :top="'3vh'"
-          :width="'90%'"
-          class="js-custom-dialog"
-          append-to-body
-          :fullscreen="false"
-          :visible.sync="visible"
-        >
+    <el-dialog :close-on-click-modal="false" :close-on-press-escape="false" :top="'3vh'" :width="'90%'"
+      class="js-custom-dialog" append-to-body :fullscreen="false" :visible.sync="visible">
 
-            <iframe
-              :src="srcUrl"
-              :height="'100%'"
-              :width="'100%'"
-              frameborder="0"
-              scrolling="no"
-            />
+      <iframe :src="srcUrl" :height="'100%'" :width="'100%'" frameborder="0" scrolling="no" />
 
-      </el-dialog>
+    </el-dialog>
 
   </div>
 
@@ -124,35 +75,35 @@ export default {
     IbpsTypeTree,
     BpmnFormrender,
     typeList,
-   'ibps-attachment': IbpsAttachment
+    'ibps-attachment': IbpsAttachment
   },
-  mixins: [FixHeight,GetReport],
-  props:{
-    location:{
-      type:String,
+  mixins: [FixHeight, GetReport],
+  props: {
+    location: {
+      type: String,
       default: 'initial'
     }
   },
   data() {
     return {
       width: 200,
-      selection : false,
+      selection: false,
       dialogFormVisible: false, // 弹窗
       instanceId: '', // 编辑dialog需要使用
       pkKey: 'id', // 主键  如果主键不是pk需要传主键
-      tableTitle:'',
-      typeId:'',
-      listType:'',
-      srcUrl:'', //报表字段
-      fileId:'',//文件字段
-      isDisable:false, //判断多次点击
-      forClick:'',//判断是否重复点击
-      visible:false,
-      currReportCont:{},
+      tableTitle: '',
+      typeId: '',
+      listType: '',
+      srcUrl: '', //报表字段
+      fileId: '',//文件字段
+      isDisable: false, //判断多次点击
+      forClick: '',//判断是否重复点击
+      visible: false,
+      currReportCont: {},
       title: '',
       loading: true,
       height: document.clientHeight,
-      reportAll:[],
+      reportAll: [],
       listData: [],
       pagination: {},
       sorts: {},
@@ -163,36 +114,36 @@ export default {
         ],
         searchForm: {
           forms: [
-          { prop: 'Q^subject_^SL', label: '关键字:' , width: 125 },
-         /*  { prop: 'Q^proc_def_name_^SL', label: '任务名称' }, */
+            { prop: 'Q^subject_^SL', label: '关键字:', width: 125 },
+            /*  { prop: 'Q^proc_def_name_^SL', label: '任务名称' }, */
             // {
             //   prop: ['Q^create_Time_^DL', 'Q^create_Time_^DG'],
             //   label: '完成年度',
             //   fieldType: 'daterange',
             // },
-          /*  {
-              prop: 'Q^status_^S',
-              label: '任务状态',
-              fieldType: 'select',
-              options: searchOptions
-            } */
+            /*  {
+                prop: 'Q^status_^S',
+                label: '任务状态',
+                fieldType: 'select',
+                options: searchOptions
+              } */
           ]
         },
         // 表格字段配置
         columns: [
-         /* { prop: 'subject', label: '任务标题', link: 'dialog', width: 250 }, */
-          { prop: 'tYear', label: '年份', width: 58  },
-          { prop: 'tDept', label: '部门' , width: 80},
+          /* { prop: 'subject', label: '任务标题', link: 'dialog', width: 250 }, */
+          { prop: 'tYear', label: '年份', width: 58 },
+          { prop: 'tDept', label: '部门', width: 80 },
           { prop: 'procDefName', label: '表单名称' },
-          { prop: 'tUser', label: '编制人' , width: 80},
-          { prop: 'endTime', label: '完成时间', sortable: 'custom', dateFormat: 'yyyy-MM-dd', width:150 },
+          { prop: 'tUser', label: '编制人', width: 80 },
+          { prop: 'endTime', label: '完成时间', sortable: 'custom', dateFormat: 'yyyy-MM-dd', width: 150 },
         ],
         rowHandle: {
           actions: [/* {
             key: 'detail',label:"内容及附件"
           } */],
-           effect:'display',
-            width:'100'//固定按钮
+          effect: 'display',
+          width: '100'//固定按钮
         }
       }
     }
@@ -201,121 +152,121 @@ export default {
     this.loadData()
     this.getConfig() //获取配置的报表
     let roleArr = this.$store.getters.userInfo.role
-     // console.log(roleArr)
-     for(let i = 0 ; i < roleArr.length; i++){
-       if(roleArr[i].name == "系统管理角色"){
-         this.listConfig.toolbars.push({key:'remove'})
-         this.selection  = true
-         return;
-       }
-     }
+    // console.log(roleArr)
+    for (let i = 0; i < roleArr.length; i++) {
+      if (roleArr[i].name == "系统管理角色") {
+        this.listConfig.toolbars.push({ key: 'remove' })
+        this.selection = true
+        return;
+      }
+    }
   },
   methods: {
     /*获取配置报表数据*/
-    getConfig(){
-      curdPost('select',this.packNameWhere('t_lcidglbdbb',{'1':'1'})).then(response => {
-                 this.reportAll = response.variables.data
-               })
-      },
-      /* 封装表名与条件*/
-      packNameWhere(name,where){
-        let cont = {}
-        cont['tableName'] = name
-        cont['paramWhere'] = where
-        return cont
-      },
+    getConfig() {
+      curdPost('select', this.packNameWhere('t_lcidglbdbb', { '1': '1' })).then(response => {
+        this.reportAll = response.variables.data
+      })
+    },
+    /* 封装表名与条件*/
+    packNameWhere(name, where) {
+      let cont = {}
+      cont['tableName'] = name
+      cont['paramWhere'] = where
+      return cont
+    },
     // 加载数据
     loadData() {
       this.loading = true
       queryPageList(this.getSearcFormData()).then(response => {
-       let data = response.data.dataResult
-        for(let i in data){
-         let dept,user,tName,tYear
-         let arr = this.getParenthesesStr(data[i].subject)
-            if(arr.length ==4){ //如果是年度计划， 标题编辑中取年份， 去除默认给与的年份
-              data[i]['tYear'] = arr[0]
-              data[i]['tDept'] = arr[2]
-              data[i]['tUser'] = arr[3]
-            }else if(arr.length>1){
-               data[i]['tYear'] = arr[0]
-               data[i]['tDept'] = arr[1]
-               data[i]['tUser'] = arr[2]
-             }
+        let data = response.data.dataResult
+        for (let i in data) {
+          let dept, user, tName, tYear
+          let arr = this.getParenthesesStr(data[i].subject)
+          if (arr.length == 4) { //如果是年度计划， 标题编辑中取年份， 去除默认给与的年份
+            data[i]['tYear'] = arr[0]
+            data[i]['tDept'] = arr[2]
+            data[i]['tUser'] = arr[3]
+          } else if (arr.length > 1) {
+            data[i]['tYear'] = arr[0]
+            data[i]['tDept'] = arr[1]
+            data[i]['tUser'] = arr[2]
           }
-          // console.log('csnz\n',response.data,'\n')
+        }
+        // console.log('csnz\n',response.data,'\n')
         ActionUtils.handleListData(this, response.data)
         this.loading = false
       }).catch(() => {
         this.loading = false
       })
     },
-   getParenthesesStr(text) {
-        let result = ''
-        if (!text) return result
-        let regex = /\((.+?)\)/g;
-        let options = text.match(regex)
-        if (options) {
-            let option = options[0]
-            if (option) {
-                result = option.substring(1, option.length - 1)
-            }
-            if(options[1]){
-              let yersOption = options[1]
-              if (yersOption) {
-                  result =result +'/'+ yersOption.substring(1, yersOption.length - 1)
-              }
-            }
+    getParenthesesStr(text) {
+      let result = ''
+      if (!text) return result
+      let regex = /\((.+?)\)/g;
+      let options = text.match(regex)
+      if (options) {
+        let option = options[0]
+        if (option) {
+          result = option.substring(1, option.length - 1)
         }
-        return result.split('/')
+        if (options[1]) {
+          let yersOption = options[1]
+          if (yersOption) {
+            result = result + '/' + yersOption.substring(1, yersOption.length - 1)
+          }
+        }
+      }
+      return result.split('/')
     },
     /**
      * 获取格式化参数
      */
     getSearcFormData() {
-        const params = this.$refs['crud'] ? this.$refs['crud'].getSearcFormData() : {}
+      const params = this.$refs['crud'] ? this.$refs['crud'].getSearcFormData() : {}
 
-        if (this.$utils.isNotEmpty(this.typeId)) {
-          params['Q^TYPE_ID_^S'] = this.typeId
-        }
+      if (this.$utils.isNotEmpty(this.typeId)) {
+        params['Q^TYPE_ID_^S'] = this.typeId
+      }
 
-        params['Q^status_^S'] ="end"
-       let cont = ActionUtils.formatParams(
-          params,
-          this.pagination,
-          this.sorts)
+      params['Q^status_^S'] = "end"
+      let cont = ActionUtils.formatParams(
+        params,
+        this.pagination,
+        this.sorts)
 
-          cont.parameters.push({
-                            "parameters": [
-                                {
-                                    "parameters": [
-                                        {
-                                            "key": "Q^proc_Def_Key_^NE",
-                                            "value": "Process_08hbmhs",
-                                            "param": "name"
-                                        }
-                                    ]
-                                },
-                                {
-                                    "parameters": [
-                                        {
-                                            "key": "Q^proc_Def_Key_^NE",
-                                            "value": "Process_0xlaidt",
-                                            "param": "name1"
-                                        }
-                                    ]
-                                },
-                                {
-                                    "parameters": [
-                                        {
-                                            "key": "Q^proc_Def_Key_^NE",
-                                            "value": "Process_0ocg0f1",
-                                            "param": "name2"
-                                        }
-                                    ]
-                                }
-                            ]
-                        })
-           return cont
+      cont.parameters.push({
+        "parameters": [
+          {
+            "parameters": [
+              {
+                "key": "Q^proc_Def_Key_^NE",
+                "value": "Process_08hbmhs",
+                "param": "name"
+              }
+            ]
+          },
+          {
+            "parameters": [
+              {
+                "key": "Q^proc_Def_Key_^NE",
+                "value": "Process_0xlaidt",
+                "param": "name1"
+              }
+            ]
+          },
+          {
+            "parameters": [
+              {
+                "key": "Q^proc_Def_Key_^NE",
+                "value": "Process_0ocg0f1",
+                "param": "name2"
+              }
+            ]
+          }
+        ]
+      })
+      return cont
 
     },
     /**
@@ -342,11 +293,11 @@ export default {
       this.loadData()
     },
     /* 防止多次快速查询*/
-    numbersClick(){
+    numbersClick() {
       this.isDisable = true
-          setTimeout(() => {
-           this.isDisable = false
-          }, 600)
+      setTimeout(() => {
+        this.isDisable = false
+      }, 600)
     },
 
     /**
@@ -364,31 +315,31 @@ export default {
         //   this.search()
         //   break
         case 'remove':
-           let str = ""
-           selection.forEach((item,index)=>{
-             if(index==0){
-               str+=item
-             }else{
-               str+=","+item
-             }
-           })
-           let data={}
-           data['tableName']="ibps_bpm_inst_his"
-           data['paramWhere']="{id_:'"+str+"'}"
-           let this_ = this
-           curdPost('batchDelete',data).then( response => {
-               this_.$message({
-               message: '删除成功！',
-               type: 'warning'
-             })
-             this.search()
-           })
+          let str = ""
+          selection.forEach((item, index) => {
+            if (index == 0) {
+              str += item
+            } else {
+              str += "," + item
+            }
+          })
+          let data = {}
+          data['tableName'] = "ibps_bpm_inst_his"
+          data['paramWhere'] = "{id_:'" + str + "'}"
+          let this_ = this
+          curdPost('batchDelete', data).then(response => {
+            this_.$message({
+              message: '删除成功！',
+              type: 'warning'
+            })
+            this.search()
+          })
 
-             break
+          break
 
         case 'detail':// 明细
-         ActionUtils.selectedRecord(selection).then((id) => {
-          this.handleEdit(id)
+          ActionUtils.selectedRecord(selection).then((id) => {
+            this.handleEdit(id)
             this.title = '信息'
           }).catch(() => { })
           break
@@ -397,15 +348,15 @@ export default {
       }
     },
 
-    handleNodeClick(typeId,typeName) {
+    handleNodeClick(typeId, typeName) {
       this.tableTitle = typeName.name
       this.typeId = typeId
       // console.log(typeId)
       /* 如果是特殊处理添加列表中的数据*/
-      if(!listTypeData[typeId]){
+      if (!listTypeData[typeId]) {
         this.listType = ''
         this.loadData()
-      }else{
+      } else {
         this.listType = listTypeData[typeId]
       }
     },
@@ -423,49 +374,55 @@ export default {
 }
 </script>
 <style lang="scss" >
-.js-custom-dialog{
-  .el-dialog__body{
-      height:  calc(100vh) !important;
-      margin: -9px !important;
-      padding: 0px !important;
-	  overflow: hidden;
+.js-custom-dialog {
+  .el-dialog__body {
+    height: calc(100vh) !important;
+    margin: -9px !important;
+    padding: 0px !important;
+    overflow: hidden;
   }
-  .el-dialog__header{
+
+  .el-dialog__header {
     padding: 0px;
   }
+
   .el-dialog__headerbtn i {
-   font-size: 28px;
-   font-weight: bold;
-   background-color: #FFFFFF;
-   border-radius: 8px;
-   margin-top: -8px;
+    font-size: 28px;
+    font-weight: bold;
+    background-color: #FFFFFF;
+    border-radius: 8px;
+    margin-top: -8px;
   }
 }
 </style>
 <style>
-   .main-container .div_test{
-     cursor: pointer;
-   }
-   .main-container .el-popover.popverClass {
-     .div_content {
-       .content_checkbox {
-         .el-checkbox-group {
-           display: flex;
-           flex-direction: column;
-           z-index: 999;
-         }
-         z-index: 999;
-       }
-        .content_butts {
-          z-index: 999;
-             margin-top: 20px;
-             display: flex;
-             justify-content: flex-end;
-             .el-button {
-               padding: 7px 14px;
-              }
-            }
-          }
+.main-container .div_test {
+  cursor: pointer;
+}
 
-       }
+.main-container .el-popover.popverClass {
+  .div_content {
+    .content_checkbox {
+      .el-checkbox-group {
+        display: flex;
+        flex-direction: column;
+        z-index: 999;
+      }
+
+      z-index: 999;
+    }
+
+    .content_butts {
+      z-index: 999;
+      margin-top: 20px;
+      display: flex;
+      justify-content: flex-end;
+
+      .el-button {
+        padding: 7px 14px;
+      }
+    }
+  }
+
+}
 </style>

src/views/remindPage/sealCompleted.vue

@@ -3,7 +3,7 @@
         <div class="center">
             <img class="ok-img" src="../../assets/images/success/completed.png" alt="">
             <div>
-                签章已经完成，请关闭当前页面，回到上个页面继续检测流程
+                签章已经完成，请关闭当前页面，回到上个页面继续操作
             </div>
         </div>
     </div>

src/views/sample/reservedSample.vue

@@ -157,11 +157,12 @@
                     :key="ind"
                     :style="{
                       background:
-                        it.wei_zhi_zhuang_ta == '空余' ? '#E6A23C' : '',
+                        it.yang_pin_bian_hao ? '#E6A23C' : '',
                     }"
                   >
                     <div class="top-dsc">
                       <div class="position">
+                        <p>{{it.wei_zhi_zhuang_ta }}</p>
                         <p>存放位置：{{ it.wei_zhi_bian_hao_ }}</p>
                         <p>样品编号：{{ it.yang_pin_bian_hao }}</p>
                         <p>
@@ -189,7 +190,7 @@
                       </div>
                       <div class="right-content">
                         <p>
-                          {{ it.wei_zhi_zhuang_ta || it.yang_pin_ming_che }}
+                          {{ it.yang_pin_ming_che|| it.wei_zhi_zhuang_ta  }}
                         </p>
                       </div>
                       <!-- <div class="condition">{{ it.cun_chu_tiao_jian }}</div> -->
@@ -281,7 +282,7 @@ export default {
       curdPost("sql", sqlString)
         .then((response) => {
           this_.sampleOption = response.variables.data;
-          this_.sampleOption.pop();
+          // this_.sampleOption.pop();
         })
     },
     onSubmits(sql) {

src/views/system/jbdScan/goods/caigourukudan.vue

@@ -17,16 +17,16 @@
               style="margin-bottom: 30px"
             >
               <div style="page-break-after: always">
-                <!-- <div class="tagBox">
-                  <div>供应商:{{item1[0].gong_ying_shang_}}</div>
-                  <div style="  margin-left: 20px;">采购订单编号{{item1[0].cai_gou_ding_dan_}}</div>
-                  <div style="  margin-left: 20px;">入库日期{{item1[0].dao_ku_ri_qi_}}</div>
-                </div> -->
                 <div class="word-title">
                   <h4>采购入库单</h4>
                 </div>
                 <div class="tagBox">
                   <div>
+                    <div style="font-size: 10px">
+                      申购部门:<span style="margin-left: 10px">{{
+                        item1[0].shen_gou_bu_men_ | bumenfilters(bumenList)
+                      }}</span>
+                    </div>
                     <div style="font-size: 10px">
                       供应商:<span style="margin-left: 10px">{{
                         item1[0].gong_ying_shang_
@@ -53,7 +53,7 @@
                         font-size: 10px;
                       "
                     >
-                      日期:<span style="margin-left: 10px">{{
+                      日期　　　:<span style="margin-left: 10px">{{
                         item1[0].dao_ku_ri_qi_
                       }}</span>
                     </div>
@@ -98,7 +98,9 @@
                           {{ item1[0].dao_huo_shu_liang }}
                         </td>
                         <td style="width: 60px">{{ item1[0].dan_wei_ }}</td>
-                        <td style="width: 60px">{{ item1[0].dan_jia_han_shui_ }}</td>
+                        <td style="width: 60px">
+                          {{ item1[0].dan_jia_han_shui_ }}
+                        </td>
                         <td style="width: 45px">{{ item1[0].shui_lv_ }}</td>
                         <td style="width: 45px">{{ item1[0].dan_jia_ }}</td>
                         <td style="width: 45px">{{ item1[0].shui_e_ }}</td>
@@ -107,18 +109,24 @@
                           {{ item1[0].han_shui_he_ji_ }}
                         </td>
                       </tr>
-                    </tbody>
-                    <tfoot
-                      align="right"
-                      valign="bottom"
-                      style="text-align: right !important; height: 30px"
-                    >
                       <tr>
-                        <td colspan="15" style="text-align: right !important">
-                          合计：{{ item1.heji }}
-                        </td>
+                        <td style="width: 30px"></td>
+                        <td style="width: 70px"></td>
+                        <td style="width: 120px"></td>
+                        <td style="width: 60px"></td>
+                        <td style="width: 60px"></td>
+                        <td style="width: 80px"></td>
+                        <td style="width: 120px"></td>
+                        <td style="width: 45px"></td>
+                        <td style="width: 45px"></td>
+                        <td style="width: 60px"></td>
+                        <td style="width: 45px"></td>
+                        <td style="width: 45px">合计：</td>
+                        <td style="width: 45px">{{ item1.addshuie }}</td>
+                        <td style="width: 45px">{{ item1.addjine }}</td>
+                        <td style="width: 60px">{{ item1.addhanshuiheji }}</td>
                       </tr>
-                    </tfoot>
+                    </tbody>
                   </table>
                 </div>
                 <div class="bottom">
@@ -181,6 +189,7 @@ export default {
       list: [],
       visible: true,
       gongyingshangList: [],
+      bumenList: [],
     };
   },
   created() {
@@ -189,20 +198,36 @@ export default {
     repostCurd("sql", sql).then((res) => {
       return (this.gongyingshangList = res.variables.data);
     });
+    let sql1 = `select ID_,NAME_ FROM  ibps_party_org `;
+    repostCurd("sql", sql1).then((res) => {
+      return (this.bumenList = res.variables.data);
+    });
   },
   filters: {
     gongyingshang: function (value, list) {
-      if (!isNaN(value)) {
-        for (let i = 0; i < list.length; i++) {
-          if (value == list[i].id_) {
-            return list[i].gong_ying_shang_m;
-          }
+      for (let i = 0; i < list.length; i++) {
+        if (value == list[i].id_) {
+          return list[i].gong_ying_shang_m;
+        } else if (i == list.length - 1) {
+          return value;
+        }
+      }
+    },
+    bumenfilters: function (value, list) {
+      for (let i = 0; i < list.length; i++) {
+        if (value == list[i].ID_) {
+          return list[i].NAME_;
+        } else if (i == list.length - 1) {
+          return value;
         }
-      } else {
-        return value;
       }
     },
   },
+  watch: {
+    obj() {
+      this.getInit();
+    },
+  },
   methods: {
     printDemo() {
       this.$refs.easyPrint.print();
@@ -227,46 +252,75 @@ export default {
       let b = parseFloat(num2);
       return a.toFixed("2") * 1 + b.toFixed("2") * 1;
     },
+    toDecimal2(x) {
+      var f = parseFloat(x);
+      if (isNaN(f)) {
+        return false;
+      }
+      var f = Math.round(x * 100) / 100;
+      var s = f.toString();
+      var rs = s.indexOf(".");
+      if (rs < 0) {
+        rs = s.length;
+        s += ".";
+      }
+      while (s.length <= rs + 2) {
+        s += "0";
+      }
+      return s;
+    },
     getInit() {
-      // console.log(this.obj)
       // var idStr = "";
       // this.obj.forEach((item) => {
       //   idStr += item + ",";
       // });
       // idStr = idStr.substring(0, idStr.length - 1);
-
       this.getLook(this.obj);
     },
     getLook(id) {
+      this.list = [];
       let this_ = this;
       let name1, name2, name3;
       let time1, time2, time3;
-      let chushi =0;
       id.forEach((item) => {
         let sql = `select * FROM t_wljsysjlb WHERE id_='${item}'`;
         repostCurd("sql", sql).then((res) => {
           let data = res.variables.data;
           // let s2 = `select NAME_,CREATE_TIME_ FROM ibps_party_employee where id_ =(select CREATE_BY_ FROM ibps_bpm_oper_log WHERE PROC_INST_ID_ = (SELECT PROC_INST_ID_ FROM ibps_bpm_bus_rel WHERE BUSINESSKEY_ = '${item}' )AND NODE_ID_ = 'Activity_1pha4py' ORDER BY CREATE_TIME_ DESC LIMIT 1)`;
-          let s2 = `select a.NAME_,DATE_FORMAT(b.CREATE_TIME_,'%Y年%m月%d日') AS CREATE_TIME_ FROM ibps_party_employee  as a join ibps_bpm_oper_log as b on a.ID_ = b.CREATE_BY_ where b.PROC_INST_ID_ = ( SELECT  PROC_INST_ID_  FROM ibps_bpm_bus_rel WHERE BUSINESSKEY_ = '${item}') AND b.NODE_ID_ = 'Activity_1pha4py' ORDER BY b.CREATE_TIME_ DESC LIMIT 1`;
+          let s2 = `select a.NAME_,DATE_FORMAT(b.CREATE_TIME_,'%Y-%m-%d') AS CREATE_TIME_ FROM ibps_party_employee  as a join ibps_bpm_oper_log as b on a.ID_ = b.CREATE_BY_ where b.PROC_INST_ID_ = ( SELECT  PROC_INST_ID_  FROM ibps_bpm_bus_rel WHERE BUSINESSKEY_ = '${item}') AND b.NODE_ID_ = 'Activity_1pha4py' ORDER BY b.CREATE_TIME_ DESC LIMIT 1`;
           repostCurd("sql", s2).then((res) => {
-
             name2 = res.variables.data[0].NAME_ || 0;
             time2 = res.variables.data[0].CREATE_TIME_ || 0;
             data["name2"] = name2;
             data["time2"] = time2;
+            let addhanshuiheji = 0;
+            let addjine = 0;
+            let addshuie = 0;
             // let s3 = `select NAME_,CREATE_TIME_ FROM ibps_party_employee where id_ =(select CREATE_BY_ FROM ibps_bpm_oper_log WHERE PROC_INST_ID_ = (SELECT PROC_INST_ID_ FROM ibps_bpm_bus_rel WHERE BUSINESSKEY_ = '${item}' )AND NODE_ID_ = 'Activity_04ff3k5' ORDER BY CREATE_TIME_ DESC LIMIT 1)`;
-            let s3 = `select a.NAME_,DATE_FORMAT(b.CREATE_TIME_,'%Y年%m月%d日') AS CREATE_TIME_ FROM ibps_party_employee  as a join ibps_bpm_oper_log as b on a.ID_ = b.CREATE_BY_ where b.PROC_INST_ID_ = ( SELECT  PROC_INST_ID_  FROM ibps_bpm_bus_rel WHERE BUSINESSKEY_ = '${item}') AND b.NODE_ID_ = 'Activity_04ff3k5' ORDER BY b.CREATE_TIME_ DESC LIMIT 1`;
+            let s3 = `select a.NAME_,DATE_FORMAT(b.CREATE_TIME_,'%Y-%m-%d') AS CREATE_TIME_ FROM ibps_party_employee  as a join ibps_bpm_oper_log as b on a.ID_ = b.CREATE_BY_ where b.PROC_INST_ID_ = ( SELECT  PROC_INST_ID_  FROM ibps_bpm_bus_rel WHERE BUSINESSKEY_ = '${item}') AND b.NODE_ID_ = 'Activity_04ff3k5' ORDER BY b.CREATE_TIME_ DESC LIMIT 1`;
             repostCurd("sql", s3).then((res) => {
-
               name3 = res.variables.data[0].NAME_ || 0;
               time3 = res.variables.data[0].CREATE_TIME_ || 0;
               data["name3"] = name3;
               data["time3"] = time3;
               data.forEach((it) => {
-                data["heji"] = this.addNumber(chushi, it.jin_e_);
-                chushi = data["heji"];
+                data["addhanshuiheji"] = this.addNumber(
+                  addhanshuiheji,
+                  it.han_shui_he_ji_
+                );
+                data["addjine"] = this.addNumber(addjine, it.jin_e_);
+                data["addshuie"] = this.addNumber(addshuie, it.shui_e_);
+                addhanshuiheji = data["addhanshuiheji"];
+                addjine = data["addjine"];
+                addshuie = data["addshuie"];
               });
+              data["addhanshuiheji"] = this_.toDecimal2(data["addhanshuiheji"]);
+              data["addjine"] = this_.toDecimal2(data["addjine"]);
+              data["addshuie"] = this_.toDecimal2(data["addshuie"]);
               this_.list.push(data);
+              addhanshuiheji = 0;
+              addjine = 0;
+              addshuie = 0;
               console.log(this_.list);
             });
           });

src/views/system/jbdScan/goods/chnangguirukudan.vue

@@ -22,6 +22,11 @@
                 </div>
                 <div class="tagBox">
                   <div>
+                    <div style="font-size: 10px">
+                      申购部门:<span style="margin-left: 10px">{{
+                        item1.shen_gou_bu_men_|bumenfilters(bumenList)
+                      }}</span>
+                    </div>
                     <div style="font-size: 10px">
                       供应商:<span style="margin-left: 10px">{{
                         item1.gong_ying_shang_
@@ -48,7 +53,7 @@
                         font-size: 10px;
                       "
                     >
-                      日期:<span style="margin-left: 10px">{{
+                      日期 :<span style="margin-left: 10px">{{
                         item1.dao_huo_ri_qi_
                       }}</span>
                     </div>
@@ -90,25 +95,33 @@
                         </td>
                         <td style="width: 45px">{{ item.shu_liang_ }}</td>
                         <td style="width: 45px">{{ item.dan_wei_ }}</td>
-                        <td style="width: 60px">{{ item.dan_jia_han_shui_ }}</td>
+                        <td style="width: 60px">
+                          {{ item.dan_jia_han_shui_ }}
+                        </td>
                         <td style="width: 45px">{{ item.shui_lv_ }}</td>
                         <td style="width: 45px">{{ item.dan_jia_ }}</td>
                         <td style="width: 45px">{{ item.shui_e_ }}</td>
                         <td style="width: 45px">{{ item.jin_e_ }}</td>
                         <td style="width: 60px">{{ item.han_shui_he_ji_ }}</td>
                       </tr>
-                    </tbody>
-                    <tfoot
-                      align="right"
-                      valign="bottom"
-                      style="text-align: right !important; height: 30px"
-                    >
                       <tr>
-                        <td colspan="15" style="text-align: right !important">
-                          合计：{{ item1.heji }}
-                        </td>
+                        <td style="width: 30px"></td>
+                        <td style="width: 70px"></td>
+                        <td style="width: 120px"></td>
+                        <td style="width: 60px"></td>
+                        <td style="width: 60px"></td>
+                        <td style="width: 80px"></td>
+                        <td style="width: 120px"></td>
+                        <td style="width: 45px"></td>
+                        <td style="width: 45px"></td>
+                        <td style="width: 60px"></td>
+                        <td style="width: 45px"></td>
+                        <td style="width: 45px">合计：</td>
+                        <td style="width: 45px">{{ item1.addshuie }}</td>
+                        <td style="width: 45px">{{ item1.addjine }}</td>
+                        <td style="width: 60px">{{ item1.addhanshuiheji }}</td>
                       </tr>
-                    </tfoot>
+                    </tbody>
                   </table>
                 </div>
                 <div class="bottom">
@@ -172,6 +185,7 @@ export default {
       list: [],
       visible: true,
       gongyingshangList: [],
+      bumenList: [],
     };
   },
   created() {
@@ -180,27 +194,60 @@ export default {
     repostCurd("sql", sql).then((res) => {
       this.gongyingshangList = res.variables.data;
     });
+    let sql1 = `select ID_,NAME_ FROM  ibps_party_org `;
+    repostCurd("sql", sql1).then((res) => {
+      return (this.bumenList = res.variables.data);
+    });
   },
   filters: {
     gongyingshang: function (value, list) {
-      console.log(value);
-      if (!isNaN(value)) {
-        for (let i = 0; i < list.length; i++) {
-          console.log(value == list[i].id_);
-          if (value == list[i].id_) {
-            return list[i].gong_ying_shang_m;
-          }
+      for (let i = 0; i < list.length; i++) {
+        if (value == list[i].id_) {
+          return list[i].gong_ying_shang_m;
+        } else if (i == list.length - 1) {
+          return value;
+        }
+      }
+    },
+    bumenfilters: function (value, list) {
+      // debugger
+      for (let i = 0; i < list.length; i++) {
+        if (value == list[i].ID_) {
+          return list[i].NAME_;
+        } else if (i == list.length - 1) {
+          return value;
         }
-      } else {
-        return value;
       }
     },
   },
+
+  watch: {
+    obj() {
+      this.getInit();
+    },
+  },
   methods: {
     printDemo() {
       this.$refs.easyPrint.print();
       // this.$refs.easyPrint.window.print()
     },
+    toDecimal2(x) {
+      var f = parseFloat(x);
+      if (isNaN(f)) {
+        return false;
+      }
+      var f = Math.round(x * 100) / 100;
+      var s = f.toString();
+      var rs = s.indexOf(".");
+      if (rs < 0) {
+        rs = s.length;
+        s += ".";
+      }
+      while (s.length <= rs + 2) {
+        s += "0";
+      }
+      return s;
+    },
     addNumber(num1, num2) {
       let a = parseFloat(num1);
       let b = parseFloat(num2);
@@ -212,48 +259,61 @@ export default {
         idStr += item + ",";
       });
       idStr = idStr.substring(0, idStr.length - 1);
-
       this.getLook(idStr);
     },
     getLook(id) {
+      this.list = [];
       let this_ = this;
-      console.log(id);
       let sql = `select * FROM t_yszb WHERE FIND_IN_SET(id_,'${id}')`;
       let zhubiao = [];
       let name1, name2, name3;
       let time1, time2, time3;
-      let chushi = 0;
+      let addhanshuiheji = 0;
+      let addjine = 0;
+      let addshuie = 0;
       repostCurd("sql", sql).then((res) => {
         zhubiao = res.variables.data;
         zhubiao.forEach((item) => {
           let sql1 = `select * FROM t_cgysjlb  WHERE FIND_IN_SET(wai_jian_,'${item.id_}')`;
           repostCurd("sql", sql1).then((res) => {
             let data = res.variables.data;
-            let s2 = `select a.NAME_,DATE_FORMAT(b.CREATE_TIME_,'%Y年%m月%d日') AS CREATE_TIME_ FROM ibps_party_employee  as a join ibps_bpm_oper_log as b on a.ID_ = b.CREATE_BY_ where b.PROC_INST_ID_ = ( SELECT  PROC_INST_ID_  FROM ibps_bpm_bus_rel WHERE BUSINESSKEY_ = '${item.id_}') AND b.NODE_ID_ = 'Activity_04lhxla' ORDER BY b.CREATE_TIME_ DESC LIMIT 1`;
+            let s2 = `select a.NAME_,DATE_FORMAT(b.CREATE_TIME_,'%Y-%m-%d') AS CREATE_TIME_ FROM ibps_party_employee  as a join ibps_bpm_oper_log as b on a.ID_ = b.CREATE_BY_ where b.PROC_INST_ID_ = ( SELECT  PROC_INST_ID_  FROM ibps_bpm_bus_rel WHERE BUSINESSKEY_ = '${item.id_}') AND b.NODE_ID_ = 'Activity_04lhxla' ORDER BY b.CREATE_TIME_ DESC LIMIT 1`;
             repostCurd("sql", s2).then((res) => {
-              console.log(res.variables.data);
               name2 = res.variables.data[0].NAME_;
               time2 = res.variables.data[0].CREATE_TIME_;
-              console.log(name2, "name2");
               data["name2"] = name2;
               data["time2"] = time2;
-              let s3 = `select a.NAME_,DATE_FORMAT(b.CREATE_TIME_,'%Y年%m月%d日') AS CREATE_TIME_ FROM ibps_party_employee  as a join ibps_bpm_oper_log as b on a.ID_ = b.CREATE_BY_ where b.PROC_INST_ID_ = ( SELECT  PROC_INST_ID_  FROM ibps_bpm_bus_rel WHERE BUSINESSKEY_ = '${item.id_}') AND b.NODE_ID_ = 'Activity_1dk76gy' ORDER BY b.CREATE_TIME_ DESC LIMIT 1`;
-              console.log(s3);
+              let s3 = `select a.NAME_,DATE_FORMAT(b.CREATE_TIME_,'%Y-%m-%d') AS CREATE_TIME_ FROM ibps_party_employee  as a join ibps_bpm_oper_log as b on a.ID_ = b.CREATE_BY_ where b.PROC_INST_ID_ = ( SELECT  PROC_INST_ID_  FROM ibps_bpm_bus_rel WHERE BUSINESSKEY_ = '${item.id_}') AND b.NODE_ID_ = 'Activity_1dk76gy' ORDER BY b.CREATE_TIME_ DESC LIMIT 1`;
               repostCurd("sql", s3).then((res) => {
                 name3 = res.variables.data[0].NAME_;
                 time3 = res.variables.data[0].CREATE_TIME_;
                 data["name3"] = name3;
                 data["time3"] = time3;
-                 data["gong_ying_shang_"] = item.gong_ying_shang_;
+                data["gong_ying_shang_"] = item.gong_ying_shang_;
+                data["shen_gou_bu_men_"] = item.shen_gou_bu_men_;
                 data["cai_gou_ding_dan_"] = item.cai_gou_ding_dan_;
                 data["dao_huo_ri_qi_"] = item.dao_huo_ri_qi_;
                 data.forEach((it) => {
-                  debugger
-                  data["heji"] = this.addNumber(chushi, it.jin_e_);
-                  chushi = data["heji"];
+                  data["addhanshuiheji"] = this.addNumber(
+                    addhanshuiheji,
+                    it.han_shui_he_ji_
+                  );
+                  data["addjine"] = this.addNumber(addjine, it.jin_e_);
+                  data["addshuie"] = this.addNumber(addshuie, it.shui_e_);
+                  addhanshuiheji = data["addhanshuiheji"];
+                  addjine = data["addjine"];
+                  addshuie = data["addshuie"];
                 });
+                data["addhanshuiheji"] = this_.toDecimal2(
+                  data["addhanshuiheji"]
+                );
+                data["addjine"] = this_.toDecimal2(data["addjine"]);
+                data["addshuie"] = this_.toDecimal2(data["addshuie"]);
                 this_.list.push(data);
-                console.log(this_.list, 1111111111);
+                addhanshuiheji = 0;
+                addjine = 0;
+                addshuie = 0;
+                console.log(this_.list);
               });
             });
           });

src/views/system/jbdScan/goods/fenzhuangtag.vue

@@ -1,8 +1,8 @@
 <template>
   <div class="bg">
     <el-dialog
-      width="18cm"
-      height="30cm"
+      width="21cm"
+      height="12cm"
       :modal-append-to-body="false"
       title="物料标签"
       :visible.sync="scanVisible"
@@ -11,16 +11,38 @@
       <div style="height: 500px; width: 100%">
         <div ref="qrcode" id="box">
           <vue-easy-print tableShow ref="easyPrint" :onePageRow="onePageRow">
-            <div v-for="(item1, index1) in list" :key="index1" class="box-content" >
+            <div
+              v-for="(item1, index1) in list"
+              :key="index1"
+              class="box-content"
+            >
               <div
                 v-for="(item2, index2) in parseInt(item1.shu_liang_)"
-                :key="index2"               >
-                <div class="tagBox" >
+                :key="index2"
+                style="display: inline-block"
+              >
+                <div class="tagBox">
                   <div class="logo">
-                    <img style="width: 90px; height: 20px" src="./ming.jpg" alt="" />
+                    <img
+                      style="width: 90px; height: 20px"
+                      src="./ming.jpg"
+                      alt=""
+                    />
                   </div>
-                  <div class="lh">
-                    <div>物料名称：{{ item1.fen_zhuang_wu_lia }}{{ index2 }}</div>
+                  <div class="la">
+                    <div
+                      style="
+                        display: flex;
+                        justify-content: flex-start;
+                        text-align: left;
+                      "
+                    >
+                      <span> 物料名称：</span>
+                      <p style="width: 180px; margin: 0px">
+                        {{ item1.fen_zhuang_wu_lia }}
+                      </p>
+                      <!-- 物料名称：{{ item1.fen_zhuang_wu_lia }}{{ index2 }} -->
+                    </div>
                     <div></div>
                   </div>
                   <div class="la">
@@ -31,44 +53,69 @@
                       <div></div>
                     </div>
                   </div>
-                  <div class="la">
-                    <div class="lh">{{ item1.gui_ge_xing_hao_ }}</div>
-                  </div>
                   <div class="la">
                     <div class="lh">
-                      <div>货号：</div>
-                      <div>{{ item1.huo_hao_ }}</div>
+                      <div>规格：</div>
+                      <div>{{ item1.gui_ge_xing_hao_ }}</div>
                     </div>
-                   <div class="lh" style="margin-left: 2px">
-                      <div>批号：{{ item1.fen_zhuang_pi_hao }}</div>
+                  </div>
+                  <div class="la">
+                    <div style="display: flex">
+                      <div class="lh">
+                        <div>货号:</div>
+                        <div>{{ item1.huo_hao_ }}</div>
+                      </div>
+                      <div class="lh" style="margin-left: 2px">
+                        <div>批号:</div>
+                        <div>{{ item1.fen_zhuang_pi_hao }}</div>
+                      </div>
                     </div>
                   </div>
                   <div class="la">
-                    <div class="lh">
-                      <div>分装日期：{{ item1.parent_id_ | timesfiltes(listtimes) }}</div>
+                    <div style="display: flex">
+                      <div class="lh">
+                        <div>入库时间:</div>
+                        <div>
+                          {{ item1.parent_id_ | timesfiltes(listtimes) }}
+                        </div>
+                      </div>
                     </div>
-                    <div class="lh" style="margin-left: 2px">
-                      <div>有效期:</div>
-                      <div>{{ item1.you_xiao_qi_zhi_ }}</div>
+                  </div>
+                  <div class="la">
+                    <div style="display: flex">
+                      <div class="lh" style="margin-left: 2px">
+                        <div>有效期:</div>
+                        <div>{{ item1.you_xiao_qi_zhi_ }}</div>
+                      </div>
                     </div>
                   </div>
-                  <div class="lh">
-                    <div>含量浓度：</div>
-                    <div>{{ item1.han_liang_nong_du }}</div>
+                  <div class="la">
+                    <div class="lh">
+                      <div>含量浓度：</div>
+                      <div>{{ item1.han_liang_nong_du }}</div>
+                    </div>
                   </div>
-                  <div class="lh">
-                    <div>状态</div>
-                    <div></div>
+                  <div class="la">
+                    <div class="lh">
+                      <div>状态</div>
+                    </div>
+                    <!-- <div></div> -->
                   </div>
-                  <div class="lh" style="height: 40px">
+                  <div
+                    style="
+                      page-break-after: always;
+                      display: block !important;
+                      height: 30px;
+                    "
+                  ></div>
+                  <!-- <div class="lh" style="height: 40px">
                     <div></div>
                     <div></div>
-                  </div>
+                  </div> -->
                 </div>
               </div>
-               <!-- <p v-if="index2==6" style="page-break-after: always"></p> -->
+              <!-- <p v-if="index2==6" style="page-break-after: always"></p> -->
             </div>
-           
           </vue-easy-print>
         </div>
       </div>
@@ -125,9 +172,7 @@ export default {
   filters: {
     timesfiltes: function (value, arr) {
       for (let i = 0; i < arr.length; i++) {
-        console.log(arr[i].id_==value)
         if (arr[i].id_ == value) {
-          console.log(arr[i].fen_zhuang_ri_qi_);
           return arr[i].fen_zhuang_ri_qi_;
         }
       }
@@ -136,10 +181,11 @@ export default {
   created() {
     this.getInit();
   },
-  // destroyed() {
-  //       window.location.reload()
-  //       document.body.innerHTML = oldContent
-  // },
+  watch: {
+    obj() {
+      this.getInit();
+    },
+  },
   methods: {
     printDemo() {
       this.$refs.easyPrint.print();
@@ -147,7 +193,6 @@ export default {
       // this.$refs.easyPrint.window.print()
     },
     getInit() {
-      // console.log(this.obj)
       var idStr = "";
       this.obj.forEach((item) => {
         idStr += item + ",";
@@ -158,17 +203,15 @@ export default {
     },
     getLook(id) {
       let this_ = this;
+      this.list = [];
       let sql = `select * FROM t_fzwlmx  WHERE FIND_IN_SET(parent_id_,'${id}')`;
 
       repostCurd("sql", sql).then((res) => {
-        console.log(sql, "sql");
         this_.list = res.variables.data;
-        console.log(this_.list);
       });
       let sql1 = `select * FROM t_fzwlrkd WHERE FIND_IN_SET(id_,'${id}')`;
       repostCurd("sql", sql1).then((res) => {
         this_.listtimes = res.variables.data;
-        console.log(this_.listtimes);
       });
     },
   },
@@ -188,30 +231,43 @@ export default {
   top: -32px;
   left: 0;
 }
-.box-content {
+// .box-content {
+//   // display: flex;
+//   // flex-wrap: wrap;
+//     display: flex;
+//   justify-content: flex-start;
+//   text-align: left;
+// }
+.content {
   display: flex;
-  flex-wrap: wrap;
+  justify-content: flex-start;
+  text-align: left;
 }
 .tagBox {
-  width: 250px;
-  height: 180px;
+  width: 240px;
+  height: 150px;
   position: relative;
   border: 1px solid #000000;
   padding: 2px;
-  display: -webkit-box;
-  display: -ms-flexbox;
-  display: flex;
-  -webkit-box-orient: vertical;
-  -webkit-box-direction: normal;
-  -ms-flex-direction: column;
-  flex-direction: column;
-  margin: 55px 4px 40px 2px;
+  // display: -webkit-box;
+  // display: -ms-flexbox;
+  display: inline-block;
+  // display: flex;
+  // -webkit-box-orient: vertical;
+  // -webkit-box-direction: normal;
+  // -ms-flex-direction: column;
+  // flex-direction: column;
+  margin: 50px 4px 44px 2px;
   background-color: #fff;
 }
 
-.la {
-  display: flex;
+.la,
+.logo {
+  // display: flex;
   align-items: center;
+  font-size: 8px;
+  display: inline-block;
+  width: 100%;
 }
 
 .lh {

src/views/system/jbdScan/goods/jishutag.vue

@@ -1,23 +1,28 @@
 <template>
   <div class="bg">
     <el-dialog
-      width="26cm"
+      width="21cm"
       height="12cm"
       :modal-append-to-body="false"
       title="物料标签"
       :visible.sync="scanVisible"
     >
       <!-- 表单是否显示 -->
-      <div style="height: 500px;width: 100%">
+      <div style="height: 500px; width: 100%">
         <div ref="qrcode" id="box">
           <vue-easy-print tableShow ref="easyPrint" :onePageRow="onePageRow">
-            <div v-for="(item1, index1) in list" :key="index1" class="box-content">
+            <div
+              v-for="(item1, index1) in list"
+              :key="index1"
+              class="box-content"
+            >
               <div
-                v-for="(item2, index2) in parseInt(item1.dao_huo_shu_liang)||0"
+                v-for="(item2, index2) in parseInt(item1.dao_huo_shu_liang) ||
+                0"
                 :key="index2"
-               
+                style="display: inline-block"
               >
-               <!-- style="page-break-after: always" -->
+                <!-- style="page-break-after: always" -->
                 <div class="tagBox">
                   <div class="logo">
                     <img
@@ -26,50 +31,82 @@
                       alt=""
                     />
                   </div>
-                  <div class="lh" style="white-space: nowrap">
-                    <div>物料名称：{{ item1.wu_liao_ming_chen }}</div>
-                    <div></div>
-                  </div>
                   <div class="la">
-                    <div class="lh">
-                      <div style="white-space: nowrap">
-                        物料代码：{{ item1.wu_liao_dai_ma_ }}
-                      </div>
-                      <div></div>
+                    <div
+                      style="
+                        display: flex;
+                        justify-content: flex-start;
+                        text-align: left;
+                      "
+                    >
+                      <span> 物料名称：</span>
+                      <p style="width: 180px; margin: 0px">
+                        {{ item1.wu_liao_ming_chen }}
+                      </p>
                     </div>
                   </div>
                   <div class="la">
-                    <div class="lh">{{ item1.gui_ge_ }}</div>
+                    <div class="lh">
+                      <div style="white-space: nowrap">物料代码：</div>
+                      <div>{{ item1.wu_liao_dai_ma_ }}</div>
+                    </div>
                   </div>
                   <div class="la">
                     <div class="lh">
-                      <div>货号：</div>
-                      <div>{{ item1.huo_hao_ }}</div>
-                    </div>
-                    <div class="lh" style="margin-left: 10px">
-                      <div>批号：{{ item1.pi_hao_ }}</div>
+                      <div>规格：</div>
+                      <div>{{ item1.gui_ge_xing_hao_ }}</div>
                     </div>
                   </div>
                   <div class="la">
-                    <div class="lh">
-                      <div>到库日期：{{ item1.dao_ku_ri_qi_ }}</div>
+                    <div style="display: flex">
+                      <div class="lh" style="display: flex">
+                        <div>货号:</div>
+                        <div>{{ item1.huo_hao_ }}</div>
+                      </div>
+                      <div class="lh" style="display: flex; margin-left: 2px">
+                        <div>批号:</div>
+                        <div>{{ item1.pi_hao_ }}</div>
+                      </div>
                     </div>
-                    <div class="lh" style="margin-left: 10px">
-                      <div>有效期：{{ item1.you_xiao_qi_ }}</div>
+                  </div>
+
+                  <div class="la">
+                    <div style="display: flex">
+                      <div class="lh">
+                        <div>入库时间:</div>
+                        <div>
+                          {{ item1.dao_ku_ri_qi_ }}
+                        </div>
+                      </div>
                     </div>
                   </div>
-                  <div class="lh">
-                    <div>生产厂家：</div>
-                    <div>{{ item1.chang_jia_ }}</div>
+                  <div class="la">
+                    <div style="display: flex">
+                      <div class="lh" style="margin-left: 2px">
+                        <div>有效期:</div>
+                        <div>{{ item1.you_xiao_qi_ }}</div>
+                      </div>
+                    </div>
                   </div>
-                  <div class="lh">
-                    <div>状态</div>
-                    <div></div>
+                  <div class="la">
+                    <div class="lh">
+                      <div>生产厂家：</div>
+                      <div>{{ item1.sheng_chan_chang_ }}</div>
+                    </div>
                   </div>
-                  <div class="lh" style="height: 40px">
-                    <div></div>
-                    <div></div>
+                  <div class="la">
+                    <div class="lh">
+                      <div>状态</div>
+                      <!-- <div class="la" style="height: 40px"></div> -->
+                    </div>
                   </div>
+                  <div
+                    style="
+                      page-break-after: always;
+                      display: block !important;
+                      height: 30px;
+                    "
+                  ></div>
                 </div>
               </div>
             </div>
@@ -136,13 +173,17 @@ export default {
   created() {
     this.getInit();
   },
+  watch: {
+    obj() {
+      this.getInit();
+    },
+  },
   methods: {
     printDemo() {
       this.$refs.easyPrint.print();
       // this.$refs.easyPrint.window.print()
     },
     getInit() {
-      // console.log(this.obj)
       var idStr = "";
       this.obj.forEach((item) => {
         idStr += item + ",";
@@ -153,11 +194,10 @@ export default {
     },
     getLook(id) {
       let this_ = this;
+      this.list=[];
       let sql = `select * FROM t_wljsysjlb  WHERE FIND_IN_SET(id_,'${id}')`;
       repostCurd("sql", sql).then((res) => {
-        console.log(sql, "sql");
         this_.list = res.variables.data;
-        console.log(this_.list);
       });
     },
   },
@@ -165,38 +205,47 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-//.bg {
-//}
+.demo {
+  height: 300px;
+  width: 100%;
+}
+
 .logo {
   position: absolute;
   top: -32px;
   left: 0;
-
 }
-.box-content {
+.content {
   display: flex;
-  flex-wrap: wrap;
+  justify-content: flex-start;
+  text-align: left;
 }
 .tagBox {
-  width: 250px;
-  height: 180px;
+  width: 240px;
+  height: 150px;
   position: relative;
   border: 1px solid #000000;
   padding: 2px;
-  display: -webkit-box;
-  display: -ms-flexbox;
-  display: flex;
-  -webkit-box-orient: vertical;
-  -webkit-box-direction: normal;
-  -ms-flex-direction: column;
-  flex-direction: column;
-  margin: 55px 4px 40px 2px;
+  // float: left;
+  display: inline-block;
+  // display: -webkit-box;
+  // display: -ms-flexbox;
+  // display: flex;
+  // -webkit-box-orient: vertical;
+  // -webkit-box-direction: normal;
+  // -ms-flex-direction: column;
+  // flex-direction: column;
+  margin: 50px 4px 44px 3px;
   background-color: #fff;
 }
 
-.la {
-  display: flex;
+.la,
+.logo {
+  // display: flex;
   align-items: center;
+  font-size: 8px;
+  display: inline-block;
+  width: 100%;
 }
 
 .lh {

src/views/system/jbdScan/goods/lingliaodan.vue

@@ -186,6 +186,11 @@ export default {
         return res.variables.data[0].NAME_;
       });
     },
+  },
+    watch: {
+    obj() {
+      this.getInit();
+    },
   },
   methods: {
     printDemo() {
@@ -198,7 +203,6 @@ export default {
         idStr += item + ",";
       });
       idStr = idStr.substring(0, idStr.length - 1);
-
       this.getLook(idStr);
     },
     addNumber(num1, num2) {
@@ -215,9 +219,26 @@ export default {
       d = d < 10 ? "0" + d : d; //日期不满10天显示前加0
       return y + "-" + m + "-" + d;
     },
-
+    toDecimal2(x) {
+      var f = parseFloat(x);
+      if (isNaN(f)) {
+        return false;
+      }
+      var f = Math.round(x * 100) / 100;
+      var s = f.toString();
+      var rs = s.indexOf(".");
+      if (rs < 0) {
+        rs = s.length;
+        s += ".";
+      }
+      while (s.length <= rs + 2) {
+        s += "0";
+      }
+      return s;
+    },
     getLook(id) {
       let this_ = this;
+      this.list=[];
       let sql = `select * FROM t_crkjlb WHERE FIND_IN_SET(id_,'${id}')`;
       let zhubiao = [];
       let name1, name2, name3;
@@ -257,8 +278,10 @@ export default {
                   data["heji"] = this.addNumber(chushi, it.jin_e_);
                   chushi = data["heji"];
                 });
+                
+                 data["heji"] =this_.toDecimal2(data["heji"]);
                 this_.list.push(data);
-                console.log(this_.list)
+                chushi = 0;
               });
             });
           });

src/views/system/jbdScan/goods/sampleTag.vue

@@ -0,0 +1,249 @@
+<template>
+  <div class="bg">
+    <el-dialog 
+      width="21cm"
+      height="10cm" 
+       :modal-append-to-body='false' title="样品标签" :visible.sync="scanVisible">
+      <!-- 表单是否显示 -->
+      <div style="height:500px">
+          <div ref="qrcode" id="box">
+          <vue-easy-print tableShow ref="easyPrint"
+            :onePageRow="onePageRow"
+          >
+            <div v-for="(item1, index1) in list" :key="index1"  style="display: inline-block" >
+              <div v-for="(item2, index2) in parseInt(item1.num)" :key="index2" 
+              style="display: inline-block"
+              ><!-- style="page-break-after:always" -->
+               <div class="All">
+                <div class="tagBox">
+                  <div class="lh">
+                    <div>样本名称：</div>
+                    <div>{{ item1.name }}</div>
+                  </div>
+                  <div class="la">
+                    <div class="lh">
+                      <div>样本编号：</div>
+                      <div>{{ item1.serial }}</div>
+                    </div>
+                    <div class="lh" style="margin-left: 5px">
+                      <div>收样时间:</div>
+                      <div></div>
+                    </div>
+                  </div>
+                  <div class="lh">
+                    <div>样品类型：</div>
+                    <div>{{ item1.type }}</div>
+                  </div>
+                  <div class="lh">
+                    <div>存储条件：</div>
+                    <div>{{ item1.condition }}</div>
+                  </div>
+
+                  <div class="lh">
+                    <div>流转状态：</div>
+                    <div>▢待检，▢已检，▢留样</div>
+                  </div>
+                  <div class="lh">
+                    <div>样品数量：</div>
+                    <div>{{ index2 + 1 }}/{{ item1.num }}支</div>
+                  </div>
+                  <div class="ewm">
+                    <vue-barcode :value="item1.serial" :width="1" :height="15" ></vue-barcode>
+                  </div>
+
+                  <!-- <div
+                    style="page-break-after: always; display: block !important;height: 40px"
+                  ></div> -->
+
+
+                </div>
+               </div>
+              </div>
+            </div>
+          </vue-easy-print>
+        </div>
+      </div>
+      <span slot="footer" class="dialog-footer">
+        <!-- <el-button @click="dialogVisible = false">取 消</el-button> -->
+        <el-button type="primary" @click="printDemo">打印标签</el-button>
+      </span>
+    </el-dialog>
+
+
+  </div>
+</template>
+
+<script>
+import VueBarcode from 'vue-barcode';
+import vueEasyPrint from "vue-easy-print";
+import repostCurd from '@/business/platform/form/utils/custom/joinCURD.js';
+
+export default {
+  components: {
+    VueBarcode,
+    vueEasyPrint,
+  },
+  props: {
+    obj: {
+      default: [],
+      type: Array
+    },
+    onePageRow:{
+      type:Number,
+      default:3
+    },
+    blankLines:{
+      type:Boolean,
+      default:true
+    },
+    scanVisible:{
+      type:Boolean,
+      default: false
+    }
+  },
+  data() {
+    return {
+      value: '',
+      id: '',
+      list: [{
+        name: 5,
+        serial: 5,
+        type: 5,
+        num: 5,
+        condition: 5
+      }],
+      visible: true
+    }
+  },
+  watch: {
+    obj() {
+      this.getInit()
+      // console.log(this.obj)
+    }
+  },
+  created() {
+    this.getInit()
+  },
+  methods: {
+    printDemo() {
+      this.$refs.easyPrint.print()
+    },
+    getInit() {
+      var idStr = '';
+      this.obj.forEach(item=>{
+        idStr += item + ','
+      })
+      idStr = idStr.substring(0,idStr.length-1);
+      console.log(idStr)
+      this.getLook(idStr)
+    },
+    getLook(id) {
+      console.log(id)
+      let sql = `select * from t_lhypb where find_in_set(parent_id_,'${id}')`
+      console.log(sql)
+      repostCurd("sql", sql).then(res => {
+        if (res.state === 200) {
+          const data = res.variables.data
+          let list = []
+          data.forEach(item => {
+            if (item.yang_pin_lei_xing != '' && parseInt(item.shu_liang_) > 0) {
+              let o = {
+                name: item.yang_pin_ming_che,
+                serial: item.yang_pin_bian_hao,
+                type: item.yang_pin_lei_xing,
+                num: item.shu_liang_,
+                condition: item.yang_ben_yun_shu_
+              }
+              list.push(o)
+            }
+            if (item.yang_pin_lei_er_ != '' && parseInt(item.shu_liang_er_) > 0) {
+              let o = {
+                name: item.yang_pin_ming_che,
+                serial: item.yang_pin_bian_hao,
+                type: item.yang_pin_lei_er_,
+                num: item.shu_liang_er_,
+                condition: item.yang_pin_yun_shu_
+              }
+              list.push(o)
+            }
+            if (item.yang_pin_lei_san_ != '' && parseInt(item.shu_liang_san_) > 0) {
+              let o = {
+                name: item.yang_pin_ming_che,
+                serial: item.yang_pin_bian_hao,
+                type: item.yang_pin_lei_san_,
+                num: item.shu_liang_san_,
+                condition: item.yang_pin_yun_san
+              }
+              list.push(o)
+            }
+            if (item.yang_pin_lei_si_ != '' && parseInt(item.shu_liang_si_) > 0) {
+              let o = {
+                name: item.yang_pin_ming_che,
+                serial: item.yang_pin_bian_hao,
+                type: item.yang_pin_lei_si_,
+                num: item.shu_liang_si_,
+                condition: item.yang_pin_yun_si_
+              }
+              list.push(o)
+            }
+
+          })
+          this.list = list
+
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.bg {
+  // height: auto;
+}
+
+.tagBox {
+  width: 240px;   // 300  240
+  height: 140px;  // 180  150
+  position: relative;
+  border: 1px solid #000000;
+  padding: 2px;
+  display: inline-block;
+  // justify-content: space-around;
+  // flex-direction: column;
+  margin: 10px 5px;
+  border-radius: 4px;
+  background-color: #fff;
+}
+.ewm{
+
+}
+/*
+.tagBox {
+  width: 177.5px;   // 300  240
+  height: 106.5px;  // 180  150
+  position: relative;
+  border: 1px solid #000000;
+  padding: 20px;
+  display: flex;
+  justify-content: space-around;
+  flex-direction: column;
+  margin: 20px auto;
+  border-radius: 15px;
+  background-color: #fff;
+}
+*/
+
+.la {
+  display: flex;
+  align-items: center;
+}
+
+.lh {
+  // line-height: auto;
+  font-size: 4px;  //16
+  display: flex;
+  align-items: center;
+
+}
+</style>

src/views/system/jbdScan/goods/tag.vue

@@ -1,79 +1,122 @@
 <template>
   <div class="bg">
     <el-dialog
-      width="26cm"
+      width="21cm"
       height="12cm"
       :modal-append-to-body="false"
       title="物料标签"
       :visible.sync="scanVisible"
     >
       <!-- 表单是否显示 -->
-      <div style="height: 500px; width: 100%">
+      <div class="demo">
         <div ref="qrcode" id="box">
-          <vue-easy-print tableShow ref="easyPrint" :onePageRow="onePageRow">
-            <div v-for="(item1, index1) in list" :key="index1" class="box-content">
+          <vue-easy-print
+            tableShow
+            ref="easyPrint"
+            :onePageRow="onePageRow"
+            :spaceRow="spaceRow"
+          >
+            <div
+              v-for="(item1, index1) in list"
+              :key="index1"
+              class="box-content"
+            >
               <div
-                v-for="(item2, index2) in parseInt(item1.shu_liang_)||0"
-                :key="index2"               >
+                v-for="(item2, index2) in parseInt(item1.shu_liang_) || 0"
+                :key="index2"
+                style="display: inline-block"
+              >
                 <div class="tagBox">
                   <div class="logo">
-                    <img style="width: 90px; height: 20px" src="./ming.jpg" alt="" />
-                  </div>
-                  <div class="lh">
-                    <div>物料名称：{{ item1.wu_liao_ming_chen }}{{ index2 }}</div>
-                    <div></div>
+                    <img
+                      style="width: 90px; height: 20px"
+                      src="./ming.jpg"
+                      alt=""
+                    />
                   </div>
                   <div class="la">
-                    <div class="lh">
-                      <div style="white-space: nowrap">
-                        物料代码：{{ item1.wu_liao_bian_ma_ }}
-                      </div>
-                      <div></div>
+                    <div
+                      style="
+                        display: flex;
+                        justify-content: flex-start;
+                        text-align: left;
+                      "
+                    >
+                      <span> 物料名称：</span>
+                      <p style="width: 180px; margin: 0px">
+                        {{ item1.wu_liao_ming_chen }}
+                      </p>
                     </div>
                   </div>
                   <div class="la">
-                    <div class="lh">{{ item1.gui_ge_xing_hao_ }}</div>
+                    <div class="lh">
+                      <div style="white-space: nowrap">物料代码：</div>
+                      <div>{{ item1.wu_liao_bian_ma_ }}</div>
+                    </div>
                   </div>
                   <div class="la">
                     <div class="lh">
-                      <div>货号：</div>
-                      <div>{{ item1.huo_hao_ }}</div>
-                    </div>
-                   <div class="lh" style="margin-left: 2px">
-                      <div>批号：{{ item1.pi_hao_ }}</div>
+                      <div>规格：</div>
+                      <div>{{ item1.gui_ge_xing_hao_ }}</div>
                     </div>
                   </div>
                   <div class="la">
-                    <div class="lh">
-                      <div>到库日期：{{ item1.wai_jian_ | timesfiltes(listtimes) }}</div>
+                    <div style="display: flex">
+                      <div class="lh" style="display: flex">
+                        <div>货号:</div>
+                        <div>{{ item1.huo_hao_ }}</div>
+                      </div>
+                      <div class="lh" style="display: flex; margin-left: 1px">
+                        <div>批号:</div>
+                        <div>{{ item1.pi_hao_ }}</div>
+                      </div>
                     </div>
-                    <div class="lh" style="margin-left: 2px">
-                      <div>有效期:</div>
-                      <div>{{ item1.you_xiao_qi_ }}</div>
+                  </div>
+                  <div class="la">
+                    <div style="display: flex">
+                      <div class="lh">
+                        <div>入库时间：</div>
+                        <div>
+                          {{ item1.wai_jian_ | timesfiltes(listtimes) }}
+                        </div>
+                      </div>
                     </div>
                   </div>
-                  <div class="lh">
-                    <div>生产厂家：</div>
-                    <div>{{ item1.sheng_chan_chang_ }}</div>
+                  <div class="la">
+                    <div style="display: flex">
+                      <div class="lh" style="margin-left: 1px">
+                        <div>有效期:</div>
+                        <div>{{ item1.you_xiao_qi_ }}</div>
+                      </div>
+                    </div>
                   </div>
-                  <div class="lh">
-                    <div>状态</div>
-                    <div></div>
+                  <div class="la">
+                    <div class="lh">
+                      <div>生产厂家：</div>
+                      <div>{{ item1.sheng_chan_chang_ }}</div>
+                    </div>
                   </div>
-                  <div class="lh" style="height: 40px">
-                    <div></div>
-                    <div></div>
+                  <div class="la">
+                    <div class="lh">
+                      <div>状态</div>
+                      <!-- <div class="la" style="height: 40px"></div> -->
+                    </div>
                   </div>
+
+                  <div
+                    style="
+                      page-break-after: always;
+                      display: block !important;
+                      height: 40px;
+                    "
+                  ></div>
                 </div>
               </div>
-               <!-- <p v-if="index2==6" style="page-break-after: always"></p> -->
             </div>
-           
           </vue-easy-print>
         </div>
       </div>
       <span slot="footer" class="dialog-footer">
-        <!-- <el-button @click="dialogVisible = false">取 消</el-button> -->
         <el-button type="primary" @click="printDemo">打印标签</el-button>
       </span>
     </el-dialog>
@@ -103,6 +146,10 @@ export default {
       type: Boolean,
       default: true,
     },
+    spaceRow: {
+      type: Boolean,
+      default: true,
+    },
     scanVisible: {
       type: Boolean,
       default: false,
@@ -125,9 +172,7 @@ export default {
   filters: {
     timesfiltes: function (value, arr) {
       for (let i = 0; i < arr.length; i++) {
-        // console.log(arr[i].id_==value)
         if (arr[i].id_ == value) {
-          console.log(arr[i].yan_shou_ru_ku_ri);
           return arr[i].yan_shou_ru_ku_ri;
         }
       }
@@ -136,6 +181,11 @@ export default {
   created() {
     this.getInit();
   },
+  watch: {
+    obj() {
+      this.getInit();
+    },
+  },
   // destroyed() {
   //       window.location.reload()
   //       document.body.innerHTML = oldContent
@@ -147,7 +197,6 @@ export default {
       // this.$refs.easyPrint.window.print()
     },
     getInit() {
-      // console.log(this.obj)
       var idStr = "";
       this.obj.forEach((item) => {
         idStr += item + ",";
@@ -158,17 +207,15 @@ export default {
     },
     getLook(id) {
       let this_ = this;
+      this.list=[];
       let sql = `select * FROM t_cgysjlb  WHERE FIND_IN_SET(wai_jian_,'${id}')`;
 
       repostCurd("sql", sql).then((res) => {
-        console.log(sql, "sql");
         this_.list = res.variables.data;
-        console.log(this_.list);
       });
       let sql1 = `select id_,yan_shou_ru_ku_ri FROM t_yszb  WHERE FIND_IN_SET(id_,'${id}')`;
       repostCurd("sql", sql1).then((res) => {
         this_.listtimes = res.variables.data;
-        console.log(this_.listtimes);
       });
     },
   },
@@ -176,42 +223,52 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-//.bg {
-//}
-// @media print{
-//    body {
-//        height: auto !important;
-//    }
-// }
+.demo {
+  height: 300px;
+  width: 100%;
+}
+
 .logo {
   position: absolute;
   top: -32px;
   left: 0;
 }
 .box-content {
+  // display: flex;
+  // float: left;
+  // flex-wrap: wrap;
+}
+.content {
   display: flex;
-  flex-wrap: wrap;
+  justify-content: flex-start;
+  text-align: left;
 }
 .tagBox {
-  width: 250px;
-  height: 180px;
+  width: 240px;
+  height: 150px;
   position: relative;
   border: 1px solid #000000;
   padding: 2px;
-  display: -webkit-box;
-  display: -ms-flexbox;
-  display: flex;
-  -webkit-box-orient: vertical;
-  -webkit-box-direction: normal;
-  -ms-flex-direction: column;
-  flex-direction: column;
-  margin: 55px 4px 40px 2px;
+  // float: left;
+  display: inline-block;
+  // display: -webkit-box;
+  // display: -ms-flexbox;
+  // display: flex;
+  // -webkit-box-orient: vertical;
+  // -webkit-box-direction: normal;
+  // -ms-flex-direction: column;
+  // flex-direction: column;
+  margin: 50px 4px 44px 3px;
   background-color: #fff;
 }
 
-.la {
-  display: flex;
+.la,
+.logo {
+  // display: flex;
   align-items: center;
+  font-size: 8px;
+  display: inline-block;
+  width: 100%;
 }
 
 .lh {

src/views/system/jbdScan/js/manualConfirmationJS.js

@@ -292,6 +292,7 @@ export default {
                 rwzb["zhan_shi_biao_wai"] = mjwtsqbAllResult[i].ye_mian_zong_zhua
                 rwzb["zhuang_tai_"] = "任务待分配"                       //	状态
                 rwzb["gong_xian_zhi_"] = mjypbList[i].yang_pin_lei_xin			// 供限值
+                rwzb["yang_pin_bei_zhu_"] = mjypbList[i].bei_zhu_			// 样品备注
                 rwb.push(rwzb)
                 // let str = mjypbList[i].jian_ce_xiang_mu2.split(",")
                 // for (var p in str) {

src/views/system/jbdScan/js/sampleConfirmationJS.js

@@ -274,6 +274,7 @@ export default {
                 rwzb["zhan_shi_biao_wai"] = mjwtsqbAllResult[i].ye_mian_zong_zhua
                 rwzb["zhuang_tai_"] = "任务待分配"                       //	状态
                 rwzb["gong_xian_zhi_"] = mjypbList[i].yang_pin_lei_xin			// 供限值
+                rwzb["yang_pin_bei_zhu_"] = mjypbList[i].bei_zhu_			// 样品备注
                 rwb.push(rwzb)
                 // let str = mjypbList[i].jian_ce_xiang_mu2.split(",")
                 // for (var p in str) {

src/views/system/jbdScan/scan.vue

@@ -23,9 +23,12 @@ import chnangguirukudan from './goods/chnangguirukudan'
 import lingliaodan from './goods/lingliaodan'
 import fenzhuangtag from './goods/fenzhuangtag'
 import stateDetails from '../forget/stateDetails'
+import sampleTag from './goods/sampleTag'
+
 
 export default {
-  components: { facility,material,sample,sampleConfirmation,manualConfirmation,tag,jishutag,caigourukudan,chnangguirukudan,lingliaodan,fenzhuangtag,stateDetails},
+  components: { facility,material,sample,sampleConfirmation,manualConfirmation,tag,jishutag,caigourukudan,chnangguirukudan,lingliaodan,fenzhuangtag,sampleTag,stateDetails},
+
   props:{
     currentScan:String,
     scanVisible:Boolean,

src/views/warehouse/cangku.vue

@@ -89,13 +89,19 @@
                       :key="index"
                       class="goods-dsc"
                       :style="{
-                        background:
-                          it.cun_fang_wei_zhi_ == '空' ? '' : '#67c23a',
+                        background: it.wu_liao_bian_ma_ ? '' : '#67c23a',
                       }"
                     >
                       <div class="top-dsc">
                         <div class="position">
-                          <p>名称：{{ it.wu_liao_ming_chen || 空 }}</p>
+                          <div style="display:flex;justify-content: flex-start;text-align: left;">
+                            <span> 名称：</span>
+                            <p style="width: 80px">
+                              
+                              {{ it.wu_liao_ming_chen || 空 }}
+                            </p>
+                          </div>
+
                           <p>
                             编码：{{
                               it.wu_liao_bian_ma_ || it.wu_liao_bian_ma_
@@ -208,9 +214,7 @@ export default {
       let sqlString = `select distinct qu_yu_,cun_chu_tiao_jian from t_ck where cang_ku_ming_chen = '${cang_ku}' order by qu_yu_ asc`;
       var this_ = this;
       curdPost("sql", sqlString).then((response) => {
-
         this_.quyu_arr = response.variables.data;
-                console.log(this_.quyu_arr)
         if (!this.firstLoadActive) {
           this_.formInline.qu_yu_value = "";
         }
@@ -264,7 +268,6 @@ export default {
       // var sqlString = `select * from t_mjwlgl where cang_ku_ming_chen = '${this.formInline.cang_ku_ming_chen_value}' and qu_yu_ = '${this.formInline.qu_yu_value}'`;
       let py = this.formInline.qu_yu_value.split("号")[1].replace(/^\s*/g, "");
       let num = this.formInline.qu_yu_value.split("号")[0];
-      console.log(py, "111111111");
       let quyu = this.sqlSlice(py);
       let type = (quyu + num).replace(/^\s*/g, "");
       var sqlString =
@@ -274,7 +277,6 @@ export default {
         "'%" +
         type +
         "%'";
-      console.log(sqlString, type, "按钮");
       this.queryLoad(sqlString, type);
     },
     queryLoad(sql, py) {
@@ -292,10 +294,9 @@ export default {
         " and cang_ku_ming_chen ='" +
         this.formInline.cang_ku_ming_chen_value +
         "' ORDER BY wei_zhi_ ASC ";
-        console.log(py)
-        let weiSlice ="SUBSTR(wei_zhi_, 1, 6)"
+      let weiSlice = "SUBSTR(wei_zhi_, 1, 6)";
       if (py.includes("WHPG")) {
-        weiSlice = 'SUBSTR(wei_zhi_, 1, 7)';
+        weiSlice = "SUBSTR(wei_zhi_, 1, 7)";
       }
       let classSql =
         `select DISTINCT ${weiSlice} AS wei_zhi_  from t_ck where wei_zhi_ like ` +
@@ -305,31 +306,32 @@ export default {
         " and cang_ku_ming_chen ='" +
         this.formInline.cang_ku_ming_chen_value +
         "' ORDER BY wei_zhi_ ASC ";
-      console.log(classSql, "classSql");
       curdPost("sql", sqltype).then((res) => {
         typeData = res.variables.data; //查询具体仓库某个货架的所有位置
-        console.log(typeData, "位置");
         curdPost("sql", sql).then((res) => {
           datas = res.variables.data; //具体仓库某个货架的所有物料数据
-          console.log(datas, "数据");
           typeData.forEach((item) => {
             typeArr[item.wei_zhi_] = [];
             if (datas.length == 0) {
+              //没有物料信息
               typeArr[item.wei_zhi_].push(item);
             } else {
               datas.forEach((it, index) => {
+                console.log(item.wei_zhi_, it.cun_fang_wei_zhi_);
                 if (item.wei_zhi_ == it.cun_fang_wei_zhi_) {
                   typeArr[item.wei_zhi_].push(it);
                 } else if (
                   item.wei_zhi_ != it.cun_fang_wei_zhi_ &&
                   index == datas.length - 1
                 ) {
-                  typeArr[item.wei_zhi_].push(item);
+                  if (!typeArr[item.wei_zhi_].length) {
+                    typeArr[item.wei_zhi_].push(item);
+                  }
                 }
               });
             }
           });
-          console.log(typeArr, "22222222222222");
+          console.log(typeArr);
           curdPost("sql", classSql).then((res2) => {
             let resData = res2.variables.data;
             resData.forEach((item) => {
@@ -338,10 +340,8 @@ export default {
               labelsMap[layer] = [];
               for (var prop in typeArr) {
                 if (typeArr.hasOwnProperty(prop)) {
-                  // console.log(prop,item.wei_zhi_);
                   if (prop.includes(item.wei_zhi_)) {
                     labelsMap[layer].push(...typeArr[prop]);
-                    //  console.log(labelsMap)
                   }
                 }
               }
@@ -371,7 +371,6 @@ export default {
         "  and cang_ku_ming_chen = '" +
         this.formInline.cang_ku_ming_chen_value +
         "'";
-      // console.log(sqlString, type);
       this.queryLoad(sqlString, type);
       this.formInline.qu_yu_value = value;
       this.quyuShow = value;
@@ -546,7 +545,7 @@ p {
               cursor: pointer;
               // width: 170px;
               // height: 80px;
-              padding: 6px 12px;
+              padding: 6px 6px;
               border-radius: 5px;
               background: #e6a23c;
               margin-left: 12px;
@@ -557,14 +556,14 @@ p {
                 display: flex;
                 justify-content: space-between;
                 font-size: 12px;
-                height: 18px;
-                line-height: 18px;
+                // height: 18px;
+                // line-height: 18px;
                 .position > p {
                   text-align: left;
                   // color: #fbe8ff;
                 }
                 .right-content > p {
-                  margin-left: 15px;
+                  margin-left: 2px;
                   // color: #fbe8ff;
                   text-align: left;
                 }
@@ -575,9 +574,9 @@ p {
               .bottom-dsc {
                 width: 100%;
                 font-size: 18px;
-                height: 42px;
-                line-height: 60px;
-                margin-top: 20px;
+                // height: 42px;
+                // line-height: 60px;
+                // margin-top: 20px;
                 // color: #fbe8ff;
               }
               .goods-demo {