diff --git a/hb_client/src/views/inm/product.vue b/hb_client/src/views/inm/product.vue index fed1966..9a5d629 100644 --- a/hb_client/src/views/inm/product.vue +++ b/hb_client/src/views/inm/product.vue @@ -13,7 +13,7 @@ stripe highlight-current-row height="100" - v-el-height-adaptive-table="{ bottomOffset: 42 }" + v-el-height-adaptive-table="{bottomOffset: 42}" > @@ -257,7 +257,7 @@ export default { _this.mtmId.push(item.material_.id); _this.materialshow.push(item); }); - this.ordershow = _this.materialshow[0].to_order_.number; + this.ordershow = _this.materialshow[0].order_.number; this.customershow=_this.materialshow[0].order_.customer_.name; this.contractshow=_this.materialshow[0].order_.contract_.name; getOrderList({ page: 0, material: _this.mtmId[0], tag:'not_done' }).then( diff --git a/hb_client/src/views/mtm/productprocess.vue b/hb_client/src/views/mtm/productprocess.vue index 02184bb..6201b22 100644 --- a/hb_client/src/views/mtm/productprocess.vue +++ b/hb_client/src/views/mtm/productprocess.vue @@ -578,7 +578,7 @@ :headers="upHeaders" :file-list="fileList" :limit="1" - accept=".doc,.docx,.xls,.xlsx,.ppt,.pptx" + accept=".doc,.docx,.xls,.xlsx,.ppt,.pptx,.pdf" > 上传文件 diff --git a/hb_client/src/views/wpm/operationdo.vue b/hb_client/src/views/wpm/operationdo.vue index 6aae57c..63d02bf 100644 --- a/hb_client/src/views/wpm/operationdo.vue +++ b/hb_client/src/views/wpm/operationdo.vue @@ -63,9 +63,17 @@ :visible.sync="drawer" direction="rtl" size="70%"> -
-
-
+ + + +
+ @@ -743,7 +751,7 @@ export default { tprogressData: [], tool:"", wordText: "", - + pdf:"", }; }, computed: {}, @@ -765,12 +773,15 @@ export default { checkPermission, //作业指导书 - - getWordText() { - this.drawer=true; - const xhr = new XMLHttpRequest(); +//选项卡切换 + handleClick(tab) { + + var str = tab.label.substr(tab.label.length-1,1); + if(str=='x') + { + const xhr = new XMLHttpRequest(); - xhr.open("get", this.techdocList, true); + xhr.open("get",tab.name, true); xhr.responseType = "arraybuffer"; @@ -787,12 +798,30 @@ export default { } }; xhr.send(); + var filediv = document.getElementById('file'); +filediv.innerHTML='
'; + + } + else if (str=='f') + { + this.pdf=tab.name; +var filediv = document.getElementById('file'); +filediv.innerHTML=' '; + + + } + }, + getWordText() { + this.drawer=true; + + + }, readbook(){ - gettechdocList({operation:this.id,page:0}).then((response) => { + gettechdocList({operation:this.id,page:0,enabled:true}).then((response) => { if (response.data) { - this.techdocList= response.data[0].file_.file; + this.techdocList= response.data; console.log( this.techdocList); } }); diff --git a/hb_server/apps/hrm/views.py b/hb_server/apps/hrm/views.py index 5bf9457..ed733da 100644 --- a/hb_server/apps/hrm/views.py +++ b/hb_server/apps/hrm/views.py @@ -125,6 +125,7 @@ class FaceLogin(CreateAPIView): user, msg = HRMService.face_compare_from_base64(base64_data) if user: refresh = RefreshToken.for_user(user) + # 可设为在岗 return Response({ 'refresh': str(refresh), 'access': str(refresh.access_token), diff --git a/hb_server/apps/wpm/migrations/0053_auto_20220129_1512.py b/hb_server/apps/wpm/migrations/0053_auto_20220129_1512.py index 21d27fe..0a60f4c 100644 --- a/hb_server/apps/wpm/migrations/0053_auto_20220129_1512.py +++ b/hb_server/apps/wpm/migrations/0053_auto_20220129_1512.py @@ -12,16 +12,6 @@ class Migration(migrations.Migration): ] operations = [ - migrations.AddField( - model_name='wproduct', - name='material_check', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='wp_material_check', to='mtm.material', verbose_name='按物料状态检查'), - ), - migrations.AddField( - model_name='wproductflow', - name='material_check', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='wpf_material_check', to='mtm.material', verbose_name='按物料状态检查'), - ), migrations.AlterField( model_name='wproduct', name='child', diff --git a/hb_server/apps/wpm/models.py b/hb_server/apps/wpm/models.py index 997e65c..f75908f 100644 --- a/hb_server/apps/wpm/models.py +++ b/hb_server/apps/wpm/models.py @@ -91,9 +91,6 @@ class WProduct(CommonAModel): material = models.ForeignKey( Material, verbose_name='所属物料状态', on_delete=models.CASCADE, related_name='wp_material') - material_check = models.ForeignKey( - Material, verbose_name='按物料状态检查', on_delete=models.CASCADE, - null=True, blank=True, related_name='wp_material_check') pre_step = models.ForeignKey(Step, verbose_name='已执行到', help_text='已执行完的步骤', null=True, blank=True, on_delete=models.CASCADE, related_name='wp_pre_step') step = models.ForeignKey(Step, verbose_name='所在步骤', on_delete=models.CASCADE, null=True, blank=True, @@ -170,9 +167,6 @@ class WproductFlow(CommonAModel): number = models.CharField('物品编号', null=True, blank=True, max_length=50) material = models.ForeignKey( Material, verbose_name='所属物料状态', on_delete=models.CASCADE, related_name='wpf_material') - material_check = models.ForeignKey( - Material, verbose_name='按物料状态检查', on_delete=models.CASCADE, - null=True, blank=True, related_name='wpf_material_check') pre_step = models.ForeignKey(Step, verbose_name='已执行到', help_text='已执行完的步骤', null=True, blank=True, on_delete=models.CASCADE, related_name='wpf_pre_step') step = models.ForeignKey(Step, verbose_name='所在步骤', on_delete=models.CASCADE, null=True, blank=True, diff --git a/hb_server/apps/wpm/views.py b/hb_server/apps/wpm/views.py index dbf50f0..81c18ed 100644 --- a/hb_server/apps/wpm/views.py +++ b/hb_server/apps/wpm/views.py @@ -684,10 +684,10 @@ class OperationViewSet(ListModelMixin, RetrieveModelMixin, CreateModelMixin, Upd newstep, needTest = WpmService.get_next_step(wsp, step) wp.step = newstep wp.pre_step = step + wp.material = wsp.product if step == newstep: wp.act_state = WProduct.WPR_ACT_STATE_TOTEST - wp.material = wsp.product if wp.test:# 如果有正在进行的工序中检验 wp.test.is_midtesting = False wp.test.is_submited = False @@ -696,7 +696,6 @@ class OperationViewSet(ListModelMixin, RetrieveModelMixin, CreateModelMixin, Upd wp.act_state = WProduct.WPR_ACT_STATE_DOWAIT if needTest: wp.act_state = WProduct.WPR_ACT_STATE_TOTEST - wp.material_check = wsp.product wp.operation = None wp.update_by = request.user diff --git a/hb_server/server/settings.py b/hb_server/server/settings.py index 1d11566..2890f6b 100644 --- a/hb_server/server/settings.py +++ b/hb_server/server/settings.py @@ -63,6 +63,8 @@ INSTALLED_APPS = [ 'apps.develop' ] +X_FRAME_OPTIONS = 'SAMEORIGIN' + MIDDLEWARE = [ 'django.middleware.security.SecurityMiddleware', 'django.contrib.sessions.middleware.SessionMiddleware',