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/addInspection.vue

@@ -313,7 +313,7 @@
             this.projectList[i].number =  this.projectList[i].number.toString()
             this.tableData.push(this.projectList[i])
             this.form.project_detail = ""
-            this.form.number = ""
+            this.form.number = 1
           }
         }
         // console.log("33333",this.tableData)

src/xt_pages/data/components/consumables.vue

@@ -105,7 +105,7 @@
           {{ getGoodUnit(scope.row.good_unit) }}
         </template>
       </el-table-column> -->
-      <el-table-column label="零售价" width="60" align="center">
+      <el-table-column label="零售价" width="100" align="center">
         <template slot-scope="scope">
           {{ scope.row.retail_price }}
         </template>
@@ -124,18 +124,18 @@
 
       </el-table-column>
 
-      <el-table-column prop="date" label="操作" width="300" align="center">
+      <el-table-column prop="date" label="操作" width="320" align="center">
         <template slot-scope="scope">
           <el-button @click="handleGoodInfoEdit(scope.$index, scope.row)" type="primary" size="small">编辑</el-button>
           <!--<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)" v-if="$store.getters.xt_user.org_id == 9504 || $store.getters.xt_user.org_id == 10028 || $store.getters.xt_user.org_id == 10138">
+          <el-button type="primary" size="small" @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 || $store.getters.xt_user.org_id == 10138">
              <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">
+          <el-button type="primary" size="small" 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>

src/xt_pages/data/components/drugs.vue

@@ -76,12 +76,12 @@
        ></el-table-column>
       <el-table-column type="index" label="序号" width="60px" align="center"></el-table-column>
 
-      <el-table-column prop="date" label="药品名称" align="center" width="100">
+      <el-table-column prop="date" label="药品名称" align="center" >
         <template slot-scope="scope">
           <div>{{scope.row.drug_name}}</div>
         </template>
       </el-table-column>
-      <el-table-column prop="date" label="单位&规格" width="120" align="center">
+      <el-table-column prop="date" label="单位&规格" align="center">
         <template slot-scope="scope">
           <!-- <div>{{scope.row.drug_spec}}</div> -->
           <div>
@@ -99,12 +99,12 @@
           <div>{{scope.row.min_unit}}</div>
         </template>
       </el-table-column> -->
-      <el-table-column prop="date" label="进货价" width="60" align="center">
+      <el-table-column prop="date" label="进货价" width="100" align="center">
         <template slot-scope="scope">
           <div>{{scope.row.last_price}}</div>
         </template>
       </el-table-column>
-      <el-table-column label="零售价" width="60" align="center">
+      <el-table-column label="零售价" width="100" align="center">
         <template slot-scope="scope">
           <div>{{scope.row.retail_price}}</div>
         </template>

src/xt_pages/data/components/inspection.vue

@@ -37,7 +37,7 @@
                    {{scope.row.wubi}}
                 </template>
             </el-table-column>
-            <el-table-column label="价格" width="60" align="center">
+            <el-table-column label="价格" width="100" align="center">
                 <template slot-scope="scope">
                    {{scope.row.price}}
                 </template>

src/xt_pages/outpatientCharges/invoiceTemplate/printTwo.vue

@@ -9,9 +9,9 @@
             <div  style="position: absolute;top:40px;left:300px">{{ list.number }}</div>
             <div></div>
             <div>
-                <span style="position: absolute;left:590px;top:40px;">{{ printDate.slice(0,4) }}</span>
-                <span style="position: absolute;left:630px;top:40px;">{{ printDate.slice(5,7) }}</span>
-                <span style="position: absolute;left:690px;top:40px;">{{ printDate.slice(8,11) }}</span>
+                <span style="position: absolute;left:590px;top:40px;">{{ paramsObj.setl_time.split(' ')[0].slice(0,4) }}</span>
+                <span style="position: absolute;left:630px;top:40px;">{{ paramsObj.setl_time.split(' ')[0].slice(5,7) }}</span>
+                <span style="position: absolute;left:690px;top:40px;">{{ paramsObj.setl_time.split(' ')[0].slice(8,11) }}</span>
             </div>
         </div>
         <div style="display:flex;justify-content: space-between;">

src/xt_pages/stock/drugs/drugStockInOrderAdd.vue

@@ -878,5 +878,8 @@
   .sign-and-weigh-box .sign-and-weigh-box-patients .current-row > td {
     background: #6fb5fa;
   }
+  .el-autocomplete-suggestion{
+    width: 400px !important;
+  }
 
 </style>

src/xt_pages/stock/drugs/drugStockOutOrderAdd.vue

@@ -823,4 +823,7 @@ export default {
 .sign-and-weigh-box .sign-and-weigh-box-patients .current-row > td {
   background: #6fb5fa;
 }
+.el-autocomplete-suggestion{
+  width: 400px !important;
+}
 </style>

src/xt_pages/stock/stockInOrderAdd.vue

@@ -825,6 +825,7 @@
     margin-top: 15px;
     margin-bottom: 15px;
   }
+  
 
 </style>
 
@@ -836,5 +837,9 @@
   .sign-and-weigh-box .sign-and-weigh-box-patients .current-row > td {
     background: #6fb5fa;
   }
+  .el-autocomplete-suggestion{
+    width: 400px !important;
+  }
+  
 
 </style>

src/xt_pages/stock/stockOutOrderAdd.vue

@@ -718,4 +718,7 @@ export default {
 .sign-and-weigh-box .sign-and-weigh-box-patients .current-row > td {
   background: #6fb5fa;
 }
+.el-autocomplete-suggestion{
+  width: 400px !important;
+}
 </style>