csx 6 years ago
parent
commit
9c3e664b97

+ 2 - 2
src/lang/zh.js View File

113
     orderRecord: '订单详情',
113
     orderRecord: '订单详情',
114
     recordList: '订单记录',
114
     recordList: '订单记录',
115
     stockManage: '库存管理',
115
     stockManage: '库存管理',
116
-    goodType: '品类型',
116
+    goodType: '品类型',
117
     stockIn: '入库管理',
117
     stockIn: '入库管理',
118
     stockOut: '出库管理',
118
     stockOut: '出库管理',
119
     manufacturer: '厂家',
119
     manufacturer: '厂家',
130
     workforce_template: '排班模板设置',
130
     workforce_template: '排班模板设置',
131
     statistics: '统计分析',
131
     statistics: '统计分析',
132
     config: '库存配置',
132
     config: '库存配置',
133
-    goodInfo: '品信息',
133
+    goodInfo: '品信息',
134
     CourseOfDiseaseManage: '病程管理',
134
     CourseOfDiseaseManage: '病程管理',
135
     RescueRecord: '抢救记录',
135
     RescueRecord: '抢救记录',
136
     special_permission_manage: '特殊权限管理',
136
     special_permission_manage: '特殊权限管理',

+ 2 - 2
src/xt_pages/stock/Dialog/goodInfoDailog.vue View File

7
              label-width="116px">
7
              label-width="116px">
8
       <el-row>
8
       <el-row>
9
         <el-col :span="8">
9
         <el-col :span="8">
10
-          <el-form-item label="品类型" prop="good_id">
10
+          <el-form-item label="品类型" prop="good_id">
11
             <el-select v-model="form.good_id" placeholder="请选择" size="small" >
11
             <el-select v-model="form.good_id" placeholder="请选择" size="small" >
12
               <el-option
12
               <el-option
13
                 v-for="item in form.goodType"
13
                 v-for="item in form.goodType"
148
             { required: true, message: '请输入规格名称', trigger: 'blur' }
148
             { required: true, message: '请输入规格名称', trigger: 'blur' }
149
           ],
149
           ],
150
           good_id: [
150
           good_id: [
151
-            { required: true, message: '请选择品类型', trigger: 'change' }
151
+            { required: true, message: '请选择品类型', trigger: 'change' }
152
           ]
152
           ]
153
 
153
 
154
         }
154
         }

+ 1 - 1
src/xt_pages/stock/Dialog/stockInDetailDailog.vue View File

20
           {{}}
20
           {{}}
21
         </template>
21
         </template>
22
       </el-table-column>
22
       </el-table-column>
23
-      <el-table-column label="品批号" align="center" min-width="30">
23
+      <el-table-column label="品批号" align="center" min-width="30">
24
         <template slot-scope="scope">
24
         <template slot-scope="scope">
25
           {{}}
25
           {{}}
26
         </template>
26
         </template>

+ 8 - 8
src/xt_pages/stock/Dialog/stockOutDialog.vue View File

2
   <el-dialog :title="propForm.title" :visible.sync="visibility" :show-close="isClose" :close-on-click-modal="isClose"
2
   <el-dialog :title="propForm.title" :visible.sync="visibility" :show-close="isClose" :close-on-click-modal="isClose"
3
              :close-on-press-escape="isClose" width="622px">
3
              :close-on-press-escape="isClose" width="622px">
4
 
4
 
5
-    <el-form :model="propForm.formValue" class="demo-form-inline" 
5
+    <el-form :model="propForm.formValue" class="demo-form-inline"
6
              :rules="rules" :v-model="propForm.formValue" ref="formValue"
6
              :rules="rules" :v-model="propForm.formValue" ref="formValue"
7
              label-width="90px">
7
              label-width="90px">
8
 
8
 
9
     <el-row>
9
     <el-row>
10
       <el-col :span="12">
10
       <el-col :span="12">
11
-        <el-form-item label="品类型" prop="good_type_id">
11
+        <el-form-item label="品类型" prop="good_type_id">
12
           <el-select v-model="propForm.formValue.good_type_id" placeholder="请选择" @change="goodTypeSelect"
12
           <el-select v-model="propForm.formValue.good_type_id" placeholder="请选择" @change="goodTypeSelect"
13
           >
13
           >
14
             <el-option
14
             <el-option
34
         </el-form-item>
34
         </el-form-item>
35
       </el-col>
35
       </el-col>
36
 
36
 
37
-      
37
+
38
     </el-row>
38
     </el-row>
39
-    
40
-    <el-row>   
39
+
40
+    <el-row>
41
       <el-col :span="12">
41
       <el-col :span="12">
42
         <el-form-item label="库存数量">
42
         <el-form-item label="库存数量">
43
           <el-input type="number" v-model="warehouse_count" :disabled="isDisabled"></el-input>
43
           <el-input type="number" v-model="warehouse_count" :disabled="isDisabled"></el-input>
44
         </el-form-item>
44
         </el-form-item>
45
-      </el-col> 
45
+      </el-col>
46
       <el-col :span="12">
46
       <el-col :span="12">
47
         <el-form-item label="出库数量" prop="count">
47
         <el-form-item label="出库数量" prop="count">
48
           <el-input type="number" v-model="propForm.formValue.count"></el-input>
48
           <el-input type="number" v-model="propForm.formValue.count"></el-input>
57
         </el-form-item>
57
         </el-form-item>
58
       </el-col>
58
       </el-col>
59
     </el-row>
59
     </el-row>
60
-    
60
+
61
     </el-form>
61
     </el-form>
62
 
62
 
63
 
63
 
103
         isShow: true,
103
         isShow: true,
104
         rules: {
104
         rules: {
105
           good_id: [
105
           good_id: [
106
-            {required: true, message: '请选择品类型', trigger: 'change'}
106
+            {required: true, message: '请选择品类型', trigger: 'change'}
107
           ],
107
           ],
108
           good_type_id: [
108
           good_type_id: [
109
             {required: true, message: '请选择规格名称', trigger: 'change'}
109
             {required: true, message: '请选择规格名称', trigger: 'change'}

+ 3 - 3
src/xt_pages/stock/cancelStockOrderAdd.vue View File

61
             <el-table-column min-width="35" align="center">
61
             <el-table-column min-width="35" align="center">
62
 
62
 
63
               <template slot="header" slot-scope="scope">
63
               <template slot="header" slot-scope="scope">
64
-                <span>品类型<span style="color: red">*</span></span>
64
+                <span>品类型<span style="color: red">*</span></span>
65
               </template>
65
               </template>
66
 
66
 
67
               <template slot-scope="scope" >
67
               <template slot-scope="scope" >
69
                 <!--<span @click="showDialog(scope.$index, scope.row)" v-if="scope.row.good_type_id != 0">{{typeName(scope.row.good_type_id)}}</span>-->
69
                 <!--<span @click="showDialog(scope.$index, scope.row)" v-if="scope.row.good_type_id != 0">{{typeName(scope.row.good_type_id)}}</span>-->
70
 
70
 
71
                 <el-form-item  style="padding-top: 15px">
71
                 <el-form-item  style="padding-top: 15px">
72
-                  <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>
72
+                  <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>
73
                 </el-form-item>
73
                 </el-form-item>
74
 
74
 
75
               </template>
75
               </template>
318
             let total = 0
318
             let total = 0
319
             for (let i = 0; i < array.length; i++) {
319
             for (let i = 0; i < array.length; i++) {
320
               if (array[i].good_type_id == 0) {
320
               if (array[i].good_type_id == 0) {
321
-                this.$message.error('品类型不能为空')
321
+                this.$message.error('品类型不能为空')
322
                 return
322
                 return
323
               }
323
               }
324
               if (array[i].good_id == 0) {
324
               if (array[i].good_id == 0) {

+ 2 - 2
src/xt_pages/stock/cancelStockOrderDetail.vue View File

31
       >
31
       >
32
         <el-table-column min-width="35" align="center">
32
         <el-table-column min-width="35" align="center">
33
           <template slot="header" slot-scope="scope">
33
           <template slot="header" slot-scope="scope">
34
-            <span>品类型</span>
34
+            <span>品类型</span>
35
           </template>
35
           </template>
36
 
36
 
37
           <template slot-scope="scope">
37
           <template slot-scope="scope">
49
 
49
 
50
         <el-table-column min-width="23" align="center">
50
         <el-table-column min-width="23" align="center">
51
           <template slot="header" slot-scope="scope">
51
           <template slot="header" slot-scope="scope">
52
-            <span>退数量</span>
52
+            <span>退数量</span>
53
           </template>
53
           </template>
54
           <template slot-scope="scope">
54
           <template slot-scope="scope">
55
             <span>{{scope.row.count}}</span>
55
             <span>{{scope.row.count}}</span>

+ 5 - 5
src/xt_pages/stock/cancelStockOrderEdit.vue View File

30
           <el-table-column min-width="35" align="center">
30
           <el-table-column min-width="35" align="center">
31
 
31
 
32
             <template slot="header" slot-scope="scope">
32
             <template slot="header" slot-scope="scope">
33
-              <span>品类型<span style="color: red">*</span></span>
33
+              <span>品类型<span style="color: red">*</span></span>
34
             </template>
34
             </template>
35
 
35
 
36
             <template slot-scope="scope">
36
             <template slot-scope="scope">
37
               <el-form-item style="padding-top: 15px">
37
               <el-form-item style="padding-top: 15px">
38
-                <el-input placeholder="请输入品类型" v-model="scope.row.good_type_id"
38
+                <el-input placeholder="请输入品类型" v-model="scope.row.good_type_id"
39
                           :value="typeName(scope.row.good_type_id)"
39
                           :value="typeName(scope.row.good_type_id)"
40
                           @focus="showDialog(scope.$index, scope.row)"></el-input>
40
                           @focus="showDialog(scope.$index, scope.row)"></el-input>
41
               </el-form-item>
41
               </el-form-item>
59
 
59
 
60
           <el-table-column min-width="23" align="center">
60
           <el-table-column min-width="23" align="center">
61
             <template slot="header" slot-scope="scope">
61
             <template slot="header" slot-scope="scope">
62
-              <span>退数量<span style="color: red">*</span></span>
62
+              <span>退数量<span style="color: red">*</span></span>
63
             </template>
63
             </template>
64
             <template slot-scope="scope">
64
             <template slot-scope="scope">
65
               <el-form-item :prop="'recordData.' + scope.$index + '.count'" :rules='tableRules.count'
65
               <el-form-item :prop="'recordData.' + scope.$index + '.count'" :rules='tableRules.count'
242
           const params = {
242
           const params = {
243
             id: row.id
243
             id: row.id
244
           }
244
           }
245
-          this.$confirm('确认删除该退库物品信息记录?', '删除退库物品信息记录', {
245
+          this.$confirm('确认删除该退库商品信息记录?', '删除退库商品信息记录', {
246
             confirmButtonText: '确定',
246
             confirmButtonText: '确定',
247
             cancelButtonText: '取消',
247
             cancelButtonText: '取消',
248
             type: 'warning'
248
             type: 'warning'
293
             const array = this.recordInfo.recordData
293
             const array = this.recordInfo.recordData
294
             for (let i = 0; i < array.length; i++) {
294
             for (let i = 0; i < array.length; i++) {
295
               if (array[i].good_type_id == 0) {
295
               if (array[i].good_type_id == 0) {
296
-                this.$message.error('品类型不能为空')
296
+                this.$message.error('品类型不能为空')
297
                 return
297
                 return
298
               }
298
               }
299
               if (array[i].good_id == 0) {
299
               if (array[i].good_id == 0) {

+ 5 - 5
src/xt_pages/stock/config/goodInfo.vue View File

20
         <el-table :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)'}" :data="goodInfo.goodInfoData" :class="signAndWeighBoxPatients" style="width: 100%" border
20
         <el-table :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)'}" :data="goodInfo.goodInfoData" :class="signAndWeighBoxPatients" style="width: 100%" border
21
                   v-loading="goodInfo.loading"
21
                   v-loading="goodInfo.loading"
22
         >
22
         >
23
-          <el-table-column label="品编码" min-width="30" align="center">
23
+          <el-table-column label="品编码" min-width="30" align="center">
24
             <template slot-scope="scope">
24
             <template slot-scope="scope">
25
               {{scope.row.good_code}}
25
               {{scope.row.good_code}}
26
             </template>
26
             </template>
138
           editGoodId: '',
138
           editGoodId: '',
139
           editGoodIndex: '',
139
           editGoodIndex: '',
140
           goodInfoDialog: {
140
           goodInfoDialog: {
141
-            goodInfoTitle: '新增品信息',
141
+            goodInfoTitle: '新增品信息',
142
             isCreated: 1, //1.创建 2.编辑 3.查看详情
142
             isCreated: 1, //1.创建 2.编辑 3.查看详情
143
             formValue: {
143
             formValue: {
144
               good_id: '',
144
               good_id: '',
227
       },
227
       },
228
       handleGoodInfoDelete: function (index, row) {
228
       handleGoodInfoDelete: function (index, row) {
229
 
229
 
230
-        this.$confirm('确认删除这条物品信息?', '删除物品信息', {
230
+        this.$confirm('确认删除这条商品信息?', '删除商品信息', {
231
           confirmButtonText: '确定',
231
           confirmButtonText: '确定',
232
           cancelButtonText: '取消',
232
           cancelButtonText: '取消',
233
           type: 'warning'
233
           type: 'warning'
244
               this.goodInfo.goodInfoData.splice(index, 1);
244
               this.goodInfo.goodInfoData.splice(index, 1);
245
               this.$notify({
245
               this.$notify({
246
                 title: "成功",
246
                 title: "成功",
247
-                message: "品信息已经删除",
247
+                message: "品信息已经删除",
248
                 type: "success",
248
                 type: "success",
249
                 duration: 2000
249
                 duration: 2000
250
               });
250
               });
389
               this.goodInfo.goodInfoDialog.formValue.goodType.push(response.data.data.goodType[i])
389
               this.goodInfo.goodInfoDialog.formValue.goodType.push(response.data.data.goodType[i])
390
             }
390
             }
391
             if (this.goodInfo.goodInfoDialog.formValue.goodType.length <= 0) {
391
             if (this.goodInfo.goodInfoDialog.formValue.goodType.length <= 0) {
392
-              this.$message.error("请先新增品类型");
392
+              this.$message.error("请先新增品类型");
393
               return
393
               return
394
             } else {
394
             } else {
395
               this.goodInfo.goodInfoDialog.isVisibility = true
395
               this.goodInfo.goodInfoDialog.isVisibility = true

+ 4 - 4
src/xt_pages/stock/config/goodType.vue View File

182
           editInfoIndex: '',
182
           editInfoIndex: '',
183
           tableCurrentIndex: -1,
183
           tableCurrentIndex: -1,
184
           goodTypeDialog: {
184
           goodTypeDialog: {
185
-            goodTypeTitle: '新增品类型',
185
+            goodTypeTitle: '新增品类型',
186
             isCreated: 1, //1.创建 2.编辑 3.查看详情
186
             isCreated: 1, //1.创建 2.编辑 3.查看详情
187
             formValue: {
187
             formValue: {
188
               type_name: '',
188
               type_name: '',
217
       },
217
       },
218
       handleDelete: function (index, row) {
218
       handleDelete: function (index, row) {
219
 
219
 
220
-        this.$confirm('确认删除这条物品类型?', '删除物品类型', {
220
+        this.$confirm('确认删除这条商品类型?', '删除商品类型', {
221
           confirmButtonText: '确定',
221
           confirmButtonText: '确定',
222
           cancelButtonText: '取消',
222
           cancelButtonText: '取消',
223
           type: 'warning'
223
           type: 'warning'
235
               this.goodType.tableCurrentIndex = -1
235
               this.goodType.tableCurrentIndex = -1
236
               this.$notify({
236
               this.$notify({
237
                 title: "成功",
237
                 title: "成功",
238
-                message: "品类型已经删除",
238
+                message: "品类型已经删除",
239
                 type: "success",
239
                 type: "success",
240
                 duration: 2000
240
                 duration: 2000
241
               });
241
               });
355
 
355
 
356
 
356
 
357
         if (this.goodType.tableCurrentIndex == -1) {
357
         if (this.goodType.tableCurrentIndex == -1) {
358
-          this.$message.error("请先选择品类型");
358
+          this.$message.error("请先选择品类型");
359
           return
359
           return
360
         } else {
360
         } else {
361
           this.getAllGoodType()
361
           this.getAllGoodType()

+ 2 - 2
src/xt_pages/stock/index.vue View File

12
         <el-tab-pane label="经销商" >
12
         <el-tab-pane label="经销商" >
13
           <dealer></dealer>
13
           <dealer></dealer>
14
         </el-tab-pane>
14
         </el-tab-pane>
15
-        <el-tab-pane label="品类型" >
15
+        <el-tab-pane label="品类型" >
16
           <good-type></good-type>
16
           <good-type></good-type>
17
         </el-tab-pane>
17
         </el-tab-pane>
18
-        <el-tab-pane label="品信息" >
18
+        <el-tab-pane label="品信息" >
19
           <good-info></good-info>
19
           <good-info></good-info>
20
         </el-tab-pane>
20
         </el-tab-pane>
21
 
21
 

+ 1 - 1
src/xt_pages/stock/otherStockInOrder.vue View File

353
       }, handleReturnSales: function() {
353
       }, handleReturnSales: function() {
354
         // this.$router.push({path:'/patients/create'}
354
         // this.$router.push({path:'/patients/create'}
355
         if (this.multipleSelection.length <= 0) {
355
         if (this.multipleSelection.length <= 0) {
356
-          this.$message.error('请选择退货品')
356
+          this.$message.error('请选择退货品')
357
           return
357
           return
358
         }
358
         }
359
 
359
 

+ 4 - 4
src/xt_pages/stock/salesReturnEdit.vue View File

32
             <el-table-column min-width="35" align="center">
32
             <el-table-column min-width="35" align="center">
33
 
33
 
34
               <template slot="header" slot-scope="scope">
34
               <template slot="header" slot-scope="scope">
35
-                <span>品类型<span style="color: red">*</span></span>
35
+                <span>品类型<span style="color: red">*</span></span>
36
               </template>
36
               </template>
37
 
37
 
38
               <template slot-scope="scope">
38
               <template slot-scope="scope">
39
                 <el-form-item style="padding-top: 15px">
39
                 <el-form-item style="padding-top: 15px">
40
-                  <el-input placeholder="请输入品类型" v-model="scope.row.good_type_id"
40
+                  <el-input placeholder="请输入品类型" v-model="scope.row.good_type_id"
41
                             :value="typeName(scope.row.good_type_id)"
41
                             :value="typeName(scope.row.good_type_id)"
42
                             @focus="showDialog(scope.$index, scope.row)"></el-input>
42
                             @focus="showDialog(scope.$index, scope.row)"></el-input>
43
                 </el-form-item>
43
                 </el-form-item>
254
           const params = {
254
           const params = {
255
             id: row.id
255
             id: row.id
256
           }
256
           }
257
-          this.$confirm('确认删除该退货物品信息记录?', '删除退货物品信息记录', {
257
+          this.$confirm('确认删除该退货商品信息记录?', '删除退货商品信息记录', {
258
             confirmButtonText: '确定',
258
             confirmButtonText: '确定',
259
             cancelButtonText: '取消',
259
             cancelButtonText: '取消',
260
             type: 'warning'
260
             type: 'warning'
305
             const array = this.recordInfo.recordData
305
             const array = this.recordInfo.recordData
306
             for (let i = 0; i < array.length; i++) {
306
             for (let i = 0; i < array.length; i++) {
307
               if (array[i].good_type_id == 0) {
307
               if (array[i].good_type_id == 0) {
308
-                this.$message.error('品类型不能为空')
308
+                this.$message.error('品类型不能为空')
309
                 return
309
                 return
310
               }
310
               }
311
               if (array[i].good_id == 0) {
311
               if (array[i].good_id == 0) {

+ 3 - 3
src/xt_pages/stock/salesReturnOrderAdd.vue View File

54
           <el-table-column min-width="35" align="center">
54
           <el-table-column min-width="35" align="center">
55
 
55
 
56
             <template slot="header" slot-scope="scope">
56
             <template slot="header" slot-scope="scope">
57
-              <span>品类型<span style="color: red">*</span></span>
57
+              <span>品类型<span style="color: red">*</span></span>
58
             </template>
58
             </template>
59
 
59
 
60
             <template slot-scope="scope">
60
             <template slot-scope="scope">
62
               <!--<span @click="showDialog(scope.$index, scope.row)" v-if="scope.row.good_type_id != 0">{{typeName(scope.row.good_type_id)}}</span>-->
62
               <!--<span @click="showDialog(scope.$index, scope.row)" v-if="scope.row.good_type_id != 0">{{typeName(scope.row.good_type_id)}}</span>-->
63
 
63
 
64
               <el-form-item style="padding-top: 15px">
64
               <el-form-item style="padding-top: 15px">
65
-                <el-input placeholder="请输入品类型" v-model="scope.row.good_type_id"
65
+                <el-input placeholder="请输入品类型" v-model="scope.row.good_type_id"
66
                           :value="typeName(scope.row.good_type_id)"
66
                           :value="typeName(scope.row.good_type_id)"
67
                           @focus="showDialog(scope.$index, scope.row)"></el-input>
67
                           @focus="showDialog(scope.$index, scope.row)"></el-input>
68
               </el-form-item>
68
               </el-form-item>
329
             let total = 0
329
             let total = 0
330
             for (let i = 0; i < array.length; i++) {
330
             for (let i = 0; i < array.length; i++) {
331
               if (array[i].good_type_id == 0) {
331
               if (array[i].good_type_id == 0) {
332
-                this.$message.error('品类型不能为空')
332
+                this.$message.error('品类型不能为空')
333
                 return
333
                 return
334
               }
334
               }
335
               if (array[i].good_id == 0) {
335
               if (array[i].good_id == 0) {

+ 1 - 1
src/xt_pages/stock/salesReturnOrderDetail.vue View File

31
         >
31
         >
32
           <el-table-column min-width="35" align="center">
32
           <el-table-column min-width="35" align="center">
33
             <template slot="header" slot-scope="scope">
33
             <template slot="header" slot-scope="scope">
34
-              <span>品类型</span>
34
+              <span>品类型</span>
35
             </template>
35
             </template>
36
 
36
 
37
             <template slot-scope="scope">
37
             <template slot-scope="scope">

+ 1 - 1
src/xt_pages/stock/stockInOrder.vue View File

353
       }, handleReturnSales: function() {
353
       }, handleReturnSales: function() {
354
         // this.$router.push({path:'/patients/create'}
354
         // this.$router.push({path:'/patients/create'}
355
         if (this.multipleSelection.length <= 0) {
355
         if (this.multipleSelection.length <= 0) {
356
-          this.$message.error('请选择退货品')
356
+          this.$message.error('请选择退货品')
357
           return
357
           return
358
         }
358
         }
359
 
359
 

+ 3 - 3
src/xt_pages/stock/stockInOrderAdd.vue View File

54
                 <el-table-column  align="center" width="200">
54
                 <el-table-column  align="center" width="200">
55
 
55
 
56
                   <template slot="header" slot-scope="scope">
56
                   <template slot="header" slot-scope="scope">
57
-                    <span>品类型<span style="color: red">*</span></span>
57
+                    <span>品类型<span style="color: red">*</span></span>
58
                   </template>
58
                   </template>
59
 
59
 
60
                   <template slot-scope="scope">
60
                   <template slot-scope="scope">
61
                     <el-form-item style="padding-top: 15px">
61
                     <el-form-item style="padding-top: 15px">
62
-                      <el-input placeholder="请输入品类型" v-model="scope.row.good_type_id"
62
+                      <el-input placeholder="请输入品类型" v-model="scope.row.good_type_id"
63
                                 :value="typeName(scope.row.good_type_id)"
63
                                 :value="typeName(scope.row.good_type_id)"
64
                                 @focus="showDialog(scope.$index, scope.row)"></el-input>
64
                                 @focus="showDialog(scope.$index, scope.row)"></el-input>
65
                     </el-form-item>
65
                     </el-form-item>
526
             const array = this.recordInfo.recordData
526
             const array = this.recordInfo.recordData
527
             for (let i = 0; i < array.length; i++) {
527
             for (let i = 0; i < array.length; i++) {
528
               if (array[i].good_type_id == 0) {
528
               if (array[i].good_type_id == 0) {
529
-                this.$message.error('品类型不能为空')
529
+                this.$message.error('品类型不能为空')
530
                 return
530
                 return
531
               }
531
               }
532
               if (array[i].good_id == 0) {
532
               if (array[i].good_id == 0) {

+ 2 - 2
src/xt_pages/stock/stockInOrderDetail.vue View File

5
     </div>
5
     </div>
6
   <div class="app-container">
6
   <div class="app-container">
7
     <div class="filter-container">
7
     <div class="filter-container">
8
-      <span style="font-size: 18px">耗材入库单详情</span>
8
+      <span style="font-size: 18px">入库单详情</span>
9
       <el-row style="float:right;">
9
       <el-row style="float:right;">
10
         <span>入库单号: {{WarehouseInfo.warehouse.warehousing_order}}</span>
10
         <span>入库单号: {{WarehouseInfo.warehouse.warehousing_order}}</span>
11
       </el-row>
11
       </el-row>
28
       >
28
       >
29
         <el-table-column min-width="35" align="center">
29
         <el-table-column min-width="35" align="center">
30
           <template slot="header" slot-scope="scope">
30
           <template slot="header" slot-scope="scope">
31
-            <span>品类型</span>
31
+            <span>品类型</span>
32
           </template>
32
           </template>
33
 
33
 
34
           <template slot-scope="scope">
34
           <template slot-scope="scope">

+ 4 - 4
src/xt_pages/stock/stockInOrderEdit.vue View File

31
             <el-table-column  align="center" width="200" >
31
             <el-table-column  align="center" width="200" >
32
 
32
 
33
               <template slot="header" slot-scope="scope">
33
               <template slot="header" slot-scope="scope">
34
-                <span>品类型<span style="color: red">*</span></span>
34
+                <span>品类型<span style="color: red">*</span></span>
35
               </template>
35
               </template>
36
 
36
 
37
               <template slot-scope="scope">
37
               <template slot-scope="scope">
38
                 <el-form-item style="padding-top: 15px">
38
                 <el-form-item style="padding-top: 15px">
39
-                  <el-input placeholder="请输入品类型" v-model="scope.row.good_type_id"
39
+                  <el-input placeholder="请输入品类型" v-model="scope.row.good_type_id"
40
                             :value="typeName(scope.row.good_type_id)"
40
                             :value="typeName(scope.row.good_type_id)"
41
                             @focus="showDialog(scope.$index, scope.row)"></el-input>
41
                             @focus="showDialog(scope.$index, scope.row)"></el-input>
42
                 </el-form-item>
42
                 </el-form-item>
335
           const params = {
335
           const params = {
336
             id: row.id
336
             id: row.id
337
           }
337
           }
338
-          this.$confirm('确认删除该入库物品信息记录?', '删除入库物品信息记录', {
338
+          this.$confirm('确认删除该入库商品信息记录?', '删除入库商品信息记录', {
339
             confirmButtonText: '确定',
339
             confirmButtonText: '确定',
340
             cancelButtonText: '取消',
340
             cancelButtonText: '取消',
341
             type: 'warning'
341
             type: 'warning'
408
             const array = this.recordInfo.recordData
408
             const array = this.recordInfo.recordData
409
             for (let i = 0; i < array.length; i++) {
409
             for (let i = 0; i < array.length; i++) {
410
               if (array[i].good_type_id == 0) {
410
               if (array[i].good_type_id == 0) {
411
-                this.$message.error('品类型不能为空')
411
+                this.$message.error('品类型不能为空')
412
                 return
412
                 return
413
               }
413
               }
414
               if (array[i].good_id == 0) {
414
               if (array[i].good_id == 0) {

+ 3 - 3
src/xt_pages/stock/stockOutOrderAdd.vue View File

57
             <el-table-column min-width="35" align="center">
57
             <el-table-column min-width="35" align="center">
58
 
58
 
59
               <template slot="header" slot-scope="scope">
59
               <template slot="header" slot-scope="scope">
60
-                <span>品类型<span style="color: red">*</span></span>
60
+                <span>品类型<span style="color: red">*</span></span>
61
               </template>
61
               </template>
62
 
62
 
63
               <template slot-scope="scope" >
63
               <template slot-scope="scope" >
65
                 <!--<span @click="showDialog(scope.$index, scope.row)" v-if="scope.row.good_type_id != 0">{{typeName(scope.row.good_type_id)}}</span>-->
65
                 <!--<span @click="showDialog(scope.$index, scope.row)" v-if="scope.row.good_type_id != 0">{{typeName(scope.row.good_type_id)}}</span>-->
66
 
66
 
67
                 <el-form-item  style="padding-top: 15px">
67
                 <el-form-item  style="padding-top: 15px">
68
-                  <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>
68
+                  <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>
69
                 </el-form-item>
69
                 </el-form-item>
70
 
70
 
71
               </template>
71
               </template>
352
             let total = 0
352
             let total = 0
353
             for (let i = 0; i < array.length; i++) {
353
             for (let i = 0; i < array.length; i++) {
354
               if (array[i].good_type_id == 0) {
354
               if (array[i].good_type_id == 0) {
355
-                this.$message.error('品类型不能为空')
355
+                this.$message.error('品类型不能为空')
356
                 return
356
                 return
357
               }
357
               }
358
               if (array[i].good_id == 0) {
358
               if (array[i].good_id == 0) {

+ 1 - 1
src/xt_pages/stock/stockOutOrderDetail.vue View File

31
         >
31
         >
32
           <el-table-column min-width="35" align="center">
32
           <el-table-column min-width="35" align="center">
33
             <template slot="header" slot-scope="scope">
33
             <template slot="header" slot-scope="scope">
34
-              <span>品类型</span>
34
+              <span>品类型</span>
35
             </template>
35
             </template>
36
 
36
 
37
             <template slot-scope="scope">
37
             <template slot-scope="scope">

+ 4 - 4
src/xt_pages/stock/stockOutOrderEdit.vue View File

30
             <el-table-column min-width="35" align="center">
30
             <el-table-column min-width="35" align="center">
31
 
31
 
32
               <template slot="header" slot-scope="scope">
32
               <template slot="header" slot-scope="scope">
33
-                <span>品类型<span style="color: red">*</span></span>
33
+                <span>品类型<span style="color: red">*</span></span>
34
               </template>
34
               </template>
35
 
35
 
36
               <template slot-scope="scope">
36
               <template slot-scope="scope">
37
                 <el-form-item style="padding-top: 15px">
37
                 <el-form-item style="padding-top: 15px">
38
-                  <el-input placeholder="请输入品类型" v-model="scope.row.good_type_id"
38
+                  <el-input placeholder="请输入品类型" v-model="scope.row.good_type_id"
39
                             :value="typeName(scope.row.good_type_id)"
39
                             :value="typeName(scope.row.good_type_id)"
40
                             @focus="showDialog(scope.$index, scope.row)"></el-input>
40
                             @focus="showDialog(scope.$index, scope.row)"></el-input>
41
                 </el-form-item>
41
                 </el-form-item>
274
           const params = {
274
           const params = {
275
             id: row.id
275
             id: row.id
276
           }
276
           }
277
-          this.$confirm('确认删除该退货物品信息记录?', '删除退货物品信息记录', {
277
+          this.$confirm('确认删除该退货商品信息记录?', '删除退货商品信息记录', {
278
             confirmButtonText: '确定',
278
             confirmButtonText: '确定',
279
             cancelButtonText: '取消',
279
             cancelButtonText: '取消',
280
             type: 'warning'
280
             type: 'warning'
325
             const array = this.recordInfo.recordData
325
             const array = this.recordInfo.recordData
326
             for (let i = 0; i < array.length; i++) {
326
             for (let i = 0; i < array.length; i++) {
327
               if (array[i].good_type_id == 0) {
327
               if (array[i].good_type_id == 0) {
328
-                this.$message.error('品类型不能为空')
328
+                this.$message.error('品类型不能为空')
329
                 return
329
                 return
330
               }
330
               }
331
               if (array[i].good_id == 0) {
331
               if (array[i].good_id == 0) {

+ 1 - 1
src/xt_pages/stock/stockQuery.vue View File

9
                 v-loading="WarehouseInfo.loading"
9
                 v-loading="WarehouseInfo.loading"
10
       >
10
       >
11
 
11
 
12
-        <el-table-column label="品编码" align="center">
12
+        <el-table-column label="品编码" align="center">
13
           <template slot-scope="scope">
13
           <template slot-scope="scope">
14
             {{scope.row.good_code}}
14
             {{scope.row.good_code}}
15
           </template>
15
           </template>

+ 121 - 112
src/xt_pages/workforce/template.vue View File

1
 <template>
1
 <template>
2
-<div class="main-contain">
2
+  <div class="main-contain">
3
     <div class="position">
3
     <div class="position">
4
-        <bread-crumb></bread-crumb>
5
-        <!-- <el-col :span="3" style="text-align: right;"> -->
6
-        <el-button size="small" icon="el-icon-setting" type="primary" @click="setScheduleTemplateAction">设置模板</el-button>
7
-        <!-- </el-col> -->
4
+      <bread-crumb :crumbs="crumbs"></bread-crumb>
5
+
6
+      <!-- <el-col :span="3" style="text-align: right;"> -->
7
+      <el-button size="small" icon="el-icon-setting" type="primary" @click="setScheduleTemplateAction">设置模板</el-button>
8
+      <!-- </el-col> -->
8
     </div>
9
     </div>
9
     <div class="app-container">
10
     <div class="app-container">
10
-        <!-- <el-row>
11
-            <el-col :span="21"> -->
12
-                <el-tabs v-model="activeName" tab-position="top" >
13
-                    <el-tab-pane name="schedules">
14
-                        <span slot="label"> 排班信息 </span>
15
-                        <template-table :editable="false" :device_numbers="device_numbers" :template="this_week_schedules" :patients="patients"></template-table>
16
-                    </el-tab-pane>
17
-                    <el-tab-pane name="first" :disabled="template_mode.mode == 0">
18
-                        <span slot="label"> 第一周 </span>
19
-                        <template-table :editable="true" :device_numbers="device_numbers" :template="first_template" :patients="patients"></template-table>
20
-                    </el-tab-pane>
21
-                    <el-tab-pane name="second" :disabled="template_mode.mode != 2">
22
-                        <span slot="label"> 第二周 </span>
23
-                        <template-table :editable="true" :device_numbers="device_numbers" :template="second_template" :patients="patients"></template-table>
24
-                    </el-tab-pane>
25
-                </el-tabs>
26
-            <!-- </el-col> -->
27
-            
28
-        <!-- </el-row> -->
11
+      <!-- <el-row>
12
+          <el-col :span="21"> -->
13
+      <el-tabs v-model="activeName" tab-position="top">
14
+        <el-tab-pane name="schedules">
15
+          <span slot="label"> 排班信息 </span>
16
+          <template-table :editable="false" :device_numbers="device_numbers" :template="this_week_schedules"
17
+                          :patients="patients"></template-table>
18
+        </el-tab-pane>
19
+        <el-tab-pane name="first" :disabled="template_mode.mode == 0">
20
+          <span slot="label"> 第一周 </span>
21
+          <template-table :editable="true" :device_numbers="device_numbers" :template="first_template"
22
+                          :patients="patients"></template-table>
23
+        </el-tab-pane>
24
+        <el-tab-pane name="second" :disabled="template_mode.mode != 2">
25
+          <span slot="label"> 第二周 </span>
26
+          <template-table :editable="true" :device_numbers="device_numbers" :template="second_template"
27
+                          :patients="patients"></template-table>
28
+        </el-tab-pane>
29
+      </el-tabs>
30
+      <!-- </el-col> -->
31
+
32
+      <!-- </el-row> -->
29
 
33
 
30
-        <set-up-template-dialog ref="setup_dialog" :template_mode="template_mode" :origin_mode="origin_mode" @chenge_mode="didChangeTemplateMode"></set-up-template-dialog>
34
+      <set-up-template-dialog ref="setup_dialog" :template_mode="template_mode" :origin_mode="origin_mode"
35
+                              @chenge_mode="didChangeTemplateMode"></set-up-template-dialog>
31
     </div>
36
     </div>
32
- </div>
37
+  </div>
33
 </template>
38
 </template>
34
 
39
 
35
 <script>
40
 <script>
36
-import SetUpTemplateDialog from "./components/setup_template_dialog"
37
-import TemplateTable from "./components/template_table"
38
-import { getTemplateInitData } from "@/api/schedule_template/patient"
39
-import BreadCrumb from "@/xt_pages/components/bread-crumb";
41
+  import SetUpTemplateDialog from './components/setup_template_dialog'
42
+  import TemplateTable from './components/template_table'
43
+  import { getTemplateInitData } from '@/api/schedule_template/patient'
44
+  import BreadCrumb from '@/xt_pages/components/bread-crumb'
40
 
45
 
41
-export default {
42
-    name: "WorkforceTemplate",
46
+  export default {
47
+    name: 'WorkforceTemplate',
43
     components: {
48
     components: {
44
-        SetUpTemplateDialog,
45
-        TemplateTable,
46
-        BreadCrumb
49
+      SetUpTemplateDialog,
50
+      TemplateTable,
51
+      BreadCrumb
47
     },
52
     },
48
     data: function() {
53
     data: function() {
49
-        return {
50
-            activeName: "schedules",
51
-            template_mode: {
52
-                id: 0,
53
-                mode: 0,
54
-            },
55
-            origin_mode: 0,
56
-            device_numbers: [],
57
-            patients: [],
54
+      return {
55
+        crumbs: [
56
+          { path: false, name: '排班管理' },
57
+          { path: 'workforce/template', name: '排班模版' }
58
+        ],
59
+        activeName: 'schedules',
60
+        template_mode: {
61
+          id: 0,
62
+          mode: 0
63
+        },
64
+        origin_mode: 0,
65
+        device_numbers: [],
66
+        patients: [],
58
 
67
 
59
-            first_template: {
60
-                items: [],
61
-            },
62
-            second_template: {
63
-                items: [],
64
-            },
65
-            this_week_schedules: {
66
-                id: 0,
67
-                items: [],
68
-            }
68
+        first_template: {
69
+          items: []
70
+        },
71
+        second_template: {
72
+          items: []
73
+        },
74
+        this_week_schedules: {
75
+          id: 0,
76
+          items: []
69
         }
77
         }
78
+      }
70
     },
79
     },
71
     created() {
80
     created() {
72
-        getTemplateInitData().then(rs => {
73
-            var resp = rs.data
74
-            if (resp.state == 1) {
75
-                var mode = resp.data.template_mode
76
-                var device_numbers = resp.data.device_numbers
77
-                var templates = resp.data.templates
78
-                var patients = resp.data.patients
79
-                var schedules = resp.data.schedules
81
+      getTemplateInitData().then(rs => {
82
+        var resp = rs.data
83
+        if (resp.state == 1) {
84
+          var mode = resp.data.template_mode
85
+          var device_numbers = resp.data.device_numbers
86
+          var templates = resp.data.templates
87
+          var patients = resp.data.patients
88
+          var schedules = resp.data.schedules
80
 
89
 
81
-                this.template_mode = mode
82
-                this.origin_mode = mode.mode
83
-                this.device_numbers = device_numbers,
84
-                this.patients = patients
90
+          this.template_mode = mode
91
+          this.origin_mode = mode.mode
92
+          this.device_numbers = device_numbers,
93
+            this.patients = patients
85
 
94
 
86
-                this.first_template = templates[0]
87
-                this.second_template = templates[1]
95
+          this.first_template = templates[0]
96
+          this.second_template = templates[1]
88
 
97
 
89
-                var fakeTemplateItems = []
90
-                for (let index = 0; index < schedules.length; index++) {
91
-                    const schedule = schedules[index];
92
-                    var item = {}
93
-                    this.$set(item, "id", schedule.id)
94
-                    this.$set(item, "template_id", 0)
95
-                    this.$set(item, "device_number_id", schedule.bed_id)
96
-                    this.$set(item, "treat_mode", schedule.mode_id)
97
-                    this.$set(item, "weekday", schedule.schedule_week)
98
-                    this.$set(item, "time_type", schedule.schedule_type)
99
-                    var patient = {}
100
-                    this.$set(patient, "id", schedule.patient_id)
101
-                    this.$set(patient, "name", schedule.patient)
102
-                    this.$set(item, "patient", patient)
98
+          var fakeTemplateItems = []
99
+          for (let index = 0; index < schedules.length; index++) {
100
+            const schedule = schedules[index]
101
+            var item = {}
102
+            this.$set(item, 'id', schedule.id)
103
+            this.$set(item, 'template_id', 0)
104
+            this.$set(item, 'device_number_id', schedule.bed_id)
105
+            this.$set(item, 'treat_mode', schedule.mode_id)
106
+            this.$set(item, 'weekday', schedule.schedule_week)
107
+            this.$set(item, 'time_type', schedule.schedule_type)
108
+            var patient = {}
109
+            this.$set(patient, 'id', schedule.patient_id)
110
+            this.$set(patient, 'name', schedule.patient)
111
+            this.$set(item, 'patient', patient)
103
 
112
 
104
-                    fakeTemplateItems.push(item)
105
-                }
106
-                this.this_week_schedules.items = fakeTemplateItems
113
+            fakeTemplateItems.push(item)
114
+          }
115
+          this.this_week_schedules.items = fakeTemplateItems
107
 
116
 
108
-            } else {
109
-                this.$message(resp.msg)
110
-            }
111
-        })
117
+        } else {
118
+          this.$message(resp.msg)
119
+        }
120
+      })
112
     },
121
     },
113
     methods: {
122
     methods: {
114
-        setScheduleTemplateAction: function() {
115
-            this.$refs.setup_dialog.show()
116
-        },
117
-        didChangeTemplateMode: function(mode) {
118
-            if (this.origin_mode != mode) {
119
-                if (this.origin_mode == 0) { // 0 -> 1 或 0 -> 2
120
-                    // 不处理模板 item
121
-                } else if (mode == 0) { // 1 -> 0 或 2 -> 0 清除所有模板的 item
122
-                    this.first_template.items.splice(0, this.first_template.items.length)
123
-                    this.second_template.items.splice(0, this.second_template.items.length)
124
-                    if (this.activeName != "schedules") {
125
-                        this.activeName = "schedules"
126
-                    }
127
-                } else if (this.origin_mode == 1 && mode == 2) { // 1 -> 2
128
-                    // 不处理模板 item
129
-                } else if (this.origin_mode == 2 && mode == 1) { // 2 -> 1 清除第二个模板的 item
130
-                    this.second_template.items.splice(0, this.second_template.items.length)
131
-                    if (this.activeName == "second") {
132
-                        this.activeName = "schedules"
133
-                    }
134
-                }
135
-                this.origin_mode = mode
123
+      setScheduleTemplateAction: function() {
124
+        this.$refs.setup_dialog.show()
125
+      },
126
+      didChangeTemplateMode: function(mode) {
127
+        if (this.origin_mode != mode) {
128
+          if (this.origin_mode == 0) { // 0 -> 1 或 0 -> 2
129
+            // 不处理模板 item
130
+          } else if (mode == 0) { // 1 -> 0 或 2 -> 0 清除所有模板的 item
131
+            this.first_template.items.splice(0, this.first_template.items.length)
132
+            this.second_template.items.splice(0, this.second_template.items.length)
133
+            if (this.activeName != 'schedules') {
134
+              this.activeName = 'schedules'
135
+            }
136
+          } else if (this.origin_mode == 1 && mode == 2) { // 1 -> 2
137
+            // 不处理模板 item
138
+          } else if (this.origin_mode == 2 && mode == 1) { // 2 -> 1 清除第二个模板的 item
139
+            this.second_template.items.splice(0, this.second_template.items.length)
140
+            if (this.activeName == 'second') {
141
+              this.activeName = 'schedules'
136
             }
142
             }
143
+          }
144
+          this.origin_mode = mode
137
         }
145
         }
146
+      }
138
     }
147
     }
139
-}
148
+  }
140
 </script>
149
 </script>
141
 
150
 
142
 <style scoped>
151
 <style scoped>