解决禅道系统部分bug

src/xt_pages/data/druguseTemplate.vue

@@ -41,7 +41,7 @@
 
             <el-table-column
               prop="amount1"
-              label="医嘱内容">
+              lab/el="医嘱内容">
               <template slot-scope="scope">
 
                 <el-dropdown trigger="click" v-if="scope.row.parent_id == 0">
@@ -1203,6 +1203,7 @@
         this.isEdit = false;
         this.parent_id = 0;
         this.isAddChild = false
+        this.templateTableVisible = false
         this.templateFormVisible = true;
 
       }, deleteRecordAction: function () {
@@ -1771,6 +1772,7 @@
         }
         return true;
       }, cancelEditHandle() {
+        this.templateTableVisible = true
         this.templateEditFormVisible = false;
       }, submitEditTemplate(formName) {
         this.$refs[formName].validate(valid => {

src/xt_pages/data/index.vue

@@ -2,7 +2,6 @@
 <div class="main-contain">
   <div class="position">
     <bread-crumb :crumbs='crumbs'></bread-crumb>
-
   </div>
   <div class="app-container">
     <el-tabs  v-model="activeName" >
@@ -47,7 +46,7 @@ export default {
   methods: {
     showCreatedTimes() {
       this.createdTimes = this.createdTimes + 1
-    }
+    },
   }
 }
 </script>

src/xt_pages/stock/Dialog/goodInfoDailog.vue

@@ -1,5 +1,5 @@
 <template>
-  <el-dialog width="854px" :title="titles" :visible.sync="visibility" :show-close="isClose" :close-on-click-modal="isClose"
+  <el-dialog width="854px" :title="titles" :visible.sync="visibility" :close-on-click-modal="isClose"
              :close-on-press-escape="isClose">
 
     <el-form class="demo-form-inline"
@@ -130,6 +130,7 @@
         good_unit: '',
         isClose: false,
         size: 11,
+        visibility:false,
         form: {
           good_id: '',
           specification_name: '',
@@ -155,10 +156,7 @@
       }
     },
     props: {
-      visibility: {
-        type: Boolean,
-        default: false
-      },
+
       titles: {
         type: String,
         default: ''
@@ -174,6 +172,12 @@
 
     },
     methods: {
+      show:function(){
+        this.visibility = true
+
+      },hide:function(){
+        this.visibility = false
+      },
       cancle: function(formName) {
         this.$emit('dialog-cancle', this.getValue())
       },

src/xt_pages/stock/Dialog/goodTypeDialog.vue

@@ -1,5 +1,5 @@
 <template>
-  <el-dialog width="430px" :title="titles" :visible.sync="visibility" :show-close="isClose" :close-on-click-modal="isClose"
+  <el-dialog width="430px" :title="titles" :visible.sync="visibility"  :close-on-click-modal="isClose"
              :close-on-press-escape="isClose">
     <el-form :rules="rules" ref="formValue" :model="formValue" label-width="80px">
       <el-row>
@@ -17,7 +17,7 @@
           </el-form-item>
         </el-col>
       </el-row>
-      
+
 
     </el-form>
 
@@ -37,6 +37,7 @@ export default {
   name: "goodTypeDialog",
   data() {
     return {
+      visibility:false,
       isClose: false,
       labelPosition: 'right',
       resetForm: {
@@ -51,10 +52,6 @@ export default {
     };
   },
   props: {
-    visibility: {
-      type: Boolean,
-      default: false
-    },
     titles: {
       type: String,
       default: ""
@@ -68,6 +65,12 @@ export default {
     }
   },
   methods: {
+    show:function(){
+      this.visibility = true
+
+    },hide:function(){
+      this.visibility = false
+    },
     cancle: function(formName) {
       this.$emit("dialog-cancle");
       this.$refs[formName].resetFields();

src/xt_pages/stock/Dialog/manufacturerOrDealerDialog.vue

@@ -1,6 +1,6 @@
 <template>
-  <el-dialog width="854px" :title="titles" :visible.sync="visibility" :show-close="isClose" :close-on-click-modal="isClose"
-             :close-on-press-escape="isClose">  
+  <el-dialog width="854px" :title="titles" :visible.sync="visibility" :close-on-click-modal="isClose"
+             :close-on-press-escape="isClose" >
 
     <el-form :model="formValue" :rules="rules" ref="formValue" class="demo-form-inline"
              :label-position="labelPosition"
@@ -32,7 +32,7 @@
     </el-row>
 
 
-    <el-row>    
+    <el-row>
       <el-col :span="8">
         <el-form-item label="联系地址">
           <el-input  v-model="formValue.contact_address"></el-input>
@@ -51,7 +51,7 @@
         </el-form-item>
       </el-col>
     </el-row>
-    
+
       <el-col>
         <el-form-item label="备注">
           <el-input  type="textarea" :row="5" v-model="formValue.remark"
@@ -85,6 +85,7 @@
 
 
       return {
+        visibility:false,
         labelPosition: 'right',
         isClose: false,
         form: {
@@ -120,10 +121,7 @@
       }
     },
     props: {
-      visibility: {
-        type: Boolean,
-        default: false
-      },
+
       titles: {
         type: String,
         default: "",
@@ -143,7 +141,14 @@
       }
     },
     methods: {
+      show:function(){
+        this.visibility = true
+
+      },hide:function(){
+        this.visibility = false
+      },
       cancle: function (formName) {
+        console.log("11111")
         this.$emit('dialog-cancle', this.getValue());
         this.$refs['formValue'].resetFields();
       },
@@ -165,7 +170,7 @@
         form['type'] = this.type
         form['isCreated'] = this.isCreated
         return form
-      },
+      }
     },
 
   }

src/xt_pages/stock/Dialog/salesReturnDialog.vue

@@ -1,5 +1,5 @@
 <template>
-  <el-dialog :title="propForm.title" :visible.sync="visibility" :show-close="isClose" :close-on-click-modal="isClose"
+  <el-dialog :title="propForm.title" :visible.sync="visibility"  :close-on-click-modal="isClose"
              :close-on-press-escape="isClose">
 
     <div class="filter-container">
@@ -70,6 +70,7 @@
     name: 'salesReturnDialog',
     data() {
       return {
+        visibility:false,
         goodInfo: [],
         goodInfoTableData: [],
         keywords: '',
@@ -82,13 +83,15 @@
       propForm: {
         type: Object
       },
-      visibility: {
-        type: Boolean,
-        default: false
-      }
 
     },
     methods: {
+      hide:function(){
+        this.visibility = false
+      },
+      show:function(){
+        this.visibility = true
+      },
       goodTypeTableChange: function(currentRow, oldCurrentRow) {
         this.currentGoodTypeId = currentRow.id
 

src/xt_pages/stock/Dialog/stockInDialog.vue

@@ -1,5 +1,5 @@
 <template>
-  <el-dialog :title="propForm.title" :visible.sync="visibility" :show-close="isClose" :close-on-click-modal="isClose"
+  <el-dialog :title="propForm.title" :visible.sync="visibility" :close-on-click-modal="isClose"
              :close-on-press-escape="isClose">
 
     <div class="filter-container">
@@ -77,20 +77,22 @@
         keywords: '',
         multipleSelection: [],
         currentGoodTypeId: 0,
-        isClose: false
+        isClose: false,
+        visibility: false,
       }
     },
     props: {
       propForm: {
         type: Object
       },
-      visibility: {
-        type: Boolean,
-        default: false
-      }
-
     },
     methods: {
+      hide:function(){
+        this.visibility = false
+      },
+      show:function(){
+        this.visibility = true
+      },
       goodTypeTableChange: function(currentRow, oldCurrentRow) {
         this.currentGoodTypeId = currentRow.id
         const params = {

src/xt_pages/stock/cancelStockOrderAdd.vue

@@ -10,7 +10,7 @@
 
   <div class="app-container">
 
-    <sales-return-dialog :propForm="propForm"
+    <sales-return-dialog ref="dialog" :propForm="propForm"
                          :visibility="isVisibility"
                          v-on:dialog-comfirm="comfirm"
                          v-on:dialog-cancle="cancle"></sales-return-dialog>
@@ -26,7 +26,7 @@
                           value-format="yyyy-MM-dd"></el-date-picker>
         </div>
         <div class="cell clearfix">
-          <label class="title"><span class="name">厂商</span> : </label>
+          <label class="title"><span class="name">厂商<span style="color: red;margin-left: -15px">*</span></span> : </label>
           <el-select  v-model="form.manufacturer" clearable  placeholder="请选择厂商" @change="changeManufacturer()">
             <el-option
               v-for="(option, index) in manufacturer"
@@ -183,7 +183,7 @@
     },
     methods: {
       comfirm: function(val) {
-        this.isVisibility = false
+        this.$refs.dialog.hide()
         if (val.selectedGoodInfo.length > 0) {
           for (let i = val.selectedGoodInfo.length - 1; ;i--) {
             if (i == 0) {
@@ -194,14 +194,19 @@
               tempForm['good_type_id'] = val.goodTypeId
               tempForm['good_id'] = val.selectedGoodInfo[i].id
               tempForm['return_count'] = ''
-              this.recordInfo.recordData.push(tempForm)
+              // this.recordInfo.recordData.push(tempForm)
+              this.recordInfo.recordData.splice(this.currentIndex+1, 0, tempForm);
+
+
+
             }
           }
         }
 
         this.currentIndex = -1
       }, cancle: function() {
-        this.isVisibility = false
+        this.$refs.dialog.hide()
+
       }, GetConfigInfo: function() {
         const params = {
           type: this.$route.query.type
@@ -292,7 +297,7 @@
           this.$message.error('请先选择厂商')
           return
         } else {
-          this.isVisibility = true
+          this.$refs.dialog.show()
           console.log(this.form.manufacturer)
           for (let i = 0; i < this.propForm.goodInfo.length; i++) {
             if (this.propForm.goodInfo[i].manufacturer == this.form.manufacturer) {

src/xt_pages/stock/cancelStockOrderEdit.vue

@@ -178,7 +178,8 @@
               tempForm['good_type_id'] = val.goodTypeId
               tempForm['good_id'] = val.selectedGoodInfo[i].id
               tempForm['count'] = ''
-              this.recordInfo.recordData.push(tempForm)
+              this.recordInfo.recordData.splice(this.currentIndex+1, 0, tempForm);
+
             }
           }
         }

src/xt_pages/stock/config/dealer.vue

@@ -2,7 +2,7 @@
 
   <div class=" sign-and-weigh-box" style="background: white">
 
-    <manufacturer-or-dealer-dialog :titles="dealerDialog.titles" :formValue="dealerDialog.formValue"
+    <manufacturer-or-dealer-dialog ref="dialog" :titles="dealerDialog.titles" :formValue="dealerDialog.formValue"
                                    :visibility="dealerDialog.isVisibility"
                                    :type="dealerDialog.type" :isCreated="dealerDialog.isCreated"
                                    v-on:dialog-comfirm="manufacturerDialogComfirm"
@@ -20,35 +20,34 @@
 
         <!--<el-button style="float:right;margin-bottom: 10px" type="primary" @click="showDialog">新增经销商</el-button>-->
 
-        <el-table :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)'}" :data="dealerData" :class="signAndWeighBoxPatients" style="width: 100%" border
+        <el-table :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)'}" :data="dealerData"  style="width: 100%" border
                   v-loading="loading"
         >
 
-          <el-table-column type="index" label="序号" min-width="20" align="center"></el-table-column>
-          <el-table-column label="经销商编码" min-width="30" align="center">
+          <el-table-column label="经销商编码"  align="center">
             <template slot-scope="scope">
               {{scope.row.dealer_code}}
             </template>
           </el-table-column>
-          <el-table-column label="经销商名称" min-width="30" align="center">
+          <el-table-column label="经销商名称" align="center">
             <template slot-scope="scope">
               {{scope.row.dealer_name}}
 
             </template>
           </el-table-column>
-          <el-table-column label="联系人" min-width="30" align="center">
+          <el-table-column label="联系人" align="center">
             <template slot-scope="scope">
               {{scope.row.contact}}
 
             </template>
           </el-table-column>
-          <el-table-column label="联系人电话" min-width="30" align="center">
+          <el-table-column label="联系人电话"  align="center">
             <template slot-scope="scope">
               {{scope.row.contact_phone}}
 
             </template>
           </el-table-column>
-          <el-table-column label="联系地址" min-width="70" align="center">
+          <el-table-column label="联系地址"  align="center">
             <template slot-scope="scope">
               {{scope.row.contact_address}}
             </template>
@@ -72,11 +71,6 @@
                 </el-button>
               </el-tooltip>
 
-              <!--<el-button-->
-                <!--size="mini"-->
-                <!--type="primary"-->
-                <!--@click="showDetails(scope.$index, scope.row)">查看详情-->
-              <!--</el-button>-->
             </template>
           </el-table-column>
 
@@ -186,7 +180,8 @@
             this.dealerDialog.formValue.contact_address = response.data.data.dealer.contact_address
             this.dealerDialog.formValue.remark = response.data.data.dealer.remark
             this.dealerDialog.isCreated = 2
-            this.dealerDialog.isVisibility = true
+            this.$refs.dialog.show()
+
             this.dealer_code = response.data.data.dealer.dealer_code
 
           }
@@ -246,7 +241,8 @@
         });
       },
       manufacturerDialogComfirm: function (val) {
-        this.dealerDialog.isVisibility = false
+        this.$refs.dialog.hide()
+
 
         if (val.isCreated == 2) { //修改
           let params = {
@@ -305,12 +301,14 @@
 
       },
       manufacturerDialogCancle: function () {
-        this.dealerDialog.isVisibility = false
+        this.$refs.dialog.hide()
+
       },
       showDialog: function () {
         // this.manufacturerDialog.formValue = {}
         this.dealerDialog.formValue = Object.assign({}, this.dealerDialog.resetForm)
-        this.dealerDialog.isVisibility = true
+        this.$refs.dialog.show()
+
         this.dealerDialog.isCreated = 1
 
       }, handleSizeChange(val) {

src/xt_pages/stock/config/goodInfo.vue

@@ -3,7 +3,7 @@
   <div class=" sign-and-weigh-box" style="background: white">
 
 
-    <good-info-dailog :titles="goodInfo.goodInfoDialog.goodInfoTitle" :formValue="goodInfo.goodInfoDialog.formValue"
+    <good-info-dailog ref="dialog" :titles="goodInfo.goodInfoDialog.goodInfoTitle" :formValue="goodInfo.goodInfoDialog.formValue"
                       :visibility="goodInfo.goodInfoDialog.isVisibility"
                       :isCreated="goodInfo.goodInfoDialog.isCreated" v-on:dialog-comfirm="goodInfoDialogComfirm"
                       v-on:dialog-cancle="goodInfoDialogCancle"></good-info-dailog>
@@ -17,43 +17,43 @@
           <el-button size="small" icon="el-icon-circle-plus-outline" style="float: right;margin-bottom: 15px" type="primary" @click="showInfoDialog">新增</el-button>
         </div>
 
-        <el-table :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)'}" :data="goodInfo.goodInfoData" :class="signAndWeighBoxPatients" style="width: 100%" border
+        <el-table :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)'}" :data="goodInfo.goodInfoData"  style="width: 100%" border
                   v-loading="goodInfo.loading"
         >
-          <el-table-column label="商品编码" min-width="30" align="center">
+          <el-table-column label="商品编码"  align="center">
             <template slot-scope="scope">
               {{scope.row.good_code}}
             </template>
           </el-table-column>
-          <el-table-column label="规格名称" min-width="30" align="center">
+          <el-table-column label="规格名称"  align="center">
             <template slot-scope="scope">
               {{scope.row.specification_name}}
 
             </template>
           </el-table-column>
 
-          <el-table-column label="进价" min-width="30" align="center">
+          <el-table-column label="进价"  align="center">
             <template slot-scope="scope">
               {{scope.row.buy_price}}
 
             </template>
           </el-table-column>
-          <el-table-column label="出货价" min-width="30" align="center">
+          <el-table-column label="出货价"  align="center">
             <template slot-scope="scope">
               {{scope.row.sell_price}}
             </template>
           </el-table-column>
-          <el-table-column label="有效期预警" min-width="30" align="center">
+          <el-table-column label="有效期预警"  align="center">
             <template slot-scope="scope">
               {{scope.row.expiry_date_warn_day_count}}
             </template>
           </el-table-column>
-          <el-table-column label="库存预警" min-width="30" align="center">
+          <el-table-column label="库存预警" align="center">
             <template slot-scope="scope">
               {{scope.row.stock_warn_count}}
             </template>
           </el-table-column>
-          <el-table-column label="操作" align="center" min-width="100">
+          <el-table-column label="操作" align="center" >
             <template slot-scope="scope">
               <el-tooltip class="item" effect="dark" content="编辑" placement="top">
                 <el-button
@@ -72,11 +72,6 @@
                 </el-button>
               </el-tooltip>
 
-              <!--<el-button-->
-                <!--size="mini"-->
-                <!--type="primary"-->
-                <!--@click="showGoodInfoDetails(scope.$index, scope.row)">详情-->
-              <!--</el-button>-->
             </template>
           </el-table-column>
 
@@ -216,9 +211,10 @@
             this.goodInfo.goodInfoDialog.formValue.is_reuse = response.data.data.goodInfo.is_reuse.toString()
             this.goodInfo.goodInfoDialog.formValue.remark = response.data.data.goodInfo.remark
             this.goodInfo.goodInfoDialog.isCreated = 2
-            this.goodInfo.goodInfoDialog.isVisibility = true
             this.goodInfo.good_code = response.data.data.goodInfo.good_code
             this.goodInfo.goodInfoDialog.formValue.good_id =response.data.data.goodInfo.good_type_id
+            this.$refs.dialog.show()
+
           }
         });
 
@@ -327,7 +323,8 @@
         });
 
       }, goodInfoDialogComfirm: function (val) {
-        this.goodInfo.goodInfoDialog.isVisibility = false
+        this.$refs.dialog.hide()
+
         if (val.isCreated == 2) { //修改
           val['id'] = this.goodInfo.editGoodId
           val['good_code'] = this.goodInfo.good_code
@@ -374,9 +371,11 @@
 
       },
       goodInfoDialogCancle: function () {
-        this.goodInfo.goodInfoDialog.isVisibility = false
+        this.$refs.dialog.hide()
+
 
       }, showInfoDialog: function () {
+        this.$refs.dialog.show()
         this.getAllDealer()
         this.getAllManufacturer()
         this.goodInfo.goodInfoDialog.formValue.goodType = []

src/xt_pages/stock/config/goodType.vue

@@ -1,7 +1,7 @@
 <template>
 
   <div class=" sign-and-weigh-box" style="background: white">
-    <good-type-dialog :titles="goodType.goodTypeDialog.goodTypeTitle" :formValue="goodType.goodTypeDialog.formValue"
+    <good-type-dialog ref="dialog" :titles="goodType.goodTypeDialog.goodTypeTitle" :formValue="goodType.goodTypeDialog.formValue"
                       :visibility="goodType.goodTypeDialog.isVisibility"
                       :isCreated="goodType.goodTypeDialog.isCreated" v-on:dialog-comfirm="goodTypeDialogComfirm"
                       v-on:dialog-cancle="goodTypeDialogCancle"></good-type-dialog>
@@ -18,23 +18,23 @@
 
         <div style="margin-bottom: 10px;">
         </div>
-        <el-table :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)'}" :data="goodType.goodTypeData" :class="signAndWeighBoxPatients" style="width: 100%" border
+        <el-table :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)'}" :data="goodType.goodTypeData"  style="width: 100%" border
                   highlight-current-row
                   @row-click="onRowClick"
                   :row-class-name="tableRowClassName"
                   v-loading="goodType.loading"
         >
-          <el-table-column label="类型编码" min-width="30" align="center">
+          <el-table-column label="类型编码" align="center">
             <template slot-scope="scope">
               {{scope.row.type_code}}
             </template>
           </el-table-column>
-          <el-table-column label="类型名称" min-width="30" align="center">
+          <el-table-column label="类型名称" align="center">
             <template slot-scope="scope">
               {{scope.row.type_name}}
             </template>
           </el-table-column>
-          <el-table-column label="操作" align="center" min-width="70">
+          <el-table-column label="操作" align="center" >
             <template slot-scope="scope">
               <el-tooltip class="item" effect="dark" content="编辑" placement="top">
                 <el-button
@@ -208,7 +208,7 @@
             this.goodType.goodTypeDialog.formValue.remark = response.data.data.goodType.remark
             this.goodType.goodTypeDialog.formValue.type_name = response.data.data.goodType.type_name
             this.goodType.goodTypeDialog.isCreated = 2
-            this.goodType.goodTypeDialog.isVisibility = true
+            this.$refs.dialog.show()
             this.goodType.type_code = response.data.data.goodType.type_code
 
           }
@@ -265,7 +265,7 @@
 
 
       goodTypeDialogComfirm: function (val) {
-        this.goodType.goodTypeDialog.isVisibility = false
+        this.$refs.dialog.hide()
 
         if (val.isCreated == 2) { //修改
           let params = {
@@ -314,11 +314,13 @@
 
       },
       goodTypeDialogCancle: function () {
-        this.goodType.goodTypeDialog.isVisibility = false
+        this.$refs.dialog.hide()
+
 
 
       }, showDialog: function () {
-        this.goodType.goodTypeDialog.isVisibility = true
+        this.$refs.dialog.show()
+
 
       }, getList() {
         this.goodType.loading = true

src/xt_pages/stock/config/manufacturer.vue

@@ -1,97 +1,97 @@
 <template>
-<div class="main-contain">
-  <div class=" sign-and-weigh-box" style="background: white">
-
-    <manufacturer-or-dealer-dialog :titles="manufacturerDialog.titles" :formValue="manufacturerDialog.formValue"
-                                   :visibility="manufacturerDialog.isVisibility"
-                                   :type="manufacturerDialog.type" :isCreated="manufacturerDialog.isCreated"
-                                   v-on:dialog-comfirm="manufacturerDialogComfirm"
-                                   v-on:dialog-cancle="manufacturerDialogCancle"></manufacturer-or-dealer-dialog>
-
-    <el-row>
-      <el-col>
-
-        <div>
-          <el-button size="small" icon="el-icon-circle-plus-outline" style="float: right;margin-bottom: 15px" type="primary" @click="showDialog">新增</el-button>
-        </div>
-
-        <!--<div class="dataTitle"></div>-->
-
-        <el-table :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)'}" :data="manufacturerData" :class="signAndWeighBoxPatients" style="width: 100%" border
-                  v-loading="loading"
-        >
-          <el-table-column type="index" label="序号" min-width="20" align="center"></el-table-column>
-          <el-table-column label="厂家编码" min-width="30" align="center">
-            <template slot-scope="scope">
-              {{scope.row.manufacturer_code}}
-            </template>
-          </el-table-column>
-          <el-table-column label="厂家名称" min-width="30" align="center">
-            <template slot-scope="scope">
-              {{scope.row.manufacturer_name}}
-
-            </template>
-          </el-table-column>
-          <el-table-column label="联系人" min-width="30" align="center">
-            <template slot-scope="scope">
-              {{scope.row.contact}}
-
-            </template>
-          </el-table-column>
-          <el-table-column label="联系人电话" min-width="30" align="center">
-            <template slot-scope="scope">
-              {{scope.row.contact_phone}}
-
-            </template>
-          </el-table-column>
-          <el-table-column label="联系地址" min-width="70" align="center">
-            <template slot-scope="scope">
-              {{scope.row.contact_address}}
-            </template>
-          </el-table-column>
-          <el-table-column label="操作" align="center">
-            <template slot-scope="scope">
-              <el-tooltip class="item" effect="dark" content="编辑" placement="top">
-                <el-button
-                  size="small"
-                  type="primary"
-                  icon="el-icon-edit-outline"
-                  @click="handleEdit(scope.$index, scope.row)">
-                </el-button>
-              </el-tooltip>
-              <el-tooltip class="item" effect="dark" content="删除" placement="top">
-                <el-button
-                  size="small"
-                  type="danger"
-                  icon="el-icon-delete"
-                  @click="handleDelete(scope.$index, scope.row)">
-                </el-button>
-              </el-tooltip>
-              <!--<el-button-->
+  <div class="main-contain">
+    <div class=" sign-and-weigh-box" style="background: white">
+
+      <manufacturer-or-dealer-dialog ref="dialog" :titles="manufacturerDialog.titles" :formValue="manufacturerDialog.formValue"
+                                     :visibility="manufacturerDialog.isVisibility"
+                                     :type="manufacturerDialog.type" :isCreated="manufacturerDialog.isCreated"
+                                     v-on:dialog-comfirm="manufacturerDialogComfirm"
+                                     v-on:dialog-cancle="manufacturerDialogCancle"></manufacturer-or-dealer-dialog>
+
+      <el-row :gutter="15">
+        <el-col>
+
+          <div>
+            <el-button size="small" icon="el-icon-circle-plus-outline" style="float: right;margin-bottom: 15px"
+                       type="primary" @click="showDialog">新增
+            </el-button>
+          </div>
+
+
+          <el-table :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)'}" :data="manufacturerData"
+                    style="width: 100%" border
+                    v-loading="loading"
+          >
+            <el-table-column label="厂家编码" align="center">
+              <template slot-scope="scope">
+                {{scope.row.manufacturer_code}}
+              </template>
+            </el-table-column>
+            <el-table-column label="厂家名称" align="center">
+              <template slot-scope="scope">
+                {{scope.row.manufacturer_name}}
+
+              </template>
+            </el-table-column>
+            <el-table-column label="联系人" align="center">
+              <template slot-scope="scope">
+                {{scope.row.contact}}
+
+              </template>
+            </el-table-column>
+            <el-table-column label="联系人电话" align="center">
+              <template slot-scope="scope">
+                {{scope.row.contact_phone}}
+
+              </template>
+            </el-table-column>
+            <el-table-column label="联系地址" align="center">
+              <template slot-scope="scope">
+                {{scope.row.contact_address}}
+              </template>
+            </el-table-column>
+            <el-table-column label="操作" align="center">
+              <template slot-scope="scope">
+                <el-tooltip class="item" effect="dark" content="编辑" placement="top">
+                  <el-button
+                    size="small"
+                    type="primary"
+                    icon="el-icon-edit-outline"
+                    @click="handleEdit(scope.$index, scope.row)">
+                  </el-button>
+                </el-tooltip>
+                <el-tooltip class="item" effect="dark" content="删除" placement="top">
+                  <el-button
+                    size="small"
+                    type="danger"
+                    icon="el-icon-delete"
+                    @click="handleDelete(scope.$index, scope.row)">
+                  </el-button>
+                </el-tooltip>
+                <!--<el-button-->
                 <!--size="mini"-->
                 <!--type="primary"-->
                 <!--@click="showDetails(scope.$index, scope.row)">查看详情-->
-              <!--</el-button>-->
-            </template>
-          </el-table-column>
-        </el-table>
-
-        <el-pagination
-          @size-change="handleSizeChange"
-          @current-change="handleCurrentChange"
-          :page-sizes="[7]"
-          :page-size="7"
-          background
-          align="right"
-          style="margin-top:20px;"
-          layout="total, sizes, prev, pager, next, jumper"
-          :total="total">
-        </el-pagination>
-
-      </el-col>
-    </el-row>
+                <!--</el-button>-->
+              </template>
+            </el-table-column>
+          </el-table>
+
+          <el-pagination
+            @size-change="handleSizeChange"
+            @current-change="handleCurrentChange"
+            :page-sizes="[7]"
+            :page-size="7"
+            background
+            align="right"
+            style="margin-top:20px;"
+            layout="total, sizes, prev, pager, next, jumper"
+            :total="total">
+          </el-pagination>
+          </el-col>
+      </el-row>
+    </div>
   </div>
-</div>
 
 </template>
 
@@ -99,17 +99,17 @@
   import manufacturerOrDealerDialog from '../Dialog/manufacturerOrDealerDialog'
   import {
     createManufacturer,
-    modifyManufacturer,
-    getManufacturerList,
     deleteManufacturer,
-    GetManufacturer
-  } from "@/api/stock";
+    GetManufacturer,
+    getManufacturerList,
+    modifyManufacturer
+  } from '@/api/stock'
 
   export default {
     components: {
-      manufacturerOrDealerDialog,
+      manufacturerOrDealerDialog
     },
-    name: "manufacturer",
+    name: 'manufacturer',
     data() {
       return {
         signAndWeighBoxPatients: 'sign-and-weigh-box-patients',
@@ -120,11 +120,11 @@
 
         page: 1,
         limit: 7,
-        loading:false,
+        loading: false,
 
         manufacturer_code: '',
         editId: '',
-        editIndex:'',
+        editIndex: '',
         manufacturerDialog: {
           titles: '新增厂家',
           isVisibility: false,
@@ -138,7 +138,7 @@
             platform_number: '',
             email: '',
             contact_address: '',
-            remark: '',
+            remark: ''
           },
           resetForm: {
             manufacturer_name: '',
@@ -148,15 +148,14 @@
             platform_number: '',
             email: '',
             contact_address: '',
-            remark: '',
-          },
+            remark: ''
+          }
         }
 
-
-      };
+      }
     },
     methods: {
-      handleEdit: function (index, row) {
+      handleEdit: function(index, row) {
         this.editId = row.id
         this.editIndex = index
         let params = {
@@ -164,8 +163,8 @@
         }
         GetManufacturer(params).then(response => {
           if (response.data.state == 0) {
-            this.$message.error(response.data.msg);
-            return false;
+            this.$message.error(response.data.msg)
+            return false
           } else {
             this.manufacturerDialog.formValue.manufacturer_name = response.data.data.manufacturer.manufacturer_name
             this.manufacturerDialog.formValue.contact = response.data.data.manufacturer.contact
@@ -175,15 +174,14 @@
             this.manufacturerDialog.formValue.contact_address = response.data.data.manufacturer.contact_address
             this.manufacturerDialog.formValue.remark = response.data.data.manufacturer.remark
             this.manufacturerDialog.isCreated = 2
-            this.manufacturerDialog.isVisibility = true
+            this.$refs.dialog.show()
             this.manufacturer_code = response.data.data.manufacturer.manufacturer_code
 
           }
-        });
+        })
 
       },
-      handleDelete: function (index, row) {
-
+      handleDelete: function(index, row) {
 
         this.$confirm('确认删除这条厂家信息?', '删除厂家信息', {
           confirmButtonText: '确定',
@@ -196,31 +194,30 @@
 
           deleteManufacturer(params).then(response => {
             if (response.data.state == 0) {
-              this.$message.error(response.data.msg);
-              return false;
+              this.$message.error(response.data.msg)
+              return false
             } else {
-              this.manufacturerData.splice(index, 1);
+              this.manufacturerData.splice(index, 1)
               this.$notify({
-                title: "成功",
-                message: "厂家已经删除",
-                type: "success",
+                title: '成功',
+                message: '厂家已经删除',
+                type: 'success',
                 duration: 2000
-              });
+              })
             }
-          });
+          })
         }).catch(() => {
-        });
-
+        })
 
       },
-      showDetails: function (index, row) {
+      showDetails: function(index, row) {
         let params = {
           id: row.id
         }
         GetManufacturer(params).then(response => {
           if (response.data.state == 0) {
-            this.$message.error(response.data.msg);
-            return false;
+            this.$message.error(response.data.msg)
+            return false
           } else {
             this.manufacturerDialog.formValue.manufacturer_name = response.data.data.manufacturer.manufacturer_name
             this.manufacturerDialog.formValue.contact = response.data.data.manufacturer.contact
@@ -232,11 +229,11 @@
             this.manufacturerDialog.isCreated = 3
             this.manufacturerDialog.isVisibility = true
           }
-        });
+        })
       },
-      manufacturerDialogComfirm: function (val) {
-        this.manufacturerDialog.isVisibility = false
-
+      manufacturerDialogComfirm: function(val) {
+        // this.manufacturerDialog.isVisibility = false
+        this.$refs.dialog.hide()
         if (val.isCreated == 2) { //修改
           let params = {
             'manufacturer_name': val.manufacturer_name,
@@ -251,8 +248,8 @@
           }
           modifyManufacturer(params).then(response => {
             if (response.data.state == 0) {
-              this.$message.error(response.data.msg);
-              return false;
+              this.$message.error(response.data.msg)
+              return false
             } else {
               this.manufacturerData[this.editIndex].manufacturer_name = response.data.data.manufacturer.manufacturer_name
               this.manufacturerData[this.editIndex].contact = response.data.data.manufacturer.contact
@@ -263,61 +260,61 @@
               this.manufacturerData[this.editIndex].remark = response.data.data.manufacturer.remark
               this.manufacturerData[this.editIndex].manufacturer_code = response.data.data.manufacturer.manufacturer_code
               this.$notify({
-                title: "成功",
-                message: "修改成功",
-                type: "success",
+                title: '成功',
+                message: '修改成功',
+                type: 'success',
                 duration: 2000
-              });
+              })
 
             }
-          });
+          })
 
         } else if (val.isCreated == 1) { //新增
           createManufacturer(val).then(response => {
             if (response.data.state == 0) {
-              this.$message.error(response.data.msg);
-              return false;
+              this.$message.error(response.data.msg)
+              return false
             } else {
               this.manufacturerData.unshift(response.data.data.manufacturer)
               this.$notify({
-                title: "成功",
-                message: "新增成功",
-                type: "success",
+                title: '成功',
+                message: '新增成功',
+                type: 'success',
                 duration: 2000
-              });
+              })
 
             }
-          });
+          })
 
         }
 
-
       },
-      manufacturerDialogCancle: function () {
-        this.manufacturerDialog.isVisibility = false
+      manufacturerDialogCancle: function() {
+        this.$refs.dialog.hide()
+
       },
-      showDialog: function () {
+      showDialog: function() {
         this.manufacturerDialog.formValue = Object.assign({}, this.manufacturerDialog.resetForm)
-        this.manufacturerDialog.isVisibility = true
+        this.$refs.dialog.show()
         this.manufacturerDialog.isCreated = 1
 
       }, handleSizeChange(val) {
-        this.limit = val;
-        this.getList();
+        this.limit = val
+        this.getList()
       }, handleCurrentChange(val) {
-        this.page = val;
-        this.getList();
-      },getList(){
+        this.page = val
+        this.getList()
+      }, getList() {
         let params = {
-          'page':this.page,
-          'limit':this.limit
+          'page': this.page,
+          'limit': this.limit
         }
         this.loading = true
         getManufacturerList(params).then(response => {
           if (response.data.state == 0) {
             this.loading = false
-            this.$message.error(response.data.msg);
-            return false;
+            this.$message.error(response.data.msg)
+            return false
           } else {
             this.loading = false
             this.total = response.data.data.total
@@ -326,7 +323,7 @@
               this.manufacturerData.push(response.data.data.manufacturer[i])
             }
           }
-        });
+        })
 
       }
     },
@@ -334,62 +331,8 @@
       this.getList()
 
     }
-  };
-</script>
-
-<style rel="stylesheet/css" lang="scss" scoped>
-  .information {
-    border: 1px #dcdfe6 solid;
-    padding: 30px 20px 30px 20px;
-
-    .border {
-      border-bottom: 1px #dcdfe6 solid;
-      margin: 0px 0 20px 0;
-    }
-  }
-
-  .title {
-    height: 44px;
-    line-height: 44px;
-    padding: 0 0 0 10px;
-    margin: 0 0 10px 0;
-    // border-radius: 4px 4px 0 0;
-  }
-
-  .edit_separater {
-    border-top: 1px solid rgb(233, 233, 233);
-    margin-top: 15px;
-    margin-bottom: 15px;
   }
+</script>
 
-</style>
-
-<style>
-  .sign-and-weigh-box .sign-and-weigh-box-patients .cell {
-    font-size: 12px;
-  }
 
-  .sign-and-weigh-box .sign-and-weigh-box-patients .current-row > td {
-    background: #6fb5fa;
-  }
 
-  .dataTitle {
-    color: #409eff;
-    font-size: 16px;
-    border-bottom: 1px #409eff solid;
-    height: 36px;
-    line-height: 30px;
-    margin: 0 0 15px 0;
-    position: relative;
-    padding: 0 0 6px 15px;
-  &::before {
-     position: absolute;
-     left: 0;
-     bottom: 10px;
-     content: "";
-     width: 2px;
-     height: 20px;
-     background: #409eff;
-   }
-  }
-</style>

src/xt_pages/stock/otherCancelStockOrder.vue

@@ -33,7 +33,6 @@
 
       </div>
 
-      <el-row :gutter="12" style="margin-top: 10px">
         <el-table
           :data="cancelStockDate"
           :class="signAndWeighBoxPatients"
@@ -115,7 +114,6 @@
           :total="total">
         </el-pagination>
 
-      </el-row>
     </div>
   </div>
 </template>

src/xt_pages/stock/salesReturnEdit.vue

@@ -184,7 +184,8 @@
               tempForm['good_type_id'] = val.goodTypeId
               tempForm['good_id'] = val.selectedGoodInfo[i].id
               tempForm['count'] = ''
-              this.recordInfo.recordData.push(tempForm)
+              this.recordInfo.recordData.splice(this.currentIndex+1, 0, tempForm);
+
             }
           }
         }

src/xt_pages/stock/salesReturnOrderAdd.vue

@@ -22,7 +22,8 @@
 
 
       <div class="cell clearfix">
-        <label class="title"><span class="name">厂商</span> : </label>
+        <label class="title"><span class="name">厂商<span style="color: red;margin-left: -15px">*</span></span> : </label>
+
         <el-select v-model="form.manufacturer" clearable placeholder="请选择厂商" @change="changeManufacturer()">
           <el-option
             v-for="(option, index) in manufacturer"
@@ -203,7 +204,8 @@
               tempForm['good_id'] = val.selectedGoodInfo[i].id
               tempForm['return_count'] = ''
               tempForm['price'] = ''
-              this.recordInfo.recordData.push(tempForm)
+              this.recordInfo.recordData.splice(this.currentIndex+1, 0, tempForm);
+
             }
           }
         }

src/xt_pages/stock/stockInOrderAdd.vue

@@ -22,7 +22,8 @@
       </div>
 
       <div class="cell clearfix">
-        <label class="title"><span class="name">厂商</span> : </label>
+        <label class="title"><span class="name">厂商<span style="color: red;margin-left: -15px">*</span></span> : </label>
+
         <el-select  v-model="form.manufacturer" clearable  placeholder="请选择厂商" @change="changeManufacturer()" >
           <el-option
             v-for="(option, index) in manufacturer"
@@ -356,7 +357,9 @@
               tempForm['remark'] = ''
               tempForm['dealer'] = ''
               tempForm['manufacturer'] = ''
-              this.recordInfo.recordData.push(tempForm)
+              // this.recordInfo.recordData.add(tempForm,this.currentIndex + i)
+              // this.recordInfo.recordData.push(tempForm)
+              this.recordInfo.recordData.splice(this.currentIndex+1, 0, tempForm);
             }
           }
         }

src/xt_pages/stock/stockInOrderDetail.vue

@@ -79,13 +79,12 @@
           </template>
         </el-table-column>
         <el-table-column label="生产日期" min-width="40" align="center">
-          <template slot-scope="scope">
+          <template v-if="scope.row.product_date != 0" slot-scope="scope">
             {{scope.row.product_date | parseTime('{y}-{m}-{d}')}}
-
           </template>
         </el-table-column>
         <el-table-column label="有效日期" min-width="40" align="center">
-          <template slot-scope="scope">
+          <template v-if="scope.row.product_date != 0" slot-scope="scope">
             {{ scope.row.expiry_date | parseTime('{y}-{m}-{d}')}}
           </template>
         </el-table-column>

src/xt_pages/stock/stockInOrderEdit.vue

@@ -278,7 +278,8 @@ export default {
               tempForm['remark'] = ''
               tempForm['dealer'] = ''
               tempForm['manufacturer'] = ''
-              this.recordInfo.recordData.push(tempForm)
+              this.recordInfo.recordData.splice(this.currentIndex+1, 0, tempForm);
+
             }
           }
         }

src/xt_pages/stock/stockOutOrderAdd.vue

@@ -25,7 +25,8 @@
 
 
     <div class="cell clearfix">
-      <label class="title"><span class="name">厂商</span> : </label>
+      <label class="title"><span class="name">厂商<span style="color: red;margin-left: -15px">*</span></span> : </label>
+
       <el-select  v-model="form.manufacturer" clearable  placeholder="请选择厂商"  @change="changeManufacturer()">
         <el-option
           v-for="(option, index) in manufacturer"
@@ -223,8 +224,8 @@
               tempForm['count'] = ''
               tempForm['price'] = ''
               tempForm['remark'] = ''
+              this.recordInfo.recordData.splice(this.currentIndex+1, 0, tempForm);
 
-              this.recordInfo.recordData.push(tempForm)
             }
           }
         }

src/xt_pages/stock/stockOutOrderEdit.vue

@@ -207,8 +207,8 @@
               tempForm['count'] = ''
               tempForm['price'] = ''
               tempForm['remark'] = ''
+              this.recordInfo.recordData.splice(this.currentIndex+1, 0, tempForm);
 
-              this.recordInfo.recordData.push(tempForm)
             }
           }
         }

src/xt_pages/user/components/PatientDetail.vue

@@ -61,7 +61,7 @@
                 </el-radio-group>
               </el-form-item>
             </el-col>
-            <el-col :span="8" style="height:59px;"> 
+            <el-col :span="8" style="height:59px;">
               <el-form-item label="治疗状态(转归) : " class="is-required" prop="lapseto"  >
                 <el-radio-group v-model="form.lapseto">
                   <el-radio v-for="item in lapsetoOptions" :key="item.value" :label="item.value" :value="item.value" disabled>{{item.label}}</el-radio>
@@ -235,7 +235,7 @@
             </el-checkbox-group>
           </el-form-item>
         </el-col>
-       
+
         <el-col :span="24">
           <el-form-item label="诊断 : " prop="diagnose">
             <!-- <textarea v-model="form.diagnose" class="textarea" disabled></textarea> -->
@@ -300,7 +300,7 @@
       <div id="print-info-box" >
         <div class="print_main_content">
             <div class="order_title">
-                方济医院血液透析门诊病历
+               {{orgname}} 血液透析门诊病历
             </div>
             <div>
                 <table>