Merge branch '20201109_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20201109_pc_vue_new_branch

src/xt_pages/data/components/consumables.vue

@@ -59,7 +59,12 @@
       </div>
       <div>
         <el-button type="primary" @click="openForm()">新增</el-button>
-        <el-button type="primary" @click="BatchDelete()">批量备案</el-button>
+        <!--<el-button type="primary" @click="BatchDelete()">批量备案</el-button>-->
+
+
+        <el-button type="primary" @click="BatchDelete()" v-if="$store.getters.xt_user.org_id == 9504 || $store.getters.xt_user.org_id == 10028">批量备案</el-button>
+        <el-button type="primary" v-if="$store.getters.xt_user.org_id != 9504 && $store.getters.xt_user.org_id != 10028" @click="GDYBBatchPutOnRecord">批量备案</el-button>
+
       </div>
     </div>
 
@@ -74,7 +79,7 @@
           align="center"
           type="selection"
           width="55">
-      </el-table-column>    
+      </el-table-column>
       <el-table-column type="index" label="序号" width="60px" align="center"></el-table-column>
       <el-table-column label="耗材名称" align="center">
         <template slot-scope="scope">
@@ -128,10 +133,15 @@
           <!--<el-button type="primary" size="small" @click="clickSelfPayment(scope.row.id)">自付比例</el-button>-->
           <el-button type="danger" size="small" @click="handleGoodInfoDelete(scope.$index, scope.row)">删除</el-button>
 
-          <el-button type="primary" size="small" icon="el-icon-refresh-left" @click="toReturn(scope.row.id,scope.row.is_mark)">
+          <el-button type="primary" size="small" icon="el-icon-refresh-left" @click="toReturn(scope.row.id,scope.row.is_mark)" v-if="$store.getters.xt_user.org_id == 9504 || $store.getters.xt_user.org_id == 10028">
              <span v-if="scope.row.is_mark == 0">备案</span>
              <span v-if="scope.row.is_mark == 1">撤销</span>
           </el-button>
+
+          <el-button type="primary" size="small" icon="el-icon-refresh-left" v-if="$store.getters.xt_user.org_id != 9504 && $store.getters.xt_user.org_id != 10028">
+            <span v-if="scope.row.is_mark == 0 || scope.row.is_mark == 2"  @click="putOnRecord(scope.row.id)" >目录对照</span>
+            <span v-if="scope.row.is_mark == 1"  @click="putOnUnRecord(scope.row.id)" >撤消对照</span>
+          </el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -279,6 +289,88 @@
       }
     },
     methods: {
+      putOnUnRecord(id){
+        var that = this
+        let params = {
+          ids:id.toString(),
+          record_type: 2,
+          admin_user_id:this.$store.getters.xt_user.user.id
+        }
+        axios.get('http://127.0.0.1:9532/api/uncheckcode/get',{params:params}).then(function(response) {
+          if (response.data.state == 0) {
+            that.$message.error(response.data.data.msg)
+            return false
+          } else {
+            if(response.data.data.failed_code == -10){
+              that.$message.error(response.data.data.msg)
+            }else{
+              // for (let i = 0; i < that.tableData.length; i++) {
+              //   if (that.tableData[i].id == that.currentObject.id) {
+              //     that.tableData[i].record.is_cancel == 1
+              //   }
+              // }
+            }
+
+          }
+        }).catch(function(error) {
+        })
+      },
+      putOnRecord(id){
+        var that = this
+
+        let params = {
+          ids:id.toString(),
+          record_type: 2,
+          admin_user_id:this.$store.getters.xt_user.user.id
+        }
+
+        axios.get('http://127.0.0.1:9532/api/checkcode/get',{params:params}).then(function(response) {
+          if (response.data.state == 0) {
+            that.$message.error(response.data.data.msg)
+            return false
+          } else {
+            if(response.data.data.failed_code == -10){
+              that.$message.error(response.data.data.msg)
+            }else{
+
+
+            }
+
+
+
+          }
+        }).catch(function(error) {
+        })
+      },
+      GDYBBatchPutOnRecord(){
+        var that = this
+        var ids = [];
+        var idMap = {};
+        for (const index in this.selectDrug) {
+          ids.push(this.selectDrug[index].id);
+          idMap[this.selectDrug[index].id] = this.selectDrug[index].id;
+        }
+        let params = {
+          ids:ids.join(','),
+          record_type: 2,
+          admin_user_id:this.$store.getters.xt_user.user.id
+        }
+        axios.get('http://127.0.0.1:9532/api/checkcode/get',{params:params}).then(function(response) {
+          if (response.data.state == 0) {
+            that.$message.error(response.data.data.msg)
+            return false
+          } else {
+            if(response.data.data.failed_code == -10){
+              that.$message.error(response.data.data.msg)
+            }else{
+
+
+            }
+          }
+        }).catch(function(error) {
+        })
+      },
+
       changeKind(val){
         this.getList()
 
@@ -341,12 +433,12 @@
               this.goodInfo.goodInfoDialog.formValue.good_unit =
                 response.data.data.goodInfo.good_unit
             }
-           
+
             if (response.data.data.goodInfo.manufacturer <= 0) {
               this.goodInfo.goodInfoDialog.formValue.manufacturer = ''
             } else {
               this.goodInfo.goodInfoDialog.formValue.manufacturer = response.data.data.goodInfo.manufacturer
-             
+
             }
 
             if (response.data.data.goodInfo.dealer <= 0) {
@@ -512,9 +604,9 @@
             this.goodInfo.goodInfoDialog.formValue.agent =response.data.data.goodInfo.agent
 
             this.goodInfo.goodInfoDialog.formValue.good_number = response.data.data.goodInfo.good_number
-            
+
             this.goodInfo.goodInfoDialog.formValue.social_security_directory_code = response.data.data.goodInfo.social_security_directory_code
-            
+
             if(response.data.data.production_type<=0){
                this.goodInfo.goodInfoDialog.production_type = ''
             }else{
@@ -526,7 +618,7 @@
             }else{
               this.goodInfo.goodInfoDialog.formValue.special_medical = response.data.data.goodInfo.special_medical.toString()
             }
-        
+
             this.$refs.addConsumable.show(row.id, this.goodInfo.goodInfoDialog.formValue)
           }
         })
@@ -868,7 +960,7 @@
               admin_user_id:this.$store.getters.xt_user.user.id
             }
             console.log("paramsw2",params)
-        
+
             var that = this
             axios.get('http://127.0.0.1:9532/sz/api/goods/get',{ params: params }).then(function(response) {
             if (response.data.state == 0) {
@@ -889,7 +981,7 @@
           });
      },
       toReturn(id,isMark){
-        
+
          var that = this
          let params = {
              'id':id,

src/xt_pages/data/components/drugs.vue

@@ -56,10 +56,8 @@
       </div>
       <div>
         <el-button type="primary" @click="openForm(0)">新增</el-button>
-        <el-button type="primary" @click="BatchDelete()">批量备案</el-button>
-
-        <el-button type="primary" v-if="$store.getters.xt_user.org_id != 9504" @click="GDYBBatchPutOnRecord()">批量备案</el-button>
-
+        <el-button type="primary" @click="BatchDelete()" v-if="$store.getters.xt_user.org_id == 9504 || $store.getters.xt_user.org_id == 10028" >批量备案</el-button>
+        <el-button type="primary" v-if="$store.getters.xt_user.org_id != 9504 && $store.getters.xt_user.org_id != 10028" @click="GDYBBatchPutOnRecord()">批量备案</el-button>
       </div>
     </div>
     <el-table :data="list" border style="width: 100%" :row-style="{ color: '#303133' }"
@@ -345,9 +343,16 @@
     methods: {
       GDYBBatchPutOnRecord(){
         var that = this
+        var ids = [];
+        var idMap = {};
+        for (const index in this.selectDrug) {
+          ids.push(this.selectDrug[index].id);
+          idMap[this.selectDrug[index].id] = this.selectDrug[index].id;
+        }
         let params = {
-          'type':1,
-          'admin_user_id':this.$store.getters.xt_user.user.id
+          ids:ids.join(','),
+          record_type: 1,
+          admin_user_id:this.$store.getters.xt_user.user.id
         }
         axios.get('http://127.0.0.1:9532/api/checkcode/get',{params:params}).then(function(response) {
           if (response.data.state == 0) {
@@ -659,12 +664,13 @@
       },
      getDataConfig(module, filed_name){
         return getDataConfig(module, filed_name)
-      },putOnUnRecord(id){
+      },
+      putOnUnRecord(id){
         var that = this
         let params = {
-          'id':id,
-          'type':0,
-          'admin_user_id':this.$store.getters.xt_user.user.id
+          ids:id.toString(),
+          record_type: 1,
+          admin_user_id:this.$store.getters.xt_user.user.id
         }
         axios.get('http://127.0.0.1:9532/api/uncheckcode/get',{params:params}).then(function(response) {
           if (response.data.state == 0) {
@@ -684,13 +690,16 @@
           }
         }).catch(function(error) {
         })
-      },putOnRecord(id){
+      },
+      putOnRecord(id){
         var that = this
+
         let params = {
-          'id':id,
-          'type':0,
-          'admin_user_id':this.$store.getters.xt_user.user.id
+          ids:id.toString(),
+          record_type: 1,
+          admin_user_id:this.$store.getters.xt_user.user.id
         }
+
         axios.get('http://127.0.0.1:9532/api/checkcode/get',{params:params}).then(function(response) {
           if (response.data.state == 0) {
             that.$message.error(response.data.data.msg)
@@ -700,11 +709,7 @@
               that.$message.error(response.data.data.msg)
             }else{
 
-              // for (let i = 0; i < that.tableData.length; i++) {
-              //   if (that.tableData[i].id == that.currentObject.id) {
-              //     that.tableData[i].record.is_cancel == 1
-              //   }
-              // }
+
             }
 
 
@@ -794,7 +799,7 @@
           type: "warning"
         }
       ).then(() => {
-        var ids = [];
+               var ids = [];
         var idMap = {};
         for (const index in this.selectDrug) {
           ids.push(this.selectDrug[index].id);

src/xt_pages/data/components/project.vue

@@ -34,7 +34,9 @@
             </div>
             <div>
              <el-button type="primary" @click="openForm(0)">新增</el-button>
-             <el-button type="primary" @click="BatchDelete()">批量备案</el-button>
+             <el-button type="primary" @click="BatchDelete()" v-if="$store.getters.xt_user.org_id == 9504 || $store.getters.xt_user.org_id == 10028">批量备案</el-button>
+                <el-button type="primary" v-if="$store.getters.xt_user.org_id != 9504 && $store.getters.xt_user.org_id != 10028" @click="GDYBBatchPutOnRecord">批量备案</el-button>
+
             </div>
         </div>
         <el-table :data="tableData" border style="width: 100%" :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)', color: '#606266'}"  @selection-change="handleSelectionChange">
@@ -42,7 +44,7 @@
               align="center"
               type="selection"
               width="55">
-            </el-table-column>  
+            </el-table-column>
             <el-table-column prop="date" label="序号" width="80" align="center">
                  <template  slot-scope="scope">
                       {{scope.$index+1}}
@@ -89,10 +91,15 @@
                 <template slot-scope="scope">
                     <el-button @click="editHisProject(scope.row.id)" type="primary" size="small">编辑</el-button>
                     <el-button type="danger" size="small" @click="deleteProject(scope.row.id,scope.$index)">删除</el-button>
-                    <el-button type="primary" size="small" icon="el-icon-refresh-left" @click="toReturn(scope.row.id,scope.row.is_mark)">
+                    <el-button type="primary" size="small" icon="el-icon-refresh-left" @click="toReturn(scope.row.id,scope.row.is_mark)" v-if="$store.getters.xt_user.org_id == 9504 || $store.getters.xt_user.org_id == 10028">
                       <span v-if="scope.row.is_mark ==0">备案</span>
                       <span v-if="scope.row.is_mark ==1">撤销</span>
                     </el-button>
+
+                    <el-button type="primary" size="small" icon="el-icon-refresh-left" v-if="$store.getters.xt_user.org_id != 9504 && $store.getters.xt_user.org_id != 10028">
+                        <span v-if="scope.row.is_mark == 0 || scope.row.is_mark == 2"  @click="putOnRecord(scope.row.id)" >目录对照</span>
+                        <span v-if="scope.row.is_mark == 1"  @click="putOnUnRecord(scope.row.id)" >撤消对照</span>
+                    </el-button>
                 </template>
             </el-table-column>
         </el-table>
@@ -164,7 +171,89 @@ export default {
         }
     },
     methods:{
-        changeStart(){
+      putOnUnRecord(id){
+        var that = this
+        let params = {
+          ids:id.toString(),
+          record_type: 3,
+          admin_user_id:this.$store.getters.xt_user.user.id
+        }
+        axios.get('http://127.0.0.1:9532/api/uncheckcode/get',{params:params}).then(function(response) {
+          if (response.data.state == 0) {
+            that.$message.error(response.data.data.msg)
+            return false
+          } else {
+            if(response.data.data.failed_code == -10){
+              that.$message.error(response.data.data.msg)
+            }else{
+              // for (let i = 0; i < that.tableData.length; i++) {
+              //   if (that.tableData[i].id == that.currentObject.id) {
+              //     that.tableData[i].record.is_cancel == 1
+              //   }
+              // }
+            }
+
+          }
+        }).catch(function(error) {
+        })
+      },
+      putOnRecord(id){
+        var that = this
+
+        let params = {
+          ids:id.toString(),
+          record_type: 3,
+          admin_user_id:this.$store.getters.xt_user.user.id
+        }
+
+        axios.get('http://127.0.0.1:9532/api/checkcode/get',{params:params}).then(function(response) {
+          if (response.data.state == 0) {
+            that.$message.error(response.data.data.msg)
+            return false
+          } else {
+            if(response.data.data.failed_code == -10){
+              that.$message.error(response.data.data.msg)
+            }else{
+
+
+            }
+
+
+
+          }
+        }).catch(function(error) {
+        })
+      },
+      GDYBBatchPutOnRecord(){
+        var that = this
+        var ids = [];
+        var idMap = {};
+        for (const index in this.selectDrug) {
+          ids.push(this.selectDrug[index].id);
+          idMap[this.selectDrug[index].id] = this.selectDrug[index].id;
+        }
+        let params = {
+          ids:ids.join(','),
+          record_type: 3,
+          admin_user_id:this.$store.getters.xt_user.user.id
+        }
+        axios.get('http://127.0.0.1:9532/api/checkcode/get',{params:params}).then(function(response) {
+          if (response.data.state == 0) {
+            that.$message.error(response.data.data.msg)
+            return false
+          } else {
+            if(response.data.data.failed_code == -10){
+              that.$message.error(response.data.data.msg)
+            }else{
+
+
+            }
+          }
+        }).catch(function(error) {
+        })
+      },
+
+      changeStart(){
          this.getlist()
         },
         handleSizeChange(val) {
@@ -176,7 +265,7 @@ export default {
             this.getlist()
         },
         searchAction(){
-           this.getlist()   
+           this.getlist()
         },
         clickSelfPayment(){
             this.$refs.selfPayment.show();
@@ -209,7 +298,7 @@ export default {
           }
           return name
         },
-      
+
         getlist(){
             var params = {
                keyword:this.search_input,
@@ -229,7 +318,7 @@ export default {
                console.log("total",total)
                this.total = total
              }
-          })  
+          })
         },
         deleteProject(id,index){
             this.$confirm("确认删除此项目吗?", "删除", {
@@ -275,7 +364,7 @@ export default {
              'admin_user_id':this.$store.getters.xt_user.user.id,
           }
           console.log("params22222222",params)
-         
+
          axios.get('http://127.0.0.1:9532/sz/api/revocation/get',{params:params}).then(function(response) {
           if (response.data.state == 0) {
                that.$message.error(response.data.data.msg)
@@ -295,11 +384,11 @@ export default {
       },
       handleSelectionChange(val) {
         this.selectDrug = val;
-      }, 
+      },
     changeRecord(){
       this.getlist()
     },
-      
+
     BatchDelete() {
       if (this.selectDrug.length == 0) {
         this.$message.error("请选择要备案的信息");
@@ -321,7 +410,7 @@ export default {
           ids.push(this.selectDrug[index].id);
           idMap[this.selectDrug[index].id] = this.selectDrug[index].id;
         }
-       
+
         var idss = ids.join(',')
         let params = {
           ids:idss,
@@ -365,7 +454,7 @@ export default {
     created(){
       this.getlist()
       this.getDartmentList()
-     
+
     }
 }
 </script>