Browse Source

11月14日 库存扣减更新

XMLWAN 3 years ago
parent
commit
e0ffc0a4c8

+ 4 - 4
src/views/layout/Layout.vue View File

16
           <i class="iconfont icon-computer_fill navIcon"></i>
16
           <i class="iconfont icon-computer_fill navIcon"></i>
17
           <p>透析管理</p>
17
           <p>透析管理</p>
18
         </div>
18
         </div>
19
-        <!-- <div v-if="caigouShow" :class="index == 5 ? 'navOne navActive' : 'navOne'" @click="clickActive(5,'采购管理')">
20
-          <i class="iconfont icon-kccx navIcon"></i>
21
-          <p>采购管理</p>
22
-        </div> -->
19
+<!--        <div v-if="caigouShow" :class="index == 5 ? 'navOne navActive' : 'navOne'" @click="clickActive(5,'采购管理')">-->
20
+<!--          <i class="iconfont icon-kccx navIcon"></i>-->
21
+<!--          <p>采购管理</p>-->
22
+<!--        </div>-->
23
         <div v-if="kucunShow" :class="index == 3 ? 'navOne navActive' : 'navOne'" @click="clickActive(3,'库房管理')">
23
         <div v-if="kucunShow" :class="index == 3 ? 'navOne navActive' : 'navOne'" @click="clickActive(3,'库房管理')">
24
           <i class="iconfont icon-kccx navIcon"></i>
24
           <i class="iconfont icon-kccx navIcon"></i>
25
           <p>库房管理</p>
25
           <p>库房管理</p>

+ 1 - 1
src/xt_pages/supply/components/addGoodOrder.vue View File

187
     </el-table-column>
187
     </el-table-column>
188
     <el-table-column label="生产厂家" align="center" width="200px">
188
     <el-table-column label="生产厂家" align="center" width="200px">
189
         <template slot-scope="scope">
189
         <template slot-scope="scope">
190
-         <el-select size="small" v-model="scope.row.supply_manufacturer" filterable placeholder="请选择厂家" :disabled="true">
190
+         <el-select size="small" v-model="scope.row.supply_manufacturer" filterable  :disabled="true">
191
                 <el-option
191
                 <el-option
192
                   v-for="(option, index) in manufactuerList"
192
                   v-for="(option, index) in manufactuerList"
193
                   :key="index"
193
                   :key="index"

+ 9 - 3
src/xt_pages/supply/components/addPurchaseOrder.vue View File

113
                   v-model="scope.row.name"
113
                   v-model="scope.row.name"
114
                   style="width: 160px"
114
                   style="width: 160px"
115
                   filterable
115
                   filterable
116
-                  placeholder="请选择"
116
+                  placeholder="请选择商品"
117
                   @change="changeName"
117
                   @change="changeName"
118
                   @input="changeGoodName(scope.$index)"
118
                   @input="changeGoodName(scope.$index)"
119
                   :disabled="disabled"
119
                   :disabled="disabled"
138
                 v-model="scope.row.supply_type"
138
                 v-model="scope.row.supply_type"
139
                 style="width: 120px"
139
                 style="width: 120px"
140
                 :disabled="true"
140
                 :disabled="true"
141
+                 placeholder="商品类别"
141
               ></el-input>
142
               ></el-input>
142
               <div style="visibility: hidden">/</div>
143
               <div style="visibility: hidden">/</div>
143
             </template>
144
             </template>
145
           <el-table-column label="规格&单位" align="center" width="200px">
146
           <el-table-column label="规格&单位" align="center" width="200px">
146
             <template slot-scope="scope">
147
             <template slot-scope="scope">
147
               <el-input
148
               <el-input
149
+                placeholder="规格&单位"
148
                 v-model="scope.row.supply_specification_name"
150
                 v-model="scope.row.supply_specification_name"
149
                 style="width: 150px"
151
                 style="width: 150px"
150
                 :disabled="true"
152
                 :disabled="true"
197
               <el-form-item
199
               <el-form-item
198
                 :prop="'tableList.' + scope.$index + '.supply_count'"
200
                 :prop="'tableList.' + scope.$index + '.supply_count'"
199
                 :rules="tableRules.supply_count"
201
                 :rules="tableRules.supply_count"
202
+                 placeholder="请输入数量"
200
               >
203
               >
201
                 <el-input
204
                 <el-input
202
                   v-model="scope.row.supply_count"
205
                   v-model="scope.row.supply_count"
207
             </template>
210
             </template>
208
           </el-table-column>
211
           </el-table-column>
209
 
212
 
210
-          <el-table-column label="购货单价" align="center" width="120px">
213
+          <el-table-column label="购货单价" align="center" width="140px">
211
             <template slot-scope="scope">
214
             <template slot-scope="scope">
212
               <el-input
215
               <el-input
213
                 v-model="scope.row.supply_price"
216
                 v-model="scope.row.supply_price"
214
                 style="width: 80px"
217
                 style="width: 80px"
215
                 :disabled="disabled"
218
                 :disabled="disabled"
219
+                 placeholder="请输入购货单价"
216
               ></el-input>
220
               ></el-input>
217
               <div style="visibility: hidden">/</div>
221
               <div style="visibility: hidden">/</div>
218
             </template>
222
             </template>
230
                 size="small"
234
                 size="small"
231
                 v-model="scope.row.supply_manufacturer"
235
                 v-model="scope.row.supply_manufacturer"
232
                 filterable
236
                 filterable
233
-                placeholder="请选择生产厂家"
234
                 :disabled="true"
237
                 :disabled="true"
235
               >
238
               >
236
                 <el-option
239
                 <el-option
262
                 v-model="scope.row.supply_remake"
265
                 v-model="scope.row.supply_remake"
263
                 style="width: 160px"
266
                 style="width: 160px"
264
                 :disabled="disabled"
267
                 :disabled="disabled"
268
+                placeholder="请输入备注"
265
               ></el-input>
269
               ></el-input>
266
               <div style="visibility: hidden">/</div>
270
               <div style="visibility: hidden">/</div>
267
             </template>
271
             </template>
316
             style="width: 100px"
320
             style="width: 100px"
317
             v-model="rate_of_concession"
321
             v-model="rate_of_concession"
318
             @input="addressChange"
322
             @input="addressChange"
323
+            @placeholder="请输入优惠率"
319
           ></el-input
324
           ></el-input
320
           >%</span
325
           >%</span
321
         >
326
         >
324
           >优惠金额:<el-input
329
           >优惠金额:<el-input
325
             style="width: 100px"
330
             style="width: 100px"
326
             v-model="discount_amount"
331
             v-model="discount_amount"
332
+            @placeholder="请输入优惠金额"
327
           ></el-input
333
           ></el-input
328
         ></span>
334
         ></span>
329
       </div>
335
       </div>

+ 3 - 2
src/xt_pages/supply/components/editGoodOrder.vue View File

187
     </el-table-column>
187
     </el-table-column>
188
     <el-table-column label="生产厂家" align="center" width="200px">
188
     <el-table-column label="生产厂家" align="center" width="200px">
189
         <template slot-scope="scope">
189
         <template slot-scope="scope">
190
-         <el-select size="small" v-model="scope.row.supply_manufacturer" filterable placeholder="请选择厂家" :disabled="true">
190
+         <el-select size="small" v-model="scope.row.supply_manufacturer" filterable  :disabled="true">
191
                 <el-option
191
                 <el-option
192
                   v-for="(option, index) in manufactuerList"
192
                   v-for="(option, index) in manufactuerList"
193
                   :key="index"
193
                   :key="index"
834
           this.$message.success("反审核成功!")
834
           this.$message.success("反审核成功!")
835
         }
835
         }
836
         if(msg == 2){
836
         if(msg == 2){
837
-          this.$message.success("该单有自动出库或生成了退货单,反审核失败!")
837
+          this.$message.error("该单有自动出库或生成了退货单,反审核失败!")
838
+          
838
         }
839
         }
839
 
840
 
840
         var purcaseOrder = response.data.data.purcaseOrder
841
         var purcaseOrder = response.data.data.purcaseOrder

+ 2 - 2
src/xt_pages/supply/components/editPurchaseOrder.vue View File

132
         </template>
132
         </template>
133
         <template slot-scope="scope">
133
         <template slot-scope="scope">
134
           <el-form-item  :prop="'tableList.' + scope.$index + '.supply_count'" :rules='tableRules.supply_count'>
134
           <el-form-item  :prop="'tableList.' + scope.$index + '.supply_count'" :rules='tableRules.supply_count'>
135
-             <el-input v-model="scope.row.supply_count" style="width:80px" :disabled="disabled"></el-input>
135
+             <el-input v-model="scope.row.supply_count" style="width:80px" :disabled="disabled" placeholder="请输入数量"></el-input>
136
           </el-form-item>
136
           </el-form-item>
137
         </template>
137
         </template>
138
     </el-table-column>
138
     </el-table-column>
151
 
151
 
152
     <el-table-column label="生产厂家" align="center" width="200px">
152
     <el-table-column label="生产厂家" align="center" width="200px">
153
         <template slot-scope="scope">
153
         <template slot-scope="scope">
154
-           <el-select size="small" v-model="scope.row.supply_manufacturer" filterable placeholder="请选择厂家" :disabled="true">
154
+           <el-select size="small" v-model="scope.row.supply_manufacturer" filterable :disabled="true">
155
                 <el-option
155
                 <el-option
156
                   v-for="(option, index) in manufactuerList"
156
                   v-for="(option, index) in manufactuerList"
157
                   :key="index"
157
                   :key="index"