修改库存

src/xt_pages/stock/cancelStockOrder.vue

@@ -11,7 +11,7 @@
     <div class="app-container">
 
 
-      <div class="cell clearfix" style="margin-top:20px">
+      <div class="cell clearfix" >
         <el-input style="width: 300px;" class="filter-item" placeholder="单据日期/单据编码/制单人/供应商"/>
         <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
       </div>
@@ -37,7 +37,7 @@
         <el-table
           :data="cancelStockDate"
           :class="signAndWeighBoxPatients"
-          style="width: 100%" border
+          border
           highlight-current-row
           ref="multipleTable"
           @selection-change="select"
@@ -87,7 +87,7 @@
                 <el-button
                   size="mini"
                   type="primary"
-                  icon="el-icon-edit"
+                  icon="el-icon-edit-outline"
                   @click="handleEdit(scope.$index, scope.row)">
                 </el-button>
               </el-tooltip>

src/xt_pages/stock/cancelStockOrderAdd.vue

@@ -111,7 +111,7 @@
                   <el-button
                     size="mini"
                     type="danger"
-                    icon="el-icon-remove-outline"
+                    icon="el-icon-delete"
                     @click="handleDelete(scope.$index, scope.row)">
                   </el-button>
                 </el-tooltip>

src/xt_pages/stock/cancelStockOrderEdit.vue

@@ -85,7 +85,7 @@
                 <el-button
                   size="mini"
                   type="danger"
-                  icon="el-icon-remove-outline"
+                  icon="el-icon-delete"
                   @click="handleDelete(scope.$index, scope.row)">
                 </el-button>
               </el-tooltip>

src/xt_pages/stock/otherCancelStockOrder.vue

@@ -10,7 +10,7 @@
 
     <div class="app-container">
 
-      <div class="cell clearfix" style="margin-top:20px">
+      <div class="cell clearfix">
         <el-input style="width: 300px;" class="filter-item" placeholder="单据日期/单据编码/制单人/供应商"/>
         <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
       </div>
@@ -86,7 +86,7 @@
                 <el-button
                   size="mini"
                   type="primary"
-                  icon="el-icon-edit"
+                  icon="el-icon-edit-outline"
                   @click="handleEdit(scope.$index, scope.row)">
                 </el-button>
               </el-tooltip>

src/xt_pages/stock/otherSalesReturnOrder.vue

@@ -10,7 +10,7 @@
 
     <div class="app-container">
 
-      <div class="cell">
+      <div class="cell clearfix">
         <el-input style="width: 400px;" class="filter-item" placeholder="单据日期/单据编码/制单人/供应商"/>
         <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
       </div>
@@ -87,7 +87,7 @@
               <el-button
                 size="mini"
                 type="primary"
-                icon="el-icon-edit"
+                icon="el-icon-edit-outline"
                 @click="handleEdit(scope.$index, scope.row)">
               </el-button>
               </el-tooltip>

src/xt_pages/stock/otherStockInOrder.vue

@@ -86,7 +86,7 @@
               <el-button
                 size="small"
                 type="primary"
-                icon="el-icon-edit"
+                icon="el-icon-edit-outline"
                 @click="handleEdit(scope.$index, scope.row)">
               </el-button>
             </el-tooltip>

src/xt_pages/stock/otherStockOutOrder.vue

@@ -82,7 +82,7 @@
               <el-button
                 size="mini"
                 type="primary"
-                icon="el-icon-edit"
+                icon="el-icon-edit-outline"
                 @click="handleEdit(scope.$index, scope.row)">
               </el-button>
             </el-tooltip>

src/xt_pages/stock/salesReturnEdit.vue

@@ -87,7 +87,7 @@
                   <el-button
                     size="mini"
                     type="danger"
-                    icon="el-icon-remove-outline"
+                    icon="el-icon-delete"
                     @click="handleDelete(scope.$index, scope.row)">
                   </el-button>
                 </el-tooltip>

src/xt_pages/stock/salesReturnOrder.vue

@@ -10,7 +10,7 @@
 
     <div class="app-container">
 
-      <div class="cell" >
+      <div class="cell clearfix" >
         <el-input style="width: 400px;" class="filter-item" placeholder="单据日期/单据编码/制单人/供应商"/>
         <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
       </div>
@@ -85,7 +85,7 @@
               <el-button
                 size="mini"
                 type="primary"
-                icon="el-icon-edit"
+                icon="el-icon-edit-outline"
                 @click="handleEdit(scope.$index, scope.row)">
               </el-button>
               </el-tooltip>

src/xt_pages/stock/salesReturnOrderAdd.vue

@@ -116,7 +116,7 @@
                 <el-button
                   size="mini"
                   type="danger"
-                  icon="el-icon-remove-outline"
+                  icon="el-icon-delete"
                   @click="handleDelete(scope.$index, scope.row)">
                 </el-button>
               </el-tooltip>

src/xt_pages/stock/stockInOrder.vue

@@ -8,7 +8,7 @@
     </div>
 
     <div class="app-container">
-    <div class="cell">
+    <div class="cell clearfix">
       <el-input   style="width: 400px;" v-model="searchKey" class="filter-item"  placeholder="单据日期/单据编码/制单人/供应商" />
       <el-button  class="filter-item" type="primary" icon="el-icon-search" @click="search" >搜索</el-button>
     </div>

src/xt_pages/stock/stockInOrderAdd.vue

@@ -47,11 +47,11 @@
 
 
             <el-form :rules="tableRules" :model="recordInfo" ref="tableForm">
-              <el-table :data="recordInfo.recordData" :class="signAndWeighBoxPatients" style="width: 100%" border
+              <el-table   id="oictable" :data="recordInfo.recordData" :class="signAndWeighBoxPatients" border style="width: 100%"
                         max-height="450" :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}"
               >
 
-                <el-table-column min-width="35" align="center">
+                <el-table-column  align="center" width="200">
 
                   <template slot="header" slot-scope="scope">
                     <span>物品类型<span style="color: red">*</span></span>
@@ -65,7 +65,7 @@
                     </el-form-item>
                   </template>
                 </el-table-column>
-                <el-table-column min-width="35" align="center">
+                <el-table-column align="center" width="200">
                   <template slot="header" slot-scope="scope">
                     <span>规格名称<span style="color: red">*</span></span>
                   </template>
@@ -81,7 +81,7 @@
                 </el-table-column>
 
 
-                <el-table-column min-width="23" align="center">
+                <el-table-column  align="center" width="150">
                   <template slot="header" slot-scope="scope">
                     <span>单价<span style="color: red">*</span></span>
                   </template>
@@ -89,14 +89,14 @@
                     <!--<el-input type="number" v-model="scope.row.price"  @blur="handleBlur(scope.$index, scope.row)"></el-input>-->
                     <el-form-item :prop="'recordData.' + scope.$index + '.price'" :rules='tableRules.price'
                                   style="padding-top: 17px">
-                      <el-input type="number" v-model="scope.row.price"></el-input>
+                      <el-input placeholder="请输入单价"  type="number" v-model="scope.row.price"></el-input>
                     </el-form-item>
 
 
                   </template>
                 </el-table-column>
 
-                <el-table-column min-width="23" align="center">
+                <el-table-column  align="center"  width="180">
                   <template slot="header" slot-scope="scope">
                     <span>入库数量<span style="color: red">*</span></span>
                   </template>
@@ -106,18 +106,18 @@
 
                     <el-form-item :prop="'recordData.' + scope.$index + '.warehousing_count'"
                                   :rules='tableRules.warehousing_count' style="padding-top: 17px">
-                      <el-input type="number" v-model="scope.row.warehousing_count"></el-input>
+                      <el-input placeholder="请输入入库数量"  type="number" v-model="scope.row.warehousing_count"></el-input>
                     </el-form-item>
                   </template>
                 </el-table-column>
 
-                <el-table-column label="总价" min-width="20" align="center">
+                <el-table-column label="总价" align="center" width="150">
                   <template slot-scope="scope">
                     {{calculate(scope.row.price*scope.row.warehousing_count)}}
                   </template>
                 </el-table-column>
 
-                <el-table-column align="center" min-width="25">
+                <el-table-column align="center"  width="150">
                   <template slot="header" slot-scope="scope">
                     <span>批号<span style="color: red">*</span></span>
                   </template>
@@ -126,12 +126,12 @@
 
                     <el-form-item :prop="'recordData.' + scope.$index + '.number'" :rules='tableRules.number'
                                   style="padding-top: 17px">
-                      <el-input v-model="scope.row.number"></el-input>
+                      <el-input placeholder="请输入批号" v-model="scope.row.number"></el-input>
                     </el-form-item>
 
                   </template>
                 </el-table-column>
-                <el-table-column label="生产日期" min-width="43" align="center">
+                <el-table-column label="生产日期"  align="center" width="250">
                   <template slot-scope="scope">
                     <!--{{scope.row.product_date | parseTime("{y}-{m}-{d}")}}-->
                     <el-date-picker prefix-icon="el-icon-date" style="width: 145px" v-model="scope.row.product_date"
@@ -140,7 +140,7 @@
 
                   </template>
                 </el-table-column>
-                <el-table-column label="有效日期" min-width="43" align="center">
+                <el-table-column label="有效日期"  align="center" width="250">
                   <template slot-scope="scope">
                     <!--{{ scope.row.expiry_date | parseTime("{y}-{m}-{d}")}}-->
                     <el-date-picker prefix-icon="el-icon-date" style="width: 145px" v-model="scope.row.expiry_date"
@@ -149,14 +149,14 @@
 
                   </template>
                 </el-table-column>
-                <el-table-column label="备注" min-width="20" align="center">
+                <el-table-column label="备注"  align="center" width="150">
                   <template slot-scope="scope">
-                    <el-input v-model="scope.row.remark"></el-input>
+                    <el-input placeholder="请输入备注"   v-model="scope.row.remark"></el-input>
                   </template>
                 </el-table-column>
 
-                <el-table-column label="操作" align="center" min-width="40">
-                  <template slot-scope="scope">
+                <el-table-column label="操作" align="center" fixed="right"  width="150">
+                  <template slot-scope="scope" >
                     <el-tooltip class="item" effect="dark" content="新增" placement="top">
 
                     <el-button
@@ -171,7 +171,7 @@
                     <el-button
                       size="mini"
                       type="danger"
-                      icon="el-icon-remove-outline"
+                      icon="el-icon-delete"
                       @click="handleDelete(scope.$index, scope.row)">
                     </el-button>
                     </el-tooltip>
@@ -601,6 +601,12 @@
   }
 </script>
 
+<style>
+  #oictable ::-webkit-scrollbar {
+    height: 15px;
+  }
+</style>
+
 <style rel="stylesheet/css" lang="scss" scoped>
   .information {
     border: 1px #dcdfe6 solid;

src/xt_pages/stock/stockInOrderEdit.vue

@@ -24,57 +24,57 @@
 
 
         <el-form  :rules="tableRules" :model="recordInfo" ref="tableForm">
-          <el-table :data="recordInfo.recordData" :class="signAndWeighBoxPatients" style="width: 100%" border
+          <el-table id="oictable" :data="recordInfo.recordData" :class="signAndWeighBoxPatients" style="width: 100%" border
                     max-height="450" :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}"
           >
 
-            <el-table-column min-width="35" align="center">
+            <el-table-column  align="center" width="200" >
 
               <template slot="header" slot-scope="scope">
                 <span>物品类型<span style="color: red">*</span></span>
               </template>
 
-              <template slot-scope="scope" >
-                <!--<span @click="showDialog(scope.$index, scope.row)" v-if="scope.row.good_type_id == 0" style="color:#c5c8cf">请输入类型</span>-->
-                <!--<span @click="showDialog(scope.$index, scope.row)" v-if="scope.row.good_type_id != 0">{{typeName(scope.row.good_type_id)}}</span>-->
-
-                <el-form-item  style="padding-top: 15px">
-                  <el-input placeholder="请输入物品类型"  v-model="scope.row.good_type_id" :value="typeName(scope.row.good_type_id)" @focus="showDialog(scope.$index, scope.row)" ></el-input>
+              <template slot-scope="scope">
+                <el-form-item style="padding-top: 15px">
+                  <el-input placeholder="请输入物品类型" v-model="scope.row.good_type_id"
+                            :value="typeName(scope.row.good_type_id)"
+                            @focus="showDialog(scope.$index, scope.row)"></el-input>
                 </el-form-item>
-
               </template>
             </el-table-column>
-            <el-table-column min-width="35" align="center">
+            <el-table-column align="center" width="200">
               <template slot="header" slot-scope="scope">
                 <span>规格名称<span style="color: red">*</span></span>
               </template>
               <template slot-scope="scope">
 
-                <el-form-item  style="padding-top: 15px">
-                  <el-input placeholder="请输入规格名称"  v-model="scope.row.good_id" :value="specificationName(scope.row.good_id)" @focus="showDialog(scope.$index, scope.row)" ></el-input>
+                <el-form-item style="padding-top: 15px">
+                  <el-input placeholder="请输入规格名称" v-model="scope.row.good_id"
+                            :value="specificationName(scope.row.good_id)"
+                            @focus="showDialog(scope.$index, scope.row)"></el-input>
                 </el-form-item>
 
               </template>
             </el-table-column>
 
 
-            <el-table-column  min-width="23" align="center">
+
+            <el-table-column  align="center" width="150">
               <template slot="header" slot-scope="scope">
                 <span>单价<span style="color: red">*</span></span>
               </template>
               <template slot-scope="scope">
                 <!--<el-input type="number" v-model="scope.row.price"  @blur="handleBlur(scope.$index, scope.row)"></el-input>-->
-                <el-form-item :prop="'recordData.' + scope.$index + '.price'" :rules='tableRules.price' style="padding-top: 17px">
-                  <el-input type="number"  v-model="scope.row.price" ></el-input>
+                <el-form-item :prop="'recordData.' + scope.$index + '.price'" :rules='tableRules.price'
+                              style="padding-top: 17px">
+                  <el-input placeholder="请输入单价"  type="number" v-model="scope.row.price"></el-input>
                 </el-form-item>
 
 
-
-
               </template>
             </el-table-column>
 
-            <el-table-column  min-width="23" align="center">
+            <el-table-column  align="center"  width="180">
               <template slot="header" slot-scope="scope">
                 <span>入库数量<span style="color: red">*</span></span>
               </template>
@@ -82,32 +82,32 @@
                 <!--{{scope.row.warehousing_count}}-->
                 <!--<el-input type="number" v-model="scope.row.warehousing_count"   @blur="handleBlur(scope.$index, scope.row)"></el-input>-->
 
-                <el-form-item :prop="'recordData.' + scope.$index + '.warehousing_count'" :rules='tableRules.warehousing_count' style="padding-top: 17px">
-                  <el-input type="number"  v-model="scope.row.warehousing_count" ></el-input>
+                <el-form-item :prop="'recordData.' + scope.$index + '.warehousing_count'"
+                              :rules='tableRules.warehousing_count' style="padding-top: 17px">
+                  <el-input placeholder="请输入入库数量"  type="number" v-model="scope.row.warehousing_count"></el-input>
                 </el-form-item>
               </template>
             </el-table-column>
-
-            <el-table-column label="总价" min-width="20" align="center">
+            <el-table-column label="总价" align="center" width="150">
               <template slot-scope="scope">
                 {{calculate(scope.row.price*scope.row.warehousing_count)}}
               </template>
             </el-table-column>
 
-            <el-table-column  align="center" min-width="25">
+            <el-table-column align="center"  width="150">
               <template slot="header" slot-scope="scope">
                 <span>批号<span style="color: red">*</span></span>
               </template>
               <template slot-scope="scope">
                 <!--<el-input  v-model="scope.row.numbers"></el-input>-->
-
-                <el-form-item :prop="'recordData.' + scope.$index + '.number'" :rules='tableRules.number' style="padding-top: 17px">
-                  <el-input  v-model="scope.row.number" ></el-input>
+                <el-form-item :prop="'recordData.' + scope.$index + '.number'" :rules='tableRules.number'
+                              style="padding-top: 17px">
+                  <el-input placeholder="请输入批号" v-model="scope.row.number"></el-input>
                 </el-form-item>
-
               </template>
             </el-table-column>
-            <el-table-column label="生产日期" min-width="40" align="center">
+
+            <el-table-column label="生产日期" width="250" align="center">
               <template slot-scope="scope" >
                 <!--{{scope.row.product_date | parseTime("{y}-{m}-{d}")}}-->
                 <el-date-picker prefix-icon="el-icon-date" style="width: 145px" v-model="scope.row.product_date"
@@ -116,7 +116,7 @@
 
               </template>
             </el-table-column>
-            <el-table-column label="有效日期" min-width="40" align="center">
+            <el-table-column label="有效日期" width="250" align="center">
               <template slot-scope="scope">
                 <!--{{ scope.row.expiry_date | parseTime("{y}-{m}-{d}")}}-->
                 <el-date-picker  prefix-icon="el-icon-date" style="width: 145px" v-model="scope.row.expiry_date"
@@ -125,13 +125,13 @@
 
               </template>
             </el-table-column>
-            <el-table-column label="备注" min-width="20" align="center">
+            <el-table-column label="备注" width="150" align="center">
               <template slot-scope="scope">
                 <el-input  v-model="scope.row.remark"></el-input>
               </template>
             </el-table-column>
 
-            <el-table-column label="操作" align="center" min-width="40">
+            <el-table-column label="操作" align="center" width="150">
               <template slot-scope="scope">
                 <el-tooltip class="item" effect="dark" content="新增" placement="top">
 
@@ -147,7 +147,7 @@
                   <el-button
                     size="mini"
                     type="danger"
-                    icon="el-icon-remove-outline"
+                    icon="el-icon-delete"
                     @click="handleDelete(scope.$index, scope.row)">
                   </el-button>
                 </el-tooltip>
@@ -472,6 +472,11 @@ export default {
 
   }
 </script>
+<style>
+  #oictable ::-webkit-scrollbar {
+    height: 15px;
+  }
+</style>
 
 <style rel="stylesheet/css" lang="scss" scoped>
   .information {

src/xt_pages/stock/stockOutOrder.vue

@@ -78,7 +78,7 @@
             <el-button
               size="mini"
               type="primary"
-              icon="el-icon-edit"
+              icon="el-icon-edit-outline"
               @click="handleEdit(scope.$index, scope.row)">
             </el-button>
             </el-tooltip>
@@ -451,7 +451,6 @@ export default {
 }
 </style>
 
-=======
 
 
 
@@ -494,17 +493,3 @@ export default {
 
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
->>>>>>> .theirs

src/xt_pages/stock/stockOutOrderAdd.vue

@@ -136,7 +136,7 @@
                   <el-button
                     size="mini"
                     type="danger"
-                    icon="el-icon-remove-outline"
+                    icon="el-icon-delete"
                     @click="handleDelete(scope.$index, scope.row)">
                   </el-button>
                 </el-tooltip>

src/xt_pages/stock/stockOutOrderEdit.vue

@@ -108,7 +108,7 @@
                   <el-button
                     size="mini"
                     type="danger"
-                    icon="el-icon-remove-outline"
+                    icon="el-icon-delete"
                     @click="handleDelete(scope.$index, scope.row)">
                   </el-button>
                 </el-tooltip>